Skip to content

Commit dc5e980

Browse files
author
Nate McMaster
committed
Update build scripts, tools, and dependencies for 2.0.x
1 parent e0ab3dd commit dc5e980

File tree

2 files changed

+91
-18
lines changed

2 files changed

+91
-18
lines changed

‎build.sh‎

Lines changed: 22 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ tools_source=''
2323
# Functions
2424
#
2525
__usage() {
26-
echo "Usage: $(basename ${BASH_SOURCE[0]}) [options] [[--] <MSBUILD_ARG>...]"
26+
echo "Usage: $(basename "${BASH_SOURCE[0]}") [options] [[--] <MSBUILD_ARG>...]"
2727
echo ""
2828
echo "Arguments:"
2929
echo " <MSBUILD_ARG>... Arguments passed to MSBuild. Variable number of arguments allowed."
@@ -47,16 +47,17 @@ __usage() {
4747
}
4848

4949
get_korebuild() {
50+
local version
5051
local lock_file="$repo_path/korebuild-lock.txt"
51-
if [ ! -f $lock_file ] || [ "$update" = true ]; then
52-
__get_remote_file "$tools_source/korebuild/channels/$channel/latest.txt" $lock_file
52+
if [ ! -f "$lock_file" ] || [ "$update" = true ]; then
53+
__get_remote_file "$tools_source/korebuild/channels/$channel/latest.txt" "$lock_file"
5354
fi
54-
local version="$(grep 'version:*' -m 1 $lock_file)"
55+
version="$(grep 'version:*' -m 1 "$lock_file")"
5556
if [[ "$version" == '' ]]; then
5657
__error "Failed to parse version from $lock_file. Expected a line that begins with 'version:'"
5758
return 1
5859
fi
59-
version="$(echo ${version#version:} | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//')"
60+
version="$(echo "${version#version:}" | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//')"
6061
local korebuild_path="$DOTNET_HOME/buildtools/korebuild/$version"
6162

6263
{
@@ -65,10 +66,10 @@ get_korebuild() {
6566
local remote_path="$tools_source/korebuild/artifacts/$version/korebuild.$version.zip"
6667
tmpfile="$(mktemp)"
6768
echo -e "${MAGENTA}Downloading KoreBuild ${version}${RESET}"
68-
if __get_remote_file $remote_path $tmpfile; then
69-
unzip -q -d "$korebuild_path" $tmpfile
69+
if __get_remote_file "$remote_path" "$tmpfile"; then
70+
unzip -q -d "$korebuild_path" "$tmpfile"
7071
fi
71-
rm $tmpfile || true
72+
rm "$tmpfile" || true
7273
fi
7374

7475
source "$korebuild_path/KoreBuild.sh"
@@ -99,19 +100,22 @@ __get_remote_file() {
99100
local local_path=$2
100101

101102
if [[ "$remote_path" != 'http'* ]]; then
102-
cp $remote_path $local_path
103+
cp "$remote_path" "$local_path"
103104
return 0
104105
fi
105106

106-
failed=false
107-
if __machine_has curl ; then
108-
curl --retry 10 -sSL -f --create-dirs -o $local_path $remote_path || failed=true
109-
elif __machine_has wget; then
110-
wget --tries 10 -O $local_path $remote_path || failed=true
107+
local failed=false
108+
if __machine_has wget; then
109+
wget --tries 10 --quiet -O "$local_path" "$remote_path" || failed=true
111110
else
112111
failed=true
113112
fi
114113

114+
if [ "$failed" = true ] && __machine_has curl; then
115+
failed=false
116+
curl --retry 10 -sSL -f --create-dirs -o "$local_path" "$remote_path" || failed=true
117+
fi
118+
115119
if [ "$failed" = true ]; then
116120
__error "Download failed: $remote_path" 1>&2
117121
return 1
@@ -122,15 +126,15 @@ __get_remote_file() {
122126
# main
123127
#
124128

125-
while [[ $# > 0 ]]; do
129+
while [[ $# -gt 0 ]]; do
126130
case $1 in
127131
-\?|-h|--help)
128132
__usage --no-exit
129133
exit 0
130134
;;
131135
-c|--channel|-Channel)
132136
shift
133-
channel=${1:-}
137+
channel="${1:-}"
134138
[ -z "$channel" ] && __usage
135139
;;
136140
--config-file|-ConfigFile)
@@ -144,7 +148,7 @@ while [[ $# > 0 ]]; do
144148
;;
145149
-d|--dotnet-home|-DotNetHome)
146150
shift
147-
DOTNET_HOME=${1:-}
151+
DOTNET_HOME="${1:-}"
148152
[ -z "$DOTNET_HOME" ] && __usage
149153
;;
150154
--path|-Path)
@@ -213,4 +217,4 @@ fi
213217

214218
get_korebuild
215219
install_tools "$tools_source" "$DOTNET_HOME"
216-
invoke_repository_build "$repo_path" $@
220+
invoke_repository_build "$repo_path" "$@"

‎build/dependencies.targets‎

Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,12 @@
44
<PackageReference Update="Microsoft.AspNet.Identity.AspNetCoreCompat" Version="0.3.1-rtm-*" />
55
<PackageReference Update="Microsoft.AspNetCore" Version="2.0.1-rtm-*" />
66
<PackageReference Update="Microsoft.AspNetCore.All" Version="2.0.2-rtm-*" />
7+
<PackageReference Update="Microsoft.AspNetCore.Antiforgery" Version="2.0.1-rtm-*" />
8+
<PackageReference Update="Microsoft.AspNetCore.ApplicationInsights.HostingStartup" Version="2.0.1-rtm-*" />
79
<PackageReference Update="Microsoft.AspNetCore.Authentication" Version="2.0.1-rtm-*" />
10+
<PackageReference Update="Microsoft.AspNetCore.Authentication.Abstractions" Version="2.0.1-rtm-*" />
811
<PackageReference Update="Microsoft.AspNetCore.Authentication.Cookies" Version="2.0.1-rtm-*" />
12+
<PackageReference Update="Microsoft.AspNetCore.Authentication.Core" Version="2.0.1-rtm-*" />
913
<PackageReference Update="Microsoft.AspNetCore.Authentication.Facebook" Version="2.0.1-rtm-*" />
1014
<PackageReference Update="Microsoft.AspNetCore.Authentication.Google" Version="2.0.1-rtm-*" />
1115
<PackageReference Update="Microsoft.AspNetCore.Authentication.JwtBearer" Version="2.0.1-rtm-*" />
@@ -15,13 +19,36 @@
1519
<PackageReference Update="Microsoft.AspNetCore.Authentication.Twitter" Version="2.0.1-rtm-*" />
1620
<PackageReference Update="Microsoft.AspNetCore.Authorization" Version="2.0.1-rtm-*" />
1721
<PackageReference Update="Microsoft.AspNetCore.Authorization.Policy" Version="2.0.1-rtm-*" />
22+
<PackageReference Update="Microsoft.AspNetCore.AzureAppServices.HostingStartup" Version="2.0.1-rtm-*" />
23+
<PackageReference Update="Microsoft.AspNetCore.AzureAppServices.SiteExtension" Version="2.0.1-rtm-*" />
24+
<PackageReference Update="Microsoft.AspNetCore.AzureAppServicesIntegration" Version="2.0.1-rtm-*" />
25+
<PackageReference Update="Microsoft.AspNetCore.Buffering" Version="2.0.1-rtm-*" />
26+
<PackageReference Update="Microsoft.AspNetCore.Certificates.Configuration.Sources" Version="2.0.1-rtm-*" />
1827
<PackageReference Update="Microsoft.AspNetCore.ChunkingCookieManager.Sources" Version="2.0.1-rtm-*" />
1928
<PackageReference Update="Microsoft.AspNetCore.CookiePolicy" Version="2.0.1-rtm-*" />
29+
<PackageReference Update="Microsoft.AspNetCore.Cors" Version="2.0.1-rtm-*" />
30+
<PackageReference Update="Microsoft.AspNetCore.Cryptography.Internal" Version="2.0.1-rtm-*" />
31+
<PackageReference Update="Microsoft.AspNetCore.Cryptography.KeyDerivation" Version="2.0.1-rtm-*" />
32+
<PackageReference Update="Microsoft.AspNetCore.DataProtection" Version="2.0.1-rtm-*" />
33+
<PackageReference Update="Microsoft.AspNetCore.DataProtection.Abstractions" Version="2.0.1-rtm-*" />
34+
<PackageReference Update="Microsoft.AspNetCore.DataProtection.AzureStorage" Version="2.0.1-rtm-*" />
35+
<PackageReference Update="Microsoft.AspNetCore.DataProtection.Extensions" Version="2.0.1-rtm-*" />
36+
<PackageReference Update="Microsoft.AspNetCore.DataProtection.Redis" Version="0.3.1-rtm-*" />
37+
<PackageReference Update="Microsoft.AspNetCore.DataProtection.SystemWeb" Version="2.0.1-rtm-*" />
2038
<PackageReference Update="Microsoft.AspNetCore.Diagnostics" Version="2.0.1-rtm-*" />
2139
<PackageReference Update="Microsoft.AspNetCore.Diagnostics.Abstractions" Version="2.0.1-rtm-*" />
2240
<PackageReference Update="Microsoft.AspNetCore.Diagnostics.Elm" Version="0.3.1-rtm-*" />
2341
<PackageReference Update="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="2.0.1-rtm-*" />
2442
<PackageReference Update="Microsoft.AspNetCore.Diagnostics.Identity.Service" Version="2.0.1-rtm-*" />
43+
<PackageReference Update="Microsoft.AspNetCore.Hosting" Version="2.0.1-rtm-*" />
44+
<PackageReference Update="Microsoft.AspNetCore.Hosting.Abstractions" Version="2.0.1-rtm-*" />
45+
<PackageReference Update="Microsoft.AspNetCore.Hosting.Server.Abstractions" Version="2.0.1-rtm-*" />
46+
<PackageReference Update="Microsoft.AspNetCore.Hosting.WindowsServices" Version="2.0.1-rtm-*" />
47+
<PackageReference Update="Microsoft.AspNetCore.Http" Version="2.0.1-rtm-*" />
48+
<PackageReference Update="Microsoft.AspNetCore.Http.Abstractions" Version="2.0.1-rtm-*" />
49+
<PackageReference Update="Microsoft.AspNetCore.Http.Extensions" Version="2.0.1-rtm-*" />
50+
<PackageReference Update="Microsoft.AspNetCore.Http.Features" Version="2.0.1-rtm-*" />
51+
<PackageReference Update="Microsoft.AspNetCore.HttpOverrides" Version="2.0.1-rtm-*" />
2552
<PackageReference Update="Microsoft.AspNetCore.Identity" Version="2.0.1-rtm-*" />
2653
<PackageReference Update="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="2.0.1-rtm-*" />
2754
<PackageReference Update="Microsoft.AspNetCore.Identity.Service" Version="2.0.1-rtm-*" />
@@ -33,6 +60,8 @@
3360
<PackageReference Update="Microsoft.AspNetCore.Identity.Service.Mvc" Version="2.0.1-rtm-*" />
3461
<PackageReference Update="Microsoft.AspNetCore.Identity.Service.Specification.Tests" Version="2.0.1-rtm-*" />
3562
<PackageReference Update="Microsoft.AspNetCore.Identity.Specification.Tests" Version="2.0.1-rtm-*" />
63+
<PackageReference Update="Microsoft.AspNetCore.Localization" Version="2.0.1-rtm-*" />
64+
<PackageReference Update="Microsoft.AspNetCore.Localization.Routing" Version="2.0.1-rtm-*" />
3665
<PackageReference Update="Microsoft.AspNetCore.MiddlewareAnalysis" Version="2.0.1-rtm-*" />
3766
<PackageReference Update="Microsoft.AspNetCore.Mvc" Version="2.0.1-rtm-*" />
3867
<PackageReference Update="Microsoft.AspNetCore.Mvc.Abstractions" Version="2.0.1-rtm-*" />
@@ -44,12 +73,44 @@
4473
<PackageReference Update="Microsoft.AspNetCore.Mvc.Formatters.Xml" Version="2.0.1-rtm-*" />
4574
<PackageReference Update="Microsoft.AspNetCore.Mvc.Localization" Version="2.0.1-rtm-*" />
4675
<PackageReference Update="Microsoft.AspNetCore.Mvc.Razor" Version="2.0.1-rtm-*" />
76+
<PackageReference Update="Microsoft.AspNetCore.Mvc.Razor.Extensions" Version="2.0.1-rtm-*" />
4777
<PackageReference Update="Microsoft.AspNetCore.Mvc.Razor.ViewCompilation" Version="2.0.1-rtm-*" />
4878
<PackageReference Update="Microsoft.AspNetCore.Mvc.RazorPages" Version="2.0.1-rtm-*" />
4979
<PackageReference Update="Microsoft.AspNetCore.Mvc.TagHelpers" Version="2.0.1-rtm-*" />
5080
<PackageReference Update="Microsoft.AspNetCore.Mvc.Testing" Version="2.0.1-alpha1-*" />
5181
<PackageReference Update="Microsoft.AspNetCore.Mvc.ViewFeatures" Version="2.0.1-rtm-*" />
5282
<PackageReference Update="Microsoft.AspNetCore.Mvc.WebApiCompatShim" Version="2.0.1-rtm-*" />
83+
<PackageReference Update="Microsoft.AspNetCore.Owin" Version="2.0.1-rtm-*" />
84+
<PackageReference Update="Microsoft.AspNetCore.Proxy" Version="0.3.1-rtm-*" />
85+
<PackageReference Update="Microsoft.AspNetCore.RangeHelper.Sources" Version="2.0.1-rtm-*" />
86+
<PackageReference Update="Microsoft.AspNetCore.Razor" Version="2.0.1-rtm-*" />
87+
<PackageReference Update="Microsoft.AspNetCore.Razor.Language" Version="2.0.1-rtm-*" />
88+
<PackageReference Update="Microsoft.AspNetCore.Razor.Runtime" Version="2.0.1-rtm-*" />
89+
<PackageReference Update="Microsoft.AspNetCore.Razor.TagHelpers.Testing.Sources" Version="2.0.1-rtm-*" />
90+
<PackageReference Update="Microsoft.AspNetCore.ResponseCaching" Version="2.0.1-rtm-*" />
91+
<PackageReference Update="Microsoft.AspNetCore.ResponseCaching.Abstractions" Version="2.0.1-rtm-*" />
92+
<PackageReference Update="Microsoft.AspNetCore.ResponseCompression" Version="2.0.1-rtm-*" />
93+
<PackageReference Update="Microsoft.AspNetCore.Rewrite" Version="2.0.1-rtm-*" />
94+
<PackageReference Update="Microsoft.AspNetCore.Routing" Version="2.0.1-rtm-*" />
95+
<PackageReference Update="Microsoft.AspNetCore.Routing.Abstractions" Version="2.0.1-rtm-*" />
96+
<PackageReference Update="Microsoft.AspNetCore.Routing.DecisionTree.Sources" Version="2.0.1-rtm-*" />
97+
<PackageReference Update="Microsoft.AspNetCore.Server.HttpSys" Version="2.0.1-rtm-*" />
98+
<PackageReference Update="Microsoft.AspNetCore.Server.IISIntegration" Version="2.0.1-rtm-*" />
99+
<PackageReference Update="Microsoft.AspNetCore.Server.IntegrationTesting" Version="0.4.1-rtm-*" />
100+
<PackageReference Update="Microsoft.AspNetCore.Server.Kestrel" Version="2.0.1-rtm-*" />
101+
<PackageReference Update="Microsoft.AspNetCore.Server.Kestrel.Core" Version="2.0.1-rtm-*" />
102+
<PackageReference Update="Microsoft.AspNetCore.Server.Kestrel.Https" Version="2.0.1-rtm-*" />
103+
<PackageReference Update="Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions" Version="2.0.1-rtm-*" />
104+
<PackageReference Update="Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv" Version="2.0.1-rtm-*" />
105+
<PackageReference Update="Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets" Version="2.0.1-rtm-*" />
106+
<PackageReference Update="Microsoft.AspNetCore.Session" Version="2.0.1-rtm-*" />
107+
<PackageReference Update="Microsoft.AspNetCore.StaticFiles" Version="2.0.1-rtm-*" />
108+
<PackageReference Update="Microsoft.AspNetCore.TestHost" Version="2.0.1-rtm-*" />
109+
<PackageReference Update="Microsoft.AspNetCore.WebSockets" Version="2.0.1-rtm-*" />
110+
<PackageReference Update="Microsoft.AspNetCore.WebUtilities" Version="2.0.1-rtm-*" />
111+
<PackageReference Update="Microsoft.CodeAnalysis.Razor" Version="2.0.1-rtm-*" />
112+
<PackageReference Update="Microsoft.CodeAnalysis.Razor.Workspaces" Version="2.0.1-rtm-*" />
113+
<PackageReference Update="Microsoft.CodeAnalysis.Remote.Razor" Version="2.0.1-rtm-*" />
53114
<PackageReference Update="Microsoft.EntityFrameworkCore" Version="2.0.1-rtm-*" />
54115
<PackageReference Update="Microsoft.EntityFrameworkCore.Design" Version="2.0.1-rtm-*" />
55116
<PackageReference Update="Microsoft.EntityFrameworkCore.InMemory" Version="2.0.1-rtm-*" />
@@ -62,9 +123,15 @@
62123
<PackageReference Update="Microsoft.EntityFrameworkCore.SqlServer" Version="2.0.1-rtm-*" />
63124
<PackageReference Update="Microsoft.EntityFrameworkCore.Tools" Version="2.0.1-rtm-*" />
64125
<DotNetCliToolReference Update="Microsoft.EntityFrameworkCore.Tools.DotNet" Version="2.0.1-rtm-*" />
126+
<PackageReference Update="Microsoft.Extensions.Hosting.Abstractions" Version="2.0.1-rtm-*" />
65127
<PackageReference Update="Microsoft.Extensions.Identity.Core" Version="2.0.1-rtm-*" />
66128
<PackageReference Update="Microsoft.Extensions.Identity.Stores" Version="2.0.1-rtm-*" />
129+
<PackageReference Update="Microsoft.Extensions.Localization" Version="2.0.1-rtm-*" />
130+
<PackageReference Update="Microsoft.Extensions.Localization.Abstractions" Version="2.0.1-rtm-*" />
131+
<PackageReference Update="Microsoft.Net.Http.Headers" Version="2.0.1-rtm-*" />
67132
<PackageReference Update="Microsoft.Owin.Security.Interop" Version="2.0.1-rtm-*" />
133+
<PackageReference Update="Microsoft.VisualStudio.LanguageServices.Razor" Version="2.0.1-rtm-*" />
134+
<PackageReference Update="Microsoft.VisualStudio.Web.BrowserLink" Version="2.0.1-rtm-*" />
68135
<PackageReference Update="Microsoft.VisualStudio.Web.CodeGeneration" Version="2.0.1-rtm-*" />
69136
<PackageReference Update="Microsoft.VisualStudio.Web.CodeGeneration.Contracts" Version="2.0.1-rtm-*" />
70137
<PackageReference Update="Microsoft.VisualStudio.Web.CodeGeneration.Core" Version="2.0.1-rtm-*" />
@@ -74,5 +141,7 @@
74141
<DotNetCliToolReference Update="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="2.0.1-rtm-*" />
75142
<PackageReference Update="Microsoft.VisualStudio.Web.CodeGeneration.Utils" Version="2.0.1-rtm-*" />
76143
<PackageReference Update="Microsoft.VisualStudio.Web.CodeGenerators.Mvc" Version="2.0.1-rtm-*" />
144+
<PackageReference Update="Microsoft.Web.Xdt.Extensions" Version="2.0.1-rtm-*" />
145+
<PackageReference Update="RazorPageGenerator" Version="2.0.1-rtm-*" />
77146
</ItemGroup>
78147
</Project>

0 commit comments

Comments
 (0)