From e303461ab69e539615c38157b1c54f5b6378b55d Mon Sep 17 00:00:00 2001 From: John Beisner Date: Mon, 27 Nov 2017 13:10:53 -0800 Subject: [PATCH 01/34] Changing the commit count. --- NuGet.Config | 2 -- 1 file changed, 2 deletions(-) diff --git a/NuGet.Config b/NuGet.Config index 09a1c2c1e..f2f0337f6 100644 --- a/NuGet.Config +++ b/NuGet.Config @@ -6,8 +6,6 @@ - - From e7f4fb001bebd38954cac94f75c81f9ec285ce2d Mon Sep 17 00:00:00 2001 From: John Beisner Date: Tue, 28 Nov 2017 12:54:32 -0800 Subject: [PATCH 02/34] Writing a NuGet.config as part of the preparatory steps. --- NuGet.Config | 20 ------------ build.proj | 6 ++-- build/InitRepo.props | 2 ++ build/InitRepo.targets | 3 +- build/NugetConfigFile.targets | 58 +++++++++++++++++++++++++++++++++++ run-build.ps1 | 2 +- 6 files changed, 67 insertions(+), 24 deletions(-) delete mode 100644 NuGet.Config create mode 100644 build/NugetConfigFile.targets diff --git a/NuGet.Config b/NuGet.Config deleted file mode 100644 index f2f0337f6..000000000 --- a/NuGet.Config +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/build.proj b/build.proj index bac606d59..85de07477 100644 --- a/build.proj +++ b/build.proj @@ -29,10 +29,11 @@ - + + Outputs="@(RestoreDotnetCliBuildFrameworkOutputs)" + DependsOnTargets="WriteNugetConfigFile"> $(ExtraRestoreArgs) /p:GeneratePropsFile=$(GeneratePropsFile) @@ -48,6 +49,7 @@ + diff --git a/build/InitRepo.props b/build/InitRepo.props index 3a17534a9..e5ce81287 100644 --- a/build/InitRepo.props +++ b/build/InitRepo.props @@ -4,5 +4,7 @@ $(GeneratedPropsDir)/GitCommitInfo.props $(GeneratedPropsDir)/HostInfo.props $(GeneratedPropsDir)/BuildInfo.props + $(GeneratedPropsDir)/BuildInfo.props + $(RepoRoot)/NuGet.Config diff --git a/build/InitRepo.targets b/build/InitRepo.targets index be227551e..078923dec 100644 --- a/build/InitRepo.targets +++ b/build/InitRepo.targets @@ -1,6 +1,7 @@ + + + + + <?xml version="1.0" encoding="utf-8"?> + <configuration> + <packageSources> + <!--To inherit the global NuGet package sources remove the <clear/> line below --> + <clear /> + + + + <add key="PrivateBlobFeed" value="$(ExternalRestoreSources)" /> + + + + <add key="BlobFeed" value="https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json" /> + <add key="templating" value="https://dotnet.myget.org/F/templating/api/v3/index.json" /> + <add key="aspnet" value="https://dotnet.myget.org/F/aspnetcore-release/api/v3/index.json" /> + <add key="websdkfeed" value="https://dotnet.myget.org/F/dotnet-web/api/v3/index.json" /> + <add key="cli-deps" value="https://dotnet.myget.org/F/cli-deps/api/v3/index.json" /> + <add key="roslyn" value="https://dotnet.myget.org/f/roslyn/api/v3/index.json" /> + <add key="symreader-native" value="https://dotnet.myget.org/f/symreader-native/api/v3/index.json" /> + <add key="xunit" value="https://www.myget.org/F/xunit/api/v3/index.json" /> + <add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" /> + <add key="vstest" value="https://dotnet.myget.org/F/vstest/api/v3/index.json" /> + <add key="web-api" value="https://dotnet.myget.org/F/dotnet-web/api/v3/index.json" /> + <add key="symreader-native" value="https://dotnet.myget.org/F/symreader-native/api/v3/index.json" /> + <add key="AspNetMaster" value="https://dotnet.myget.org/F/aspnetcore-master/api/v3/index.json" /> + + + + </packageSources> + </configuration> + + + + + + + + + + + + + diff --git a/run-build.ps1 b/run-build.ps1 index 17a46a335..510f953a9 100644 --- a/run-build.ps1 +++ b/run-build.ps1 @@ -106,7 +106,7 @@ if ($NoBuild) } else { - dotnet msbuild build.proj /p:Architecture=$Architecture /p:GeneratePropsFile=true /t:WriteDynamicPropsToStaticPropsFiles + dotnet msbuild build.proj /p:Architecture=$Architecture /p:GeneratePropsFile=true /t:WriteDynamicPropsToStaticPropsFiles $ExtraParameters dotnet msbuild build.proj /m /v:normal /fl /flp:v=diag /p:Architecture=$Architecture $ExtraParameters if($LASTEXITCODE -ne 0) { throw "Failed to build" } } From 8b74ecd99b8d93ac5b56f59a3fb832a7f162e79a Mon Sep 17 00:00:00 2001 From: John Beisner Date: Tue, 28 Nov 2017 12:58:13 -0800 Subject: [PATCH 03/34] Fixing a typo... --- build/InitRepo.props | 1 - 1 file changed, 1 deletion(-) diff --git a/build/InitRepo.props b/build/InitRepo.props index e5ce81287..bc7d7e630 100644 --- a/build/InitRepo.props +++ b/build/InitRepo.props @@ -4,7 +4,6 @@ $(GeneratedPropsDir)/GitCommitInfo.props $(GeneratedPropsDir)/HostInfo.props $(GeneratedPropsDir)/BuildInfo.props - $(GeneratedPropsDir)/BuildInfo.props $(RepoRoot)/NuGet.Config From 3444301dc71a16e2afbbfb211ad3ce51c2b115fd Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Tue, 28 Nov 2017 10:47:59 -0800 Subject: [PATCH 04/34] Pipe ldconfig stderr to /dev/null --- scripts/obtain/dotnet-install.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/obtain/dotnet-install.sh b/scripts/obtain/dotnet-install.sh index e409fe06d..b28a50e09 100755 --- a/scripts/obtain/dotnet-install.sh +++ b/scripts/obtain/dotnet-install.sh @@ -227,10 +227,10 @@ check_pre_reqs() { local librarypath=${LD_LIBRARY_PATH:-} LDCONFIG_COMMAND="$LDCONFIG_COMMAND -NXv ${librarypath//:/ }" - [ -z "$($LDCONFIG_COMMAND | grep libunwind)" ] && say_err "Unable to locate libunwind. Install libunwind to continue" && failing=true - [ -z "$($LDCONFIG_COMMAND | grep libssl)" ] && say_err "Unable to locate libssl. Install libssl to continue" && failing=true - [ -z "$($LDCONFIG_COMMAND | grep libicu)" ] && say_err "Unable to locate libicu. Install libicu to continue" && failing=true - [ -z "$($LDCONFIG_COMMAND | grep -F libcurl.so)" ] && say_err "Unable to locate libcurl. Install libcurl to continue" && failing=true + [ -z "$($LDCONFIG_COMMAND 2>/dev/null | grep libunwind)" ] && say_err "Unable to locate libunwind. Install libunwind to continue" && failing=true + [ -z "$($LDCONFIG_COMMAND 2>/dev/null | grep libssl)" ] && say_err "Unable to locate libssl. Install libssl to continue" && failing=true + [ -z "$($LDCONFIG_COMMAND 2>/dev/null | grep libicu)" ] && say_err "Unable to locate libicu. Install libicu to continue" && failing=true + [ -z "$($LDCONFIG_COMMAND 2>/dev/null | grep -F libcurl.so)" ] && say_err "Unable to locate libcurl. Install libcurl to continue" && failing=true fi if [ "$failing" = true ]; then From fd04fdd5f2a6a81de9a19a35132573ef6fefb0f8 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Tue, 28 Nov 2017 10:11:22 -0800 Subject: [PATCH 05/34] Add parameter to dotnet-install to support pulling from private blob feeds --- scripts/obtain/dotnet-install.ps1 | 12 +++++++--- scripts/obtain/dotnet-install.sh | 38 ++++++++++++++++++++++--------- 2 files changed, 36 insertions(+), 14 deletions(-) diff --git a/scripts/obtain/dotnet-install.ps1 b/scripts/obtain/dotnet-install.ps1 index 89e6e74d8..af50dbd6e 100644 --- a/scripts/obtain/dotnet-install.ps1 +++ b/scripts/obtain/dotnet-install.ps1 @@ -49,10 +49,13 @@ .PARAMETER AzureFeed Default: https://dotnetcli.azureedge.net/dotnet This parameter typically is not changed by the user. - It allows to change URL for the Azure feed used by this installer. + It allows changing the URL for the Azure feed used by this installer. .PARAMETER UncachedFeed This parameter typically is not changed by the user. - It allows to change URL for the Uncached feed used by this installer. + It allows changing the URL for the Uncached feed used by this installer. +.PARAMETER FeedCredential + Used as a query string to append to the Azure feed. + It allows changing the URL to use non-public blob storage accounts. .PARAMETER ProxyAddress If set, the installer will use the proxy when making web requests .PARAMETER ProxyUseDefaultCredentials @@ -73,6 +76,7 @@ param( [switch]$NoPath, [string]$AzureFeed="https://dotnetcli.azureedge.net/dotnet", [string]$UncachedFeed="https://dotnetcli.blob.core.windows.net/dotnet", + [string]$FeedCredential, [string]$ProxyAddress, [switch]$ProxyUseDefaultCredentials, [switch]$SkipNonVersionedFiles @@ -199,8 +203,10 @@ function GetHTTPResponse([Uri] $Uri) # Default timeout for HttpClient is 100s. For a 50 MB download this assumes 500 KB/s average, any less will time out # 10 minutes allows it to work over much slower connections. $HttpClient.Timeout = New-TimeSpan -Minutes 10 - $Response = $HttpClient.GetAsync($Uri).Result + $ActualUri = if (($Uri -like "$AzureFeed*") -or ($Uri -like "$UncachedFeed*")) { "${Uri}${FeedCredential}" } else { $Uri } + $Response = $HttpClient.GetAsync($ActualUri).Result if (($Response -eq $null) -or (-not ($Response.IsSuccessStatusCode))) { + # The feed credential is potential sensitive info. Do not log ActualUri to console output. $ErrorMsg = "Failed to download $Uri." if ($Response -ne $null) { $ErrorMsg += " $Response" diff --git a/scripts/obtain/dotnet-install.sh b/scripts/obtain/dotnet-install.sh index e409fe06d..ee4e6ba66 100755 --- a/scripts/obtain/dotnet-install.sh +++ b/scripts/obtain/dotnet-install.sh @@ -618,6 +618,11 @@ downloadcurl() { local remote_path="$1" local out_path="${2:-}" + # Append feed_credential as late as possible before calling curl to avoid logging feed_credential + if [[ "$remote_path" == "$azure_feed"* ]] || [[ "$remote_path" == "$uncached_feed"* ]]; then + remote_path="${remote_path}${feed_credential}" + fi + local failed=false if [ -z "$out_path" ]; then curl --retry 10 -sSL -f --create-dirs "$remote_path" || failed=true @@ -636,6 +641,11 @@ downloadwget() { local remote_path="$1" local out_path="${2:-}" + # Append feed_credential as late as possible before calling wget to avoid logging feed_credential + if [[ "$remote_path" == "$azure_feed"* ]] || [[ "$remote_path" == "$uncached_feed"* ]]; then + remote_path="${remote_path}${feed_credential}" + fi + local failed=false if [ -z "$out_path" ]; then wget -q --tries 10 -O - "$remote_path" || failed=true @@ -725,6 +735,7 @@ dry_run=false no_path=false azure_feed="https://dotnetcli.azureedge.net/dotnet" uncached_feed="https://dotnetcli.blob.core.windows.net/dotnet" +feed_credential="" verbose=false shared_runtime=false runtime_id="" @@ -770,6 +781,10 @@ do shift uncached_feed="$1" ;; + --feed-credential|-[Ff]eed[Cc]redential) + shift + feed_credential="$1" + ;; --runtime-id|-[Rr]untime[Ii]d) shift runtime_id="$1" @@ -804,22 +819,23 @@ do echo " coherent applies only to SDK downloads" echo " - 3-part version in a format A.B.C - represents specific version of build" echo " examples: 2.0.0-preview2-006120; 1.1.0" - echo " -i,--install-dir Install under specified location (see Install Location below)" + echo " -i,--install-dir Install under specified location (see Install Location below)" echo " -InstallDir" - echo " --architecture Architecture of .NET Tools. Currently only x64 is supported." + echo " --architecture Architecture of .NET Tools. Currently only x64 is supported." echo " --arch,-Architecture,-Arch" - echo " --shared-runtime Installs just the shared runtime bits, not the entire SDK." + echo " --shared-runtime Installs just the shared runtime bits, not the entire SDK." echo " -SharedRuntime" - echo " --skip-non-versioned-files Skips non-versioned files if they already exist, such as the dotnet executable." + echo " --skip-non-versioned-files Skips non-versioned files if they already exist, such as the dotnet executable." echo " -SkipNonVersionedFiles" - echo " --dry-run,-DryRun Do not perform installation. Display download link." - echo " --no-path, -NoPath Do not set PATH for the current process." - echo " --verbose,-Verbose Display diagnostics information." - echo " --azure-feed,-AzureFeed Azure feed location. Defaults to $azure_feed, This parameter typically is not changed by the user." - echo " --uncached-feed,-UncachedFeed Uncached feed location. This parameter typically is not changed by the user." - echo " --runtime-id Installs the .NET Tools for the given platform (use linux-x64 for portable linux)." + echo " --dry-run,-DryRun Do not perform installation. Display download link." + echo " --no-path, -NoPath Do not set PATH for the current process." + echo " --verbose,-Verbose Display diagnostics information." + echo " --azure-feed,-AzureFeed Azure feed location. Defaults to $azure_feed, This parameter typically is not changed by the user." + echo " --uncached-feed,-UncachedFeed Uncached feed location. This parameter typically is not changed by the user." + echo " --feed-credential,-FeedCredential Azure feed shared access token. This parameter typically is not specified." + echo " --runtime-id Installs the .NET Tools for the given platform (use linux-x64 for portable linux)." echo " -RuntimeId" - echo " -?,--?,-h,--help,-Help Shows this help message" + echo " -?,--?,-h,--help,-Help Shows this help message" echo "" echo "Install Location:" echo " Location is chosen in following order:" From 9a8316cd1295a64d88ce84d09388ef595e59d0a8 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Tue, 28 Nov 2017 14:23:30 -0800 Subject: [PATCH 06/34] Always append feed_credential to URIs in dotnet-install.{sh,ps1} --- scripts/obtain/dotnet-install.ps1 | 5 ++--- scripts/obtain/dotnet-install.sh | 8 ++------ 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/scripts/obtain/dotnet-install.ps1 b/scripts/obtain/dotnet-install.ps1 index af50dbd6e..e267edc76 100644 --- a/scripts/obtain/dotnet-install.ps1 +++ b/scripts/obtain/dotnet-install.ps1 @@ -203,10 +203,9 @@ function GetHTTPResponse([Uri] $Uri) # Default timeout for HttpClient is 100s. For a 50 MB download this assumes 500 KB/s average, any less will time out # 10 minutes allows it to work over much slower connections. $HttpClient.Timeout = New-TimeSpan -Minutes 10 - $ActualUri = if (($Uri -like "$AzureFeed*") -or ($Uri -like "$UncachedFeed*")) { "${Uri}${FeedCredential}" } else { $Uri } - $Response = $HttpClient.GetAsync($ActualUri).Result + $Response = $HttpClient.GetAsync("${Uri}${FeedCredential}").Result if (($Response -eq $null) -or (-not ($Response.IsSuccessStatusCode))) { - # The feed credential is potential sensitive info. Do not log ActualUri to console output. + # The feed credential is potentially sensitive info. Do not log FeedCredential to console output. $ErrorMsg = "Failed to download $Uri." if ($Response -ne $null) { $ErrorMsg += " $Response" diff --git a/scripts/obtain/dotnet-install.sh b/scripts/obtain/dotnet-install.sh index ee4e6ba66..ee15af5a7 100755 --- a/scripts/obtain/dotnet-install.sh +++ b/scripts/obtain/dotnet-install.sh @@ -619,9 +619,7 @@ downloadcurl() { local out_path="${2:-}" # Append feed_credential as late as possible before calling curl to avoid logging feed_credential - if [[ "$remote_path" == "$azure_feed"* ]] || [[ "$remote_path" == "$uncached_feed"* ]]; then - remote_path="${remote_path}${feed_credential}" - fi + remote_path="${remote_path}${feed_credential}" local failed=false if [ -z "$out_path" ]; then @@ -642,9 +640,7 @@ downloadwget() { local out_path="${2:-}" # Append feed_credential as late as possible before calling wget to avoid logging feed_credential - if [[ "$remote_path" == "$azure_feed"* ]] || [[ "$remote_path" == "$uncached_feed"* ]]; then - remote_path="${remote_path}${feed_credential}" - fi + remote_path="${remote_path}${feed_credential}" local failed=false if [ -z "$out_path" ]; then From 57a2ccfb2ca035aab1b03f8bc83c1315cbda313f Mon Sep 17 00:00:00 2001 From: John Beisner Date: Tue, 28 Nov 2017 17:12:44 -0800 Subject: [PATCH 07/34] Changes per code review... --- build/NugetConfigFile.targets | 56 +++++++++++++++++++---------------- 1 file changed, 31 insertions(+), 25 deletions(-) diff --git a/build/NugetConfigFile.targets b/build/NugetConfigFile.targets index ef8c1617b..4a06d327d 100644 --- a/build/NugetConfigFile.targets +++ b/build/NugetConfigFile.targets @@ -1,38 +1,44 @@ + + + + - <?xml version="1.0" encoding="utf-8"?> - <configuration> - <packageSources> - <!--To inherit the global NuGet package sources remove the <clear/> line below --> - <clear /> + + + + + + ]]> - - <add key="PrivateBlobFeed" value="$(ExternalRestoreSources)" /> - - - <add key="BlobFeed" value="https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json" /> - <add key="templating" value="https://dotnet.myget.org/F/templating/api/v3/index.json" /> - <add key="aspnet" value="https://dotnet.myget.org/F/aspnetcore-release/api/v3/index.json" /> - <add key="websdkfeed" value="https://dotnet.myget.org/F/dotnet-web/api/v3/index.json" /> - <add key="cli-deps" value="https://dotnet.myget.org/F/cli-deps/api/v3/index.json" /> - <add key="roslyn" value="https://dotnet.myget.org/f/roslyn/api/v3/index.json" /> - <add key="symreader-native" value="https://dotnet.myget.org/f/symreader-native/api/v3/index.json" /> - <add key="xunit" value="https://www.myget.org/F/xunit/api/v3/index.json" /> - <add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" /> - <add key="vstest" value="https://dotnet.myget.org/F/vstest/api/v3/index.json" /> - <add key="web-api" value="https://dotnet.myget.org/F/dotnet-web/api/v3/index.json" /> - <add key="symreader-native" value="https://dotnet.myget.org/F/symreader-native/api/v3/index.json" /> - <add key="AspNetMaster" value="https://dotnet.myget.org/F/aspnetcore-master/api/v3/index.json" /> + + + + + + + + + + + + + + ]]> - </packageSources> - </configuration> + + + ]]> @@ -42,7 +48,7 @@ Date: Tue, 28 Nov 2017 17:39:35 -0800 Subject: [PATCH 08/34] Handling the possible semi-colon(s) in the property parameters. --- build.cmd | 2 +- run-build.ps1 | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build.cmd b/build.cmd index ce681438b..da03a8be8 100644 --- a/build.cmd +++ b/build.cmd @@ -3,5 +3,5 @@ REM Copyright (c) .NET Foundation and contributors. All rights reserved. REM Licensed under the MIT license. See LICENSE file in the project root for full license information. -powershell -ExecutionPolicy Bypass -NoProfile -NoLogo -Command "& \"%~dp0run-build.ps1\" %*; exit $LastExitCode;" +powershell -ExecutionPolicy Bypass -NoProfile -NoLogo -Command "& \"%~dp0run-build.ps1\" '%*'; exit $LastExitCode;" if %errorlevel% neq 0 exit /b %errorlevel% diff --git a/run-build.ps1 b/run-build.ps1 index 510f953a9..366267f3e 100644 --- a/run-build.ps1 +++ b/run-build.ps1 @@ -80,16 +80,16 @@ $env:VSTEST_TRACE_BUILD=1 # install a stage0 $dotnetInstallPath = Join-Path $RepoRoot "scripts\obtain\dotnet-install.ps1" -Write-Output "$dotnetInstallPath -Channel ""release/2.0.0"" -InstallDir $env:DOTNET_INSTALL_DIR -Architecture ""$Architecture""" -Invoke-Expression "$dotnetInstallPath -Channel ""release/2.0.0"" -InstallDir $env:DOTNET_INSTALL_DIR -Architecture ""$Architecture""" +Write-Output "$dotnetInstallPath -InstallDir $env:DOTNET_INSTALL_DIR -Architecture ""$Architecture"" -Channel ""release/2.0.0""" +Invoke-Expression "$dotnetInstallPath -InstallDir $env:DOTNET_INSTALL_DIR -Architecture ""$Architecture"" -Channel ""release/2.0.0""" if ($LastExitCode -ne 0) { Write-Output "The .NET CLI installation failed with exit code $LastExitCode" exit $LastExitCode } -Write-Output "$dotnetInstallPath -Channel ""master"" -InstallDir $env:DOTNET_INSTALL_DIR_PJ -Architecture ""$Architecture"" -Version 1.0.0-preview2-1-003177" -Invoke-Expression "$dotnetInstallPath -Channel ""master"" -InstallDir $env:DOTNET_INSTALL_DIR_PJ -Architecture ""$Architecture"" -Version 1.0.0-preview2-1-003177" +Write-Output "$dotnetInstallPath -InstallDir $env:DOTNET_INSTALL_DIR_PJ -Architecture ""$Architecture"" -Version 1.0.0-preview2-1-003177" +Invoke-Expression "$dotnetInstallPath -InstallDir $env:DOTNET_INSTALL_DIR_PJ -Architecture ""$Architecture"" -Version 1.0.0-preview2-1-003177" if ($LastExitCode -ne 0) { Write-Output "The .NET CLI installation failed with exit code $LastExitCode" From 76dc4a510e1a3a15acf6bab7a55392c9f94899b1 Mon Sep 17 00:00:00 2001 From: John Beisner Date: Tue, 28 Nov 2017 19:00:51 -0800 Subject: [PATCH 09/34] The modification to build.cmd did not have the desired effect. --- build.cmd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.cmd b/build.cmd index da03a8be8..ce681438b 100644 --- a/build.cmd +++ b/build.cmd @@ -3,5 +3,5 @@ REM Copyright (c) .NET Foundation and contributors. All rights reserved. REM Licensed under the MIT license. See LICENSE file in the project root for full license information. -powershell -ExecutionPolicy Bypass -NoProfile -NoLogo -Command "& \"%~dp0run-build.ps1\" '%*'; exit $LastExitCode;" +powershell -ExecutionPolicy Bypass -NoProfile -NoLogo -Command "& \"%~dp0run-build.ps1\" %*; exit $LastExitCode;" if %errorlevel% neq 0 exit /b %errorlevel% From 34351d6f1eaf4b8ea09f1f23a72df677540df94f Mon Sep 17 00:00:00 2001 From: John Beisner Date: Wed, 29 Nov 2017 09:31:25 -0800 Subject: [PATCH 10/34] Ignore the NuGet.Config at the root as a source file; it is dynamically generated. --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index 7bed92752..19e5af704 100644 --- a/.gitignore +++ b/.gitignore @@ -15,6 +15,9 @@ Library/ # local nuget cache .nuget/ +# NuGet.Config at the root +/NuGet.Config + # NuGet v3 restore drops these even though we don't use MSBuild :( *.nuget.targets *.nuget.props From f29acd3153386d64761f8b6f34761b6a44a4afe6 Mon Sep 17 00:00:00 2001 From: John Beisner Date: Wed, 29 Nov 2017 10:22:27 -0800 Subject: [PATCH 11/34] If the build is a 'DotNetBuildOffline'; do not write any feed lines. --- build/NugetConfigFile.targets | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/build/NugetConfigFile.targets b/build/NugetConfigFile.targets index 4a06d327d..8aba7ac72 100644 --- a/build/NugetConfigFile.targets +++ b/build/NugetConfigFile.targets @@ -16,7 +16,7 @@ ]]> - + @@ -32,7 +32,7 @@ ]]> - + ]]> - + + - Date: Thu, 30 Nov 2017 10:35:51 -0800 Subject: [PATCH 12/34] Use the 'PB_AssetRootUrl' and 'PB_AssetRootAccessTokenSuffix' for all asset downloads if set - "TransportFeed" should be "BlobFeed". --- build/AzureInfo.props | 14 +++++++++----- build/BackwardsCompatibilityRuntimes.props | 9 ++++----- build/BundledRuntimes.props | 17 ++++++++--------- build/Publish.targets | 4 ++-- build/compile/LzmaArchive.targets | 6 ++---- build/package/Installer.DEB.targets | 4 ++-- build/package/Installer.MSI.targets | 4 ++-- build/package/Installer.RPM.targets | 4 ++-- ...d.targets => PublishNupkgToBlobFeed.targets} | 12 ++++++------ dir.props | 3 +-- 10 files changed, 38 insertions(+), 39 deletions(-) rename build/publish/{PublishNupkgToTransportFeed.targets => PublishNupkgToBlobFeed.targets} (52%) diff --git a/build/AzureInfo.props b/build/AzureInfo.props index 2773a817c..42b762a7c 100644 --- a/build/AzureInfo.props +++ b/build/AzureInfo.props @@ -1,6 +1,10 @@ Sdk + $(PB_AssetRootUrl) + https://dotnetcli.azureedge.net + $(PB_AssetRootAccessTokenSuffix) + ?$(PrivateBlobAccessToken) $(ARTIFACT_STORAGE_CONTAINER) dotnet $(ARTIFACT_STORAGE_KEY) @@ -12,10 +16,10 @@ $(CHECKSUM_STORAGE_KEY) $(CHECKSUM_STORAGE_ACCOUNT) dotnetclichecksums - $(TRANSPORTFEED_STORAGE_CONTAINER) - dotnet-core - $(TRANSPORTFEED_EXPECTED_URL) - https://dotnetfeed.blob.core.windows.net/$(TransportFeedContainerName)/index.json - $(TRANSPORTFEED_STORAGE_KEY) + $(BLOBFEED_STORAGE_CONTAINER) + dotnet-core + $(BLOBFEED_EXPECTED_URL) + https://dotnetfeed.blob.core.windows.net/$(BlobFeedContainerName)/index.json + $(BLOBFEED_STORAGE_KEY) diff --git a/build/BackwardsCompatibilityRuntimes.props b/build/BackwardsCompatibilityRuntimes.props index 9664fdadf..4dd0d800f 100644 --- a/build/BackwardsCompatibilityRuntimes.props +++ b/build/BackwardsCompatibilityRuntimes.props @@ -21,13 +21,12 @@ $(BackwardsCompatibility110CoreSetupBlobRootUrlWithChannel)/Installers $(IntermediateDirectory)/coreSetupDownload/$(BackwardsCompatibility110SharedFrameworkVersion) $(BackwardsCompatibility110CoreSetupDownloadDirectory)/combinedSharedHostAndFrameworkArchive$(ArchiveExtension) - ?$(CoreSetupBlobAccessToken) <_DownloadAndExtractItem Include="BackwardsCompatibility110CombinedSharedHostAndFrameworkArchive" Condition="!Exists('$(BackwardsCompatibility110CombinedSharedHostAndFrameworkArchive)')"> - $(BackwardsCompatibility110SharedFrameworkArchiveBlobRootUrl)/$(BackwardsCompatibility110CombinedFrameworkHostCompressedFileName)$(CoreSetupBlobAccessTokenParam) + $(BackwardsCompatibility110SharedFrameworkArchiveBlobRootUrl)/$(BackwardsCompatibility110CombinedFrameworkHostCompressedFileName)$(PrivateBlobAccessTokenParam) $(BackwardsCompatibility110CombinedSharedHostAndFrameworkArchive) $(BackwardsCompatibleSharedFrameworksPublishDirectory) @@ -36,21 +35,21 @@ <_DownloadAndExtractItem Include="BackwardsCompatibility110DownloadedSharedFrameworkInstallerFile" Condition="!Exists('$(BackwardsCompatibility110DownloadedSharedFrameworkInstallerFile)') And '$(OSName)' != 'linux'"> - $(BackwardsCompatibility110CoreSetupInstallerBlobRootUrl)/$(BackwardsCompatibility110SharedFrameworkVersion)/$(BackwardsCompatibility110DownloadedSharedFrameworkInstallerFileName)$(CoreSetupBlobAccessTokenParam) + $(BackwardsCompatibility110CoreSetupInstallerBlobRootUrl)/$(BackwardsCompatibility110SharedFrameworkVersion)/$(BackwardsCompatibility110DownloadedSharedFrameworkInstallerFileName)$(PrivateBlobAccessTokenParam) $(BackwardsCompatibility110DownloadedSharedFrameworkInstallerFile) <_DownloadAndExtractItem Include="BackwardsCompatibility110DownloadedSharedHostInstallerFile" Condition="!Exists('$(BackwardsCompatibility110DownloadedSharedHostInstallerFile)') And '$(OSName)' != 'linux'"> - $(BackwardsCompatibility110CoreSetupInstallerBlobRootUrl)/$(BackwardsCompatibility110SharedHostVersion)/$(BackwardsCompatibility110DownloadedSharedHostInstallerFileName)$(CoreSetupBlobAccessTokenParam) + $(BackwardsCompatibility110CoreSetupInstallerBlobRootUrl)/$(BackwardsCompatibility110SharedHostVersion)/$(BackwardsCompatibility110DownloadedSharedHostInstallerFileName)$(PrivateBlobAccessTokenParam) $(BackwardsCompatibility110DownloadedSharedHostInstallerFile) <_DownloadAndExtractItem Include="BackwardsCompatibility110DownloadedHostFxrInstallerFile" Condition="!Exists('$(BackwardsCompatibility110DownloadedHostFxrInstallerFile)') And '$(OSName)' != 'linux'"> - $(BackwardsCompatibility110CoreSetupInstallerBlobRootUrl)/$(BackwardsCompatibility110HostFxrVersion)/$(BackwardsCompatibility110DownloadedHostFxrInstallerFileName)$(CoreSetupBlobAccessTokenParam) + $(BackwardsCompatibility110CoreSetupInstallerBlobRootUrl)/$(BackwardsCompatibility110HostFxrVersion)/$(BackwardsCompatibility110DownloadedHostFxrInstallerFileName)$(PrivateBlobAccessTokenParam) $(BackwardsCompatibility110DownloadedHostFxrInstallerFile) diff --git a/build/BundledRuntimes.props b/build/BundledRuntimes.props index cbc7a67a0..72b18cabd 100644 --- a/build/BundledRuntimes.props +++ b/build/BundledRuntimes.props @@ -27,8 +27,7 @@ - https://dotnetcli.azureedge.net/dotnet/ - ?$(CoreSetupBlobAccessToken) + $(AssetDownloadRootUrl)/dotnet/ $(CoreSetupBlobRootUrl)Runtime/ $(IntermediateDirectory)/coreSetupDownload/$(SharedFrameworkVersion) $(CoreSetupDownloadDirectory)/combinedSharedHostAndFrameworkArchive$(ArchiveExtension) @@ -56,49 +55,49 @@ <_DownloadAndExtractItem Include="CombinedSharedHostAndFrameworkArchive" Condition="!Exists('$(CombinedSharedHostAndFrameworkArchive)')"> - $(CoreSetupRootUrl)$(SharedFrameworkVersion)/$(CombinedFrameworkHostCompressedFileName)$(CoreSetupBlobAccessTokenParam) + $(CoreSetupRootUrl)$(SharedFrameworkVersion)/$(CombinedFrameworkHostCompressedFileName)$(PrivateBlobAccessTokenParam) $(CombinedSharedHostAndFrameworkArchive) $(SharedFrameworkPublishDirectory) <_DownloadAndExtractItem Include="DownloadedSharedFrameworkInstallerFile" Condition="'$(SkipBuildingInstallers)' != 'true' And !Exists('$(DownloadedSharedFrameworkInstallerFile)') And '$(InstallerExtension)' != ''"> - $(CoreSetupRootUrl)$(SharedFrameworkVersion)/$(DownloadedSharedFrameworkInstallerFileName)$(CoreSetupBlobAccessTokenParam) + $(CoreSetupRootUrl)$(SharedFrameworkVersion)/$(DownloadedSharedFrameworkInstallerFileName)$(PrivateBlobAccessTokenParam) $(DownloadedSharedFrameworkInstallerFile) <_DownloadAndExtractItem Include="DownloadedSharedHostInstallerFile" Condition="'$(SkipBuildingInstallers)' != 'true' And !Exists('$(DownloadedSharedHostInstallerFile)') And '$(InstallerExtension)' != ''"> - $(CoreSetupRootUrl)$(SharedHostVersion)/$(DownloadedSharedHostInstallerFileName)$(CoreSetupBlobAccessTokenParam) + $(CoreSetupRootUrl)$(SharedHostVersion)/$(DownloadedSharedHostInstallerFileName)$(PrivateBlobAccessTokenParam) $(DownloadedSharedHostInstallerFile) <_DownloadAndExtractItem Include="DownloadedHostFxrInstallerFile" Condition="'$(SkipBuildingInstallers)' != 'true' And !Exists('$(DownloadedHostFxrInstallerFile)') And '$(InstallerExtension)' != ''"> - $(CoreSetupRootUrl)$(HostFxrVersion)/$(DownloadedHostFxrInstallerFileName)$(CoreSetupBlobAccessTokenParam) + $(CoreSetupRootUrl)$(HostFxrVersion)/$(DownloadedHostFxrInstallerFileName)$(PrivateBlobAccessTokenParam) $(DownloadedHostFxrInstallerFile) <_DownloadAndExtractItem Include="AspNetCoreRuntimeInstallerWixLibFile" Condition=" '$(AspNetCoreRuntimeInstallerWixLibFile)' != '' And !Exists('$(AspNetCoreRuntimeInstallerWixLibFile)')"> - $(AspNetCoreRuntimeInstallerBlobRootUrl)/$(AspNetCoreRuntimeInstallerWixLibFileName)$(CoreSetupBlobAccessTokenParam) + $(AspNetCoreRuntimeInstallerBlobRootUrl)/$(AspNetCoreRuntimeInstallerWixLibFileName)$(PrivateBlobAccessTokenParam) $(AspNetCoreRuntimeInstallerWixLibFile) <_DownloadAndExtractItem Include="AspNetCoreRuntimeInstallerArchiveFile" Condition="!Exists('$(AspNetCoreRuntimeInstallerArchiveFile)')"> - $(AspNetCoreRuntimeInstallerBlobRootUrl)/$(AspNetCoreRuntimeInstallerArchiveFileName)$(CoreSetupBlobAccessTokenParam) + $(AspNetCoreRuntimeInstallerBlobRootUrl)/$(AspNetCoreRuntimeInstallerArchiveFileName)$(PrivateBlobAccessTokenParam) $(AspNetCoreRuntimeInstallerArchiveFile) $(AspNetRuntimePackageStorePublishDirectory) <_DownloadAndExtractItem Include="AspNetCoreSharedRuntimeVersionFile" Condition="!Exists('$(AspNetCoreSharedRuntimeVersionFile)')"> - $(AspNetCoreRuntimeInstallerBlobRootUrl)/$(AspNetCoreSharedRuntimeVersionFileName)$(CoreSetupBlobAccessTokenParam) + $(AspNetCoreRuntimeInstallerBlobRootUrl)/$(AspNetCoreSharedRuntimeVersionFileName)$(PrivateBlobAccessTokenParam) $(AspNetCoreSharedRuntimeVersionFile) diff --git a/build/Publish.targets b/build/Publish.targets index 9e911318c..918ae556e 100644 --- a/build/Publish.targets +++ b/build/Publish.targets @@ -3,7 +3,7 @@ - + @@ -25,7 +25,7 @@ GenerateChecksums; UploadArtifactsToAzure; UploadChecksumsToAzure; - PublishNupkgToTransportFeed; + PublishNupkgToBlobFeed; PublishDebFilesToDebianRepo; PublishCliVersionBadge" /> diff --git a/build/compile/LzmaArchive.targets b/build/compile/LzmaArchive.targets index 494164b26..911124eb6 100644 --- a/build/compile/LzmaArchive.targets +++ b/build/compile/LzmaArchive.targets @@ -2,19 +2,17 @@ - - ?$(CoreSetupBlobAccessToken) $(SdkOutputDirectory)/nuGetPackagesArchive.lzma nuGetPackagesArchive.$(AspNetCoreRuntimePackageFlavor).lzma $(IntermediateDirectory)/$(NugetPackagesArchiveName) - $(AspNetCoreRuntimeInstallerBlobRootUrl)/$(NugetPackagesArchiveName)$(CoreSetupBlobAccessTokenParam) + $(AspNetCoreRuntimeInstallerBlobRootUrl)/$(NugetPackagesArchiveName) - diff --git a/build/package/Installer.DEB.targets b/build/package/Installer.DEB.targets index 00afd7f30..76fc614d6 100644 --- a/build/package/Installer.DEB.targets +++ b/build/package/Installer.DEB.targets @@ -129,10 +129,10 @@ $(PackagesDirectory)/$(AspNetCoreRuntimeDebInstallerFileName) diff --git a/build/package/Installer.MSI.targets b/build/package/Installer.MSI.targets index 2a4e131b8..32977d399 100644 --- a/build/package/Installer.MSI.targets +++ b/build/package/Installer.MSI.targets @@ -3,7 +3,7 @@ 3.10.2 - https://dotnetcli.azureedge.net/build/wix/wix.$(WixVersion).zip + $(AssetDownloadRootUrl)/build/wix/wix.$(WixVersion).zip $(IntermediateDirectory)/WixTools/$(WixVersion) $(WixRoot)/WixTools.$(WixVersion).zip $(WixRoot)/WixDownload.$(WixVersion).sentinel @@ -85,7 +85,7 @@ Encoding="Unicode"/> diff --git a/build/package/Installer.RPM.targets b/build/package/Installer.RPM.targets index a4f7853ca..5736675cd 100644 --- a/build/package/Installer.RPM.targets +++ b/build/package/Installer.RPM.targets @@ -191,10 +191,10 @@ $(PackagesDirectory)/$(AspNetCoreRuntimeRpmInstallerFileName) diff --git a/build/publish/PublishNupkgToTransportFeed.targets b/build/publish/PublishNupkgToBlobFeed.targets similarity index 52% rename from build/publish/PublishNupkgToTransportFeed.targets rename to build/publish/PublishNupkgToBlobFeed.targets index 19dd03e71..eb8ba821a 100644 --- a/build/publish/PublishNupkgToTransportFeed.targets +++ b/build/publish/PublishNupkgToBlobFeed.targets @@ -7,13 +7,13 @@ - - - + + + - - + diff --git a/dir.props b/dir.props index 756fccc32..a59eba29e 100644 --- a/dir.props +++ b/dir.props @@ -20,7 +20,7 @@ - + @@ -40,7 +40,6 @@ - From 4aea36d48eea9f56f9e02090171c622b0d265cb1 Mon Sep 17 00:00:00 2001 From: John Beisner Date: Thu, 30 Nov 2017 10:36:16 -0800 Subject: [PATCH 13/34] No passwords should be in the open as environmental variables. --- scripts/dockerrun.sh | 9 --------- 1 file changed, 9 deletions(-) diff --git a/scripts/dockerrun.sh b/scripts/dockerrun.sh index abdaec636..30ba88479 100755 --- a/scripts/dockerrun.sh +++ b/scripts/dockerrun.sh @@ -119,20 +119,14 @@ docker run $INTERACTIVE -t --rm --sig-proxy=true \ --name $DOTNET_BUILD_CONTAINER_NAME \ -v $DOCKER_HOST_SHARE_DIR:/opt/code \ -e CHANNEL \ - -e CONNECTION_STRING \ -e REPO_ID \ -e REPO_USER \ - -e REPO_PASS \ -e REPO_SERVER \ -e DOTNET_BUILD_SKIP_CROSSGEN \ -e PUBLISH_TO_AZURE_BLOB \ -e NUGET_FEED_URL \ - -e NUGET_API_KEY \ - -e GITHUB_PASSWORD \ - -e ARTIFACT_STORAGE_KEY \ -e ARTIFACT_STORAGE_ACCOUNT \ -e ARTIFACT_STORAGE_CONTAINER \ - -e CHECKSUM_STORAGE_KEY \ -e CHECKSUM_STORAGE_ACCOUNT \ -e CHECKSUM_STORAGE_CONTAINER \ -e CLIBUILD_SKIP_TESTS \ @@ -141,10 +135,7 @@ docker run $INTERACTIVE -t --rm --sig-proxy=true \ -e RELEASESUFFIX \ -e COREFXAZURECONTAINER \ -e AZUREACCOUNTNAME \ - -e AZUREACCESSTOKEN \ - -e VSOPASSWORD \ -e RELEASETOOLSGITURL \ -e CORESETUPBLOBROOTURL \ - -e CORESETUPBLOBACCESSTOKEN \ $DOTNET_BUILD_CONTAINER_TAG \ $BUILD_COMMAND "$@" From 3d39772fe9bc13a3c01b4d83e50a7cbb8b06f729 Mon Sep 17 00:00:00 2001 From: John Beisner Date: Thu, 30 Nov 2017 12:09:27 -0800 Subject: [PATCH 14/34] The URL root will include the "dotnet" container; the structure will be identical after the "dotnet" container. --- build/AzureInfo.props | 8 ++++---- build/BackwardsCompatibilityRuntimes.props | 8 ++++---- build/BundledRuntimes.props | 14 +++++++------- build/compile/LzmaArchive.targets | 2 +- build/package/Installer.DEB.targets | 4 ++-- build/package/Installer.MSI.targets | 4 ++-- build/package/Installer.RPM.targets | 4 ++-- 7 files changed, 22 insertions(+), 22 deletions(-) diff --git a/build/AzureInfo.props b/build/AzureInfo.props index 42b762a7c..cee626a2c 100644 --- a/build/AzureInfo.props +++ b/build/AzureInfo.props @@ -1,10 +1,10 @@ Sdk - $(PB_AssetRootUrl) - https://dotnetcli.azureedge.net - $(PB_AssetRootAccessTokenSuffix) - ?$(PrivateBlobAccessToken) + $(PB_AssetRootUrl) + https://dotnetcli.azureedge.net/dotnet/ + $(PB_AssetRootAccessTokenSuffix) + ?$(CoreSetupBlobAccessToken) $(ARTIFACT_STORAGE_CONTAINER) dotnet $(ARTIFACT_STORAGE_KEY) diff --git a/build/BackwardsCompatibilityRuntimes.props b/build/BackwardsCompatibilityRuntimes.props index 4dd0d800f..85303240f 100644 --- a/build/BackwardsCompatibilityRuntimes.props +++ b/build/BackwardsCompatibilityRuntimes.props @@ -26,7 +26,7 @@ <_DownloadAndExtractItem Include="BackwardsCompatibility110CombinedSharedHostAndFrameworkArchive" Condition="!Exists('$(BackwardsCompatibility110CombinedSharedHostAndFrameworkArchive)')"> - $(BackwardsCompatibility110SharedFrameworkArchiveBlobRootUrl)/$(BackwardsCompatibility110CombinedFrameworkHostCompressedFileName)$(PrivateBlobAccessTokenParam) + $(BackwardsCompatibility110SharedFrameworkArchiveBlobRootUrl)/$(BackwardsCompatibility110CombinedFrameworkHostCompressedFileName)$(CoreSetupBlobAccessTokenParam) $(BackwardsCompatibility110CombinedSharedHostAndFrameworkArchive) $(BackwardsCompatibleSharedFrameworksPublishDirectory) @@ -35,21 +35,21 @@ <_DownloadAndExtractItem Include="BackwardsCompatibility110DownloadedSharedFrameworkInstallerFile" Condition="!Exists('$(BackwardsCompatibility110DownloadedSharedFrameworkInstallerFile)') And '$(OSName)' != 'linux'"> - $(BackwardsCompatibility110CoreSetupInstallerBlobRootUrl)/$(BackwardsCompatibility110SharedFrameworkVersion)/$(BackwardsCompatibility110DownloadedSharedFrameworkInstallerFileName)$(PrivateBlobAccessTokenParam) + $(BackwardsCompatibility110CoreSetupInstallerBlobRootUrl)/$(BackwardsCompatibility110SharedFrameworkVersion)/$(BackwardsCompatibility110DownloadedSharedFrameworkInstallerFileName)$(CoreSetupBlobAccessTokenParam) $(BackwardsCompatibility110DownloadedSharedFrameworkInstallerFile) <_DownloadAndExtractItem Include="BackwardsCompatibility110DownloadedSharedHostInstallerFile" Condition="!Exists('$(BackwardsCompatibility110DownloadedSharedHostInstallerFile)') And '$(OSName)' != 'linux'"> - $(BackwardsCompatibility110CoreSetupInstallerBlobRootUrl)/$(BackwardsCompatibility110SharedHostVersion)/$(BackwardsCompatibility110DownloadedSharedHostInstallerFileName)$(PrivateBlobAccessTokenParam) + $(BackwardsCompatibility110CoreSetupInstallerBlobRootUrl)/$(BackwardsCompatibility110SharedHostVersion)/$(BackwardsCompatibility110DownloadedSharedHostInstallerFileName)$(CoreSetupBlobAccessTokenParam) $(BackwardsCompatibility110DownloadedSharedHostInstallerFile) <_DownloadAndExtractItem Include="BackwardsCompatibility110DownloadedHostFxrInstallerFile" Condition="!Exists('$(BackwardsCompatibility110DownloadedHostFxrInstallerFile)') And '$(OSName)' != 'linux'"> - $(BackwardsCompatibility110CoreSetupInstallerBlobRootUrl)/$(BackwardsCompatibility110HostFxrVersion)/$(BackwardsCompatibility110DownloadedHostFxrInstallerFileName)$(PrivateBlobAccessTokenParam) + $(BackwardsCompatibility110CoreSetupInstallerBlobRootUrl)/$(BackwardsCompatibility110HostFxrVersion)/$(BackwardsCompatibility110DownloadedHostFxrInstallerFileName)$(CoreSetupBlobAccessTokenParam) $(BackwardsCompatibility110DownloadedHostFxrInstallerFile) diff --git a/build/BundledRuntimes.props b/build/BundledRuntimes.props index 72b18cabd..cfb5d04ab 100644 --- a/build/BundledRuntimes.props +++ b/build/BundledRuntimes.props @@ -55,49 +55,49 @@ <_DownloadAndExtractItem Include="CombinedSharedHostAndFrameworkArchive" Condition="!Exists('$(CombinedSharedHostAndFrameworkArchive)')"> - $(CoreSetupRootUrl)$(SharedFrameworkVersion)/$(CombinedFrameworkHostCompressedFileName)$(PrivateBlobAccessTokenParam) + $(CoreSetupRootUrl)$(SharedFrameworkVersion)/$(CombinedFrameworkHostCompressedFileName)$(CoreSetupBlobAccessTokenParam) $(CombinedSharedHostAndFrameworkArchive) $(SharedFrameworkPublishDirectory) <_DownloadAndExtractItem Include="DownloadedSharedFrameworkInstallerFile" Condition="'$(SkipBuildingInstallers)' != 'true' And !Exists('$(DownloadedSharedFrameworkInstallerFile)') And '$(InstallerExtension)' != ''"> - $(CoreSetupRootUrl)$(SharedFrameworkVersion)/$(DownloadedSharedFrameworkInstallerFileName)$(PrivateBlobAccessTokenParam) + $(CoreSetupRootUrl)$(SharedFrameworkVersion)/$(DownloadedSharedFrameworkInstallerFileName)$(CoreSetupBlobAccessTokenParam) $(DownloadedSharedFrameworkInstallerFile) <_DownloadAndExtractItem Include="DownloadedSharedHostInstallerFile" Condition="'$(SkipBuildingInstallers)' != 'true' And !Exists('$(DownloadedSharedHostInstallerFile)') And '$(InstallerExtension)' != ''"> - $(CoreSetupRootUrl)$(SharedHostVersion)/$(DownloadedSharedHostInstallerFileName)$(PrivateBlobAccessTokenParam) + $(CoreSetupRootUrl)$(SharedHostVersion)/$(DownloadedSharedHostInstallerFileName)$(CoreSetupBlobAccessTokenParam) $(DownloadedSharedHostInstallerFile) <_DownloadAndExtractItem Include="DownloadedHostFxrInstallerFile" Condition="'$(SkipBuildingInstallers)' != 'true' And !Exists('$(DownloadedHostFxrInstallerFile)') And '$(InstallerExtension)' != ''"> - $(CoreSetupRootUrl)$(HostFxrVersion)/$(DownloadedHostFxrInstallerFileName)$(PrivateBlobAccessTokenParam) + $(CoreSetupRootUrl)$(HostFxrVersion)/$(DownloadedHostFxrInstallerFileName)$(CoreSetupBlobAccessTokenParam) $(DownloadedHostFxrInstallerFile) <_DownloadAndExtractItem Include="AspNetCoreRuntimeInstallerWixLibFile" Condition=" '$(AspNetCoreRuntimeInstallerWixLibFile)' != '' And !Exists('$(AspNetCoreRuntimeInstallerWixLibFile)')"> - $(AspNetCoreRuntimeInstallerBlobRootUrl)/$(AspNetCoreRuntimeInstallerWixLibFileName)$(PrivateBlobAccessTokenParam) + $(AspNetCoreRuntimeInstallerBlobRootUrl)/$(AspNetCoreRuntimeInstallerWixLibFileName)$(CoreSetupBlobAccessTokenParam) $(AspNetCoreRuntimeInstallerWixLibFile) <_DownloadAndExtractItem Include="AspNetCoreRuntimeInstallerArchiveFile" Condition="!Exists('$(AspNetCoreRuntimeInstallerArchiveFile)')"> - $(AspNetCoreRuntimeInstallerBlobRootUrl)/$(AspNetCoreRuntimeInstallerArchiveFileName)$(PrivateBlobAccessTokenParam) + $(AspNetCoreRuntimeInstallerBlobRootUrl)/$(AspNetCoreRuntimeInstallerArchiveFileName)$(CoreSetupBlobAccessTokenParam) $(AspNetCoreRuntimeInstallerArchiveFile) $(AspNetRuntimePackageStorePublishDirectory) <_DownloadAndExtractItem Include="AspNetCoreSharedRuntimeVersionFile" Condition="!Exists('$(AspNetCoreSharedRuntimeVersionFile)')"> - $(AspNetCoreRuntimeInstallerBlobRootUrl)/$(AspNetCoreSharedRuntimeVersionFileName)$(PrivateBlobAccessTokenParam) + $(AspNetCoreRuntimeInstallerBlobRootUrl)/$(AspNetCoreSharedRuntimeVersionFileName)$(CoreSetupBlobAccessTokenParam) $(AspNetCoreSharedRuntimeVersionFile) diff --git a/build/compile/LzmaArchive.targets b/build/compile/LzmaArchive.targets index 911124eb6..37c96d648 100644 --- a/build/compile/LzmaArchive.targets +++ b/build/compile/LzmaArchive.targets @@ -12,7 +12,7 @@ Inputs="$(IntermediateArchive)" Outputs="$(FinalArchive)" Condition=" '$(IncludeNuGetPackageArchive)' == 'true' "> - diff --git a/build/package/Installer.DEB.targets b/build/package/Installer.DEB.targets index 76fc614d6..00afd7f30 100644 --- a/build/package/Installer.DEB.targets +++ b/build/package/Installer.DEB.targets @@ -129,10 +129,10 @@ $(PackagesDirectory)/$(AspNetCoreRuntimeDebInstallerFileName) diff --git a/build/package/Installer.MSI.targets b/build/package/Installer.MSI.targets index 32977d399..2a4e131b8 100644 --- a/build/package/Installer.MSI.targets +++ b/build/package/Installer.MSI.targets @@ -3,7 +3,7 @@ 3.10.2 - $(AssetDownloadRootUrl)/build/wix/wix.$(WixVersion).zip + https://dotnetcli.azureedge.net/build/wix/wix.$(WixVersion).zip $(IntermediateDirectory)/WixTools/$(WixVersion) $(WixRoot)/WixTools.$(WixVersion).zip $(WixRoot)/WixDownload.$(WixVersion).sentinel @@ -85,7 +85,7 @@ Encoding="Unicode"/> diff --git a/build/package/Installer.RPM.targets b/build/package/Installer.RPM.targets index 5736675cd..a4f7853ca 100644 --- a/build/package/Installer.RPM.targets +++ b/build/package/Installer.RPM.targets @@ -191,10 +191,10 @@ $(PackagesDirectory)/$(AspNetCoreRuntimeRpmInstallerFileName) From b092ad0141f7b01d1f46b2126710d9066f99ee09 Mon Sep 17 00:00:00 2001 From: John Beisner Date: Fri, 1 Dec 2017 08:05:33 -0800 Subject: [PATCH 15/34] Changes per code review... --- build/AzureInfo.props | 3 +-- build/BundledRuntimes.props | 1 - scripts/dockerrun.sh | 9 +++++++++ 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/build/AzureInfo.props b/build/AzureInfo.props index cee626a2c..252dbe269 100644 --- a/build/AzureInfo.props +++ b/build/AzureInfo.props @@ -3,8 +3,7 @@ Sdk $(PB_AssetRootUrl) https://dotnetcli.azureedge.net/dotnet/ - $(PB_AssetRootAccessTokenSuffix) - ?$(CoreSetupBlobAccessToken) + ?$(CoreSetupBlobAccessToken) $(ARTIFACT_STORAGE_CONTAINER) dotnet $(ARTIFACT_STORAGE_KEY) diff --git a/build/BundledRuntimes.props b/build/BundledRuntimes.props index cfb5d04ab..82f47ecca 100644 --- a/build/BundledRuntimes.props +++ b/build/BundledRuntimes.props @@ -27,7 +27,6 @@ - $(AssetDownloadRootUrl)/dotnet/ $(CoreSetupBlobRootUrl)Runtime/ $(IntermediateDirectory)/coreSetupDownload/$(SharedFrameworkVersion) $(CoreSetupDownloadDirectory)/combinedSharedHostAndFrameworkArchive$(ArchiveExtension) diff --git a/scripts/dockerrun.sh b/scripts/dockerrun.sh index 30ba88479..abdaec636 100755 --- a/scripts/dockerrun.sh +++ b/scripts/dockerrun.sh @@ -119,14 +119,20 @@ docker run $INTERACTIVE -t --rm --sig-proxy=true \ --name $DOTNET_BUILD_CONTAINER_NAME \ -v $DOCKER_HOST_SHARE_DIR:/opt/code \ -e CHANNEL \ + -e CONNECTION_STRING \ -e REPO_ID \ -e REPO_USER \ + -e REPO_PASS \ -e REPO_SERVER \ -e DOTNET_BUILD_SKIP_CROSSGEN \ -e PUBLISH_TO_AZURE_BLOB \ -e NUGET_FEED_URL \ + -e NUGET_API_KEY \ + -e GITHUB_PASSWORD \ + -e ARTIFACT_STORAGE_KEY \ -e ARTIFACT_STORAGE_ACCOUNT \ -e ARTIFACT_STORAGE_CONTAINER \ + -e CHECKSUM_STORAGE_KEY \ -e CHECKSUM_STORAGE_ACCOUNT \ -e CHECKSUM_STORAGE_CONTAINER \ -e CLIBUILD_SKIP_TESTS \ @@ -135,7 +141,10 @@ docker run $INTERACTIVE -t --rm --sig-proxy=true \ -e RELEASESUFFIX \ -e COREFXAZURECONTAINER \ -e AZUREACCOUNTNAME \ + -e AZUREACCESSTOKEN \ + -e VSOPASSWORD \ -e RELEASETOOLSGITURL \ -e CORESETUPBLOBROOTURL \ + -e CORESETUPBLOBACCESSTOKEN \ $DOTNET_BUILD_CONTAINER_TAG \ $BUILD_COMMAND "$@" From 4adabde4c93c347f2515e5749e759707e192cc56 Mon Sep 17 00:00:00 2001 From: John Beisner Date: Fri, 1 Dec 2017 09:56:11 -0800 Subject: [PATCH 16/34] Accounting for MSRC builds with pre-set 'CoreSetupBlobRootUrl' and 'CoreSetupBlobAccessToke' properties. --- build/AzureInfo.props | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/build/AzureInfo.props b/build/AzureInfo.props index 252dbe269..490ea909e 100644 --- a/build/AzureInfo.props +++ b/build/AzureInfo.props @@ -1,9 +1,10 @@ Sdk - $(PB_AssetRootUrl) + $(PB_AssetRootUrl) https://dotnetcli.azureedge.net/dotnet/ - ?$(CoreSetupBlobAccessToken) + $(PB_AssetRootAccessTokenSuffix) + ?$(CoreSetupBlobAccessToken) $(ARTIFACT_STORAGE_CONTAINER) dotnet $(ARTIFACT_STORAGE_KEY) From c54911b788ca25d2a22aa0d200aa78ee128c0bdc Mon Sep 17 00:00:00 2001 From: John Beisner Date: Fri, 1 Dec 2017 12:39:51 -0800 Subject: [PATCH 17/34] Dependency Uptake: download and import a package version props file. --- build.proj | 6 ++++-- build/DownloadedPackageVersions.targets | 11 +++++++++++ build/InitRepo.props | 1 + build/InitRepo.targets | 3 ++- dir.props | 1 + 5 files changed, 19 insertions(+), 3 deletions(-) create mode 100644 build/DownloadedPackageVersions.targets diff --git a/build.proj b/build.proj index 85de07477..42f35a2a7 100644 --- a/build.proj +++ b/build.proj @@ -33,7 +33,8 @@ + DependsOnTargets="DownloadPackageVersionsProps; + WriteNugetConfigFile"/> $(ExtraRestoreArgs) /p:GeneratePropsFile=$(GeneratePropsFile) @@ -46,10 +47,11 @@ + + - diff --git a/build/DownloadedPackageVersions.targets b/build/DownloadedPackageVersions.targets new file mode 100644 index 000000000..1b3cfae0b --- /dev/null +++ b/build/DownloadedPackageVersions.targets @@ -0,0 +1,11 @@ + + + + ?$(PB_AssetRootAccessTokenSuffix) + + + + + diff --git a/build/InitRepo.props b/build/InitRepo.props index bc7d7e630..49601775c 100644 --- a/build/InitRepo.props +++ b/build/InitRepo.props @@ -4,6 +4,7 @@ $(GeneratedPropsDir)/GitCommitInfo.props $(GeneratedPropsDir)/HostInfo.props $(GeneratedPropsDir)/BuildInfo.props + $(GeneratedPropsDir)/DownloadedPackageVersions.props $(RepoRoot)/NuGet.Config diff --git a/build/InitRepo.targets b/build/InitRepo.targets index 078923dec..0f76d94c5 100644 --- a/build/InitRepo.targets +++ b/build/InitRepo.targets @@ -1,6 +1,7 @@ + From 165f7c45759bf4264dd19783bef35a1368a55645 Mon Sep 17 00:00:00 2001 From: John Beisner Date: Fri, 1 Dec 2017 12:40:40 -0800 Subject: [PATCH 18/34] The first pass will need the extra args [same as run-build.ps1]. --- run-build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/run-build.sh b/run-build.sh index 95154cdf6..597268b25 100755 --- a/run-build.sh +++ b/run-build.sh @@ -188,7 +188,7 @@ export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1 echo "${args[@]}" if [ $BUILD -eq 1 ]; then - dotnet msbuild build.proj /p:Architecture=$ARCHITECTURE $CUSTOM_BUILD_ARGS /p:GeneratePropsFile=true /t:WriteDynamicPropsToStaticPropsFiles + dotnet msbuild build.proj /p:Architecture=$ARCHITECTURE $CUSTOM_BUILD_ARGS /p:GeneratePropsFile=true /t:WriteDynamicPropsToStaticPropsFiles "${args[@]}" dotnet msbuild build.proj /m /v:normal /fl /flp:v=diag /p:Architecture=$ARCHITECTURE $CUSTOM_BUILD_ARGS "${args[@]}" else echo "Not building due to --nobuild" From 0f7783f72ba31b1beb3fe7615bdd512b65bb2eda Mon Sep 17 00:00:00 2001 From: John Beisner Date: Fri, 1 Dec 2017 13:59:25 -0800 Subject: [PATCH 19/34] Fixed typo... --- build.proj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.proj b/build.proj index 42f35a2a7..4b0078b44 100644 --- a/build.proj +++ b/build.proj @@ -34,7 +34,7 @@ Inputs="$(DotnetCliBuildDirectory)/dotnet-cli-build.csproj" Outputs="@(RestoreDotnetCliBuildFrameworkOutputs)" DependsOnTargets="DownloadPackageVersionsProps; - WriteNugetConfigFile"/> + WriteNugetConfigFile"> $(ExtraRestoreArgs) /p:GeneratePropsFile=$(GeneratePropsFile) From 5607d1f68c2ea20462dc5472f75c965868d96ab5 Mon Sep 17 00:00:00 2001 From: John Beisner Date: Fri, 1 Dec 2017 14:01:07 -0800 Subject: [PATCH 20/34] Fixed another typo... --- build/DownloadedPackageVersions.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DownloadedPackageVersions.targets b/build/DownloadedPackageVersions.targets index 1b3cfae0b..f0bf7ab98 100644 --- a/build/DownloadedPackageVersions.targets +++ b/build/DownloadedPackageVersions.targets @@ -4,7 +4,7 @@ ?$(PB_AssetRootAccessTokenSuffix) - From 1362c6c4f17a7d20a1feba0c534f2b2289ee9808 Mon Sep 17 00:00:00 2001 From: John Beisner Date: Fri, 1 Dec 2017 14:06:06 -0800 Subject: [PATCH 21/34] The access key is already resolved: 'CoreSetupBlobAccessTokenParam' --- build/DownloadedPackageVersions.targets | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/build/DownloadedPackageVersions.targets b/build/DownloadedPackageVersions.targets index f0bf7ab98..247a40a26 100644 --- a/build/DownloadedPackageVersions.targets +++ b/build/DownloadedPackageVersions.targets @@ -1,10 +1,7 @@ - - ?$(PB_AssetRootAccessTokenSuffix) - - From f0abfb6b129e799021a7e2d5a04900528590c235 Mon Sep 17 00:00:00 2001 From: John Beisner Date: Fri, 1 Dec 2017 20:07:48 -0800 Subject: [PATCH 22/34] Updating dependency version properties in alignment with sample orchestrated build file at: https://dotnetfeed.blob.core.windows.net/orchestrated/20171129-03/orchestration-metadata/PackageVersions.props --- .../EmptyItemGroup/EmptyItemGroup.csproj | 2 +- .../DotnetAddP2PProjects/Lib/Lib.csproj | 2 +- .../DotnetAddP2PProjects/MoreThanOne/a.csproj | 2 +- .../DotnetAddP2PProjects/MoreThanOne/b.csproj | 2 +- .../Net452AndNetCoreApp10Lib.csproj | 2 +- .../ValidRef/ValidRef.csproj | 2 +- .../WithDoubledRef/WithDoubledRef.csproj | 2 +- .../WithExistingRefCondOnItem.csproj | 2 +- .../WithExistingRefCondWhitespaces.csproj | 2 +- .../WithRefCondNonUniform.csproj | 2 +- .../WithRefNoCondNonUniform.csproj | 2 +- .../dotnet-dependency-context-test.csproj | 2 +- .../dotnet-dependency-tool-invoker.csproj | 2 +- ...ldAppWithMultipleFrameworksAndTools.csproj | 2 +- ...ldAppWithMultipleFrameworksAndTools.csproj | 2 +- .../MSBuildIntegration/build.props | 2 +- .../TestAppWithEmptySln/App/App.csproj | 2 +- .../App/App.csproj | 2 +- .../src/App/App.csproj | 2 +- .../App/App.csproj | 2 +- .../App.csproj | 2 +- .../App.csproj | 2 +- .../App/App.csproj | 2 +- .../App/App.csproj | 2 +- .../App/App.csproj | 2 +- .../App/App.csproj | 2 +- .../App/App.csproj | 2 +- .../App.csproj | 2 +- .../src/App/App.csproj | 2 +- .../VSTestXunitDesktopAndNetCore.csproj | 2 +- build/BundledSdks.props | 8 +-- build/BundledTemplates.props | 6 +-- build/CrossGen.props | 4 +- build/DependencyVersions.props | 50 +++++++++++-------- build/MSBuildExtensions.targets | 6 +-- build/Test.targets | 2 +- build/package/dotnet-deb-tool-consumer.csproj | 2 +- build/publish/RuntimeCoherence.targets | 2 +- .../dotnet-cli-build/dotnet-cli-build.csproj | 8 +-- build_projects/update-dependencies/Program.cs | 6 +-- .../Microsoft.DotNet.Cli.Utils.csproj | 8 +-- ...Microsoft.DotNet.MSBuildSdkResolver.csproj | 4 +- src/dotnet/dotnet.csproj | 22 ++++---- src/redist/redist.csproj | 10 ++-- src/tool_fsharp/tool_fsc.csproj | 4 +- src/tool_msbuild/tool_msbuild.csproj | 6 +-- src/tool_nuget/tool_nuget.csproj | 2 +- src/tool_roslyn/tool_roslyn.csproj | 10 ++-- .../ArgumentForwardingTests.csproj | 4 +- .../ArgumentsReflector.csproj | 2 +- test/EndToEnd/EndToEnd.csproj | 4 +- ...osoft.DotNet.Cli.Sln.Internal.Tests.csproj | 2 +- .../Microsoft.DotNet.Cli.Utils.Tests.csproj | 6 +-- ...crosoft.DotNet.Configurer.UnitTests.csproj | 2 +- ...oft.DotNet.MSBuildSdkResolver.Tests.csproj | 8 +-- ...rosoft.DotNet.Tools.Tests.Utilities.csproj | 2 +- .../Msbuild.Tests.Utilities.csproj | 6 +-- .../binding-redirects.Tests.csproj | 4 +- test/crossgen.Tests/crossgen.Tests.csproj | 2 +- .../dotnet-add-package.Tests.csproj | 4 +- .../dotnet-add-reference.Tests.csproj | 6 +-- .../dotnet-back-compat.Tests.csproj | 2 +- .../dotnet-build.Tests.csproj | 2 +- .../dotnet-clean.Tests.csproj | 2 +- .../dotnet-help.Tests.csproj | 4 +- .../dotnet-list-reference.Tests.csproj | 4 +- .../dotnet-migrate.Tests.csproj | 4 +- .../dotnet-msbuild.Tests.csproj | 2 +- test/dotnet-new.Tests/dotnet-new.Tests.csproj | 4 +- .../dotnet-nuget.UnitTests.csproj | 2 +- .../dotnet-pack.Tests.csproj | 2 +- .../dotnet-publish.Tests.csproj | 2 +- .../dotnet-remove-package.Tests.csproj | 6 +-- .../dotnet-remove-reference.Tests.csproj | 6 +-- .../dotnet-restore.Tests.csproj | 6 +-- test/dotnet-run.Tests/dotnet-run.Tests.csproj | 2 +- .../dotnet-sln-add.Tests.csproj | 4 +- .../dotnet-sln-list.Tests.csproj | 2 +- .../dotnet-sln-remove.Tests.csproj | 2 +- .../dotnet-store.Tests.csproj | 2 +- .../dotnet-test.Tests.csproj | 2 +- .../dotnet-vstest.Tests.csproj | 2 +- test/dotnet.Tests/dotnet.Tests.csproj | 6 +-- .../msbuild.IntegrationTests.csproj | 2 +- .../CrossGen.Dependencies.csproj | 2 +- 85 files changed, 176 insertions(+), 170 deletions(-) diff --git a/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/EmptyItemGroup/EmptyItemGroup.csproj b/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/EmptyItemGroup/EmptyItemGroup.csproj index 0bdb79506..9932034ad 100644 --- a/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/EmptyItemGroup/EmptyItemGroup.csproj +++ b/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/EmptyItemGroup/EmptyItemGroup.csproj @@ -7,7 +7,7 @@ - + diff --git a/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/Lib/Lib.csproj b/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/Lib/Lib.csproj index 1be153a79..46c045fe4 100644 --- a/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/Lib/Lib.csproj +++ b/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/Lib/Lib.csproj @@ -7,6 +7,6 @@ - + diff --git a/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/MoreThanOne/a.csproj b/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/MoreThanOne/a.csproj index 68b8ed617..f648c3487 100644 --- a/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/MoreThanOne/a.csproj +++ b/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/MoreThanOne/a.csproj @@ -7,6 +7,6 @@ - + diff --git a/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/MoreThanOne/b.csproj b/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/MoreThanOne/b.csproj index 68b8ed617..f648c3487 100644 --- a/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/MoreThanOne/b.csproj +++ b/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/MoreThanOne/b.csproj @@ -7,6 +7,6 @@ - + diff --git a/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/Net452AndNetCoreApp10Lib/Net452AndNetCoreApp10Lib.csproj b/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/Net452AndNetCoreApp10Lib/Net452AndNetCoreApp10Lib.csproj index e11e31084..d52699c56 100644 --- a/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/Net452AndNetCoreApp10Lib/Net452AndNetCoreApp10Lib.csproj +++ b/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/Net452AndNetCoreApp10Lib/Net452AndNetCoreApp10Lib.csproj @@ -6,6 +6,6 @@ net452;netcoreapp2.0 - + diff --git a/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/ValidRef/ValidRef.csproj b/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/ValidRef/ValidRef.csproj index 0fc35d3d8..e6cf81456 100644 --- a/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/ValidRef/ValidRef.csproj +++ b/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/ValidRef/ValidRef.csproj @@ -6,6 +6,6 @@ net451;netcoreapp1.0;netstandard1.4 - + diff --git a/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithDoubledRef/WithDoubledRef.csproj b/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithDoubledRef/WithDoubledRef.csproj index f33aa7821..f0e2e3daa 100644 --- a/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithDoubledRef/WithDoubledRef.csproj +++ b/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithDoubledRef/WithDoubledRef.csproj @@ -6,7 +6,7 @@ net451;netcoreapp1.0 - + diff --git a/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithExistingRefCondOnItem/WithExistingRefCondOnItem.csproj b/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithExistingRefCondOnItem/WithExistingRefCondOnItem.csproj index 8747ed6b7..3df93bb2f 100644 --- a/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithExistingRefCondOnItem/WithExistingRefCondOnItem.csproj +++ b/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithExistingRefCondOnItem/WithExistingRefCondOnItem.csproj @@ -6,7 +6,7 @@ net451;netcoreapp1.0 - + diff --git a/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithExistingRefCondWhitespaces/WithExistingRefCondWhitespaces.csproj b/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithExistingRefCondWhitespaces/WithExistingRefCondWhitespaces.csproj index 0b2792110..e4daa90a6 100644 --- a/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithExistingRefCondWhitespaces/WithExistingRefCondWhitespaces.csproj +++ b/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithExistingRefCondWhitespaces/WithExistingRefCondWhitespaces.csproj @@ -6,7 +6,7 @@ net451;netcoreapp1.0 - + diff --git a/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithRefCondNonUniform/WithRefCondNonUniform.csproj b/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithRefCondNonUniform/WithRefCondNonUniform.csproj index decd23bec..fa3e79ef9 100644 --- a/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithRefCondNonUniform/WithRefCondNonUniform.csproj +++ b/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithRefCondNonUniform/WithRefCondNonUniform.csproj @@ -6,7 +6,7 @@ net451;netcoreapp1.0 - + diff --git a/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithRefNoCondNonUniform/WithRefNoCondNonUniform.csproj b/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithRefNoCondNonUniform/WithRefNoCondNonUniform.csproj index 328fc5fb1..6a07adae0 100644 --- a/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithRefNoCondNonUniform/WithRefNoCondNonUniform.csproj +++ b/TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithRefNoCondNonUniform/WithRefNoCondNonUniform.csproj @@ -6,7 +6,7 @@ net451;netcoreapp1.0 - + diff --git a/TestAssets/TestPackages/dotnet-dependency-context-test/dotnet-dependency-context-test.csproj b/TestAssets/TestPackages/dotnet-dependency-context-test/dotnet-dependency-context-test.csproj index 97e20d00d..82c3d38ea 100644 --- a/TestAssets/TestPackages/dotnet-dependency-context-test/dotnet-dependency-context-test.csproj +++ b/TestAssets/TestPackages/dotnet-dependency-context-test/dotnet-dependency-context-test.csproj @@ -8,7 +8,7 @@ - + diff --git a/TestAssets/TestPackages/dotnet-dependency-tool-invoker/dotnet-dependency-tool-invoker.csproj b/TestAssets/TestPackages/dotnet-dependency-tool-invoker/dotnet-dependency-tool-invoker.csproj index a6c5b91c1..66edff1f0 100644 --- a/TestAssets/TestPackages/dotnet-dependency-tool-invoker/dotnet-dependency-tool-invoker.csproj +++ b/TestAssets/TestPackages/dotnet-dependency-tool-invoker/dotnet-dependency-tool-invoker.csproj @@ -19,7 +19,7 @@ - + diff --git a/TestAssets/TestProjects/AppWithMultipleFxAndTools/MSBuildAppWithMultipleFrameworksAndTools.csproj b/TestAssets/TestProjects/AppWithMultipleFxAndTools/MSBuildAppWithMultipleFrameworksAndTools.csproj index 33cb2b5a7..965ca32df 100644 --- a/TestAssets/TestProjects/AppWithMultipleFxAndTools/MSBuildAppWithMultipleFrameworksAndTools.csproj +++ b/TestAssets/TestProjects/AppWithMultipleFxAndTools/MSBuildAppWithMultipleFrameworksAndTools.csproj @@ -10,7 +10,7 @@ - + diff --git a/TestAssets/TestProjects/MSBuildAppWithMultipleFrameworksAndTools/MSBuildAppWithMultipleFrameworksAndTools.csproj b/TestAssets/TestProjects/MSBuildAppWithMultipleFrameworksAndTools/MSBuildAppWithMultipleFrameworksAndTools.csproj index 766c1ae66..0efe63453 100644 --- a/TestAssets/TestProjects/MSBuildAppWithMultipleFrameworksAndTools/MSBuildAppWithMultipleFrameworksAndTools.csproj +++ b/TestAssets/TestProjects/MSBuildAppWithMultipleFrameworksAndTools/MSBuildAppWithMultipleFrameworksAndTools.csproj @@ -10,7 +10,7 @@ - + diff --git a/TestAssets/TestProjects/MSBuildIntegration/build.props b/TestAssets/TestProjects/MSBuildIntegration/build.props index 3d640d339..edc4720d9 100644 --- a/TestAssets/TestProjects/MSBuildIntegration/build.props +++ b/TestAssets/TestProjects/MSBuildIntegration/build.props @@ -2,6 +2,6 @@ - + \ No newline at end of file diff --git a/TestAssets/TestProjects/TestAppWithEmptySln/App/App.csproj b/TestAssets/TestProjects/TestAppWithEmptySln/App/App.csproj index ce5bf06cb..a314f6f81 100644 --- a/TestAssets/TestProjects/TestAppWithEmptySln/App/App.csproj +++ b/TestAssets/TestProjects/TestAppWithEmptySln/App/App.csproj @@ -11,7 +11,7 @@ - + diff --git a/TestAssets/TestProjects/TestAppWithMultipleSlnFiles/App/App.csproj b/TestAssets/TestProjects/TestAppWithMultipleSlnFiles/App/App.csproj index 7a2163613..c8ab8e530 100644 --- a/TestAssets/TestProjects/TestAppWithMultipleSlnFiles/App/App.csproj +++ b/TestAssets/TestProjects/TestAppWithMultipleSlnFiles/App/App.csproj @@ -7,7 +7,7 @@ - + diff --git a/TestAssets/TestProjects/TestAppWithSlnAndCaseSensitiveSolutionFolders/src/App/App.csproj b/TestAssets/TestProjects/TestAppWithSlnAndCaseSensitiveSolutionFolders/src/App/App.csproj index 3a31eb5bf..64870d559 100644 --- a/TestAssets/TestProjects/TestAppWithSlnAndCaseSensitiveSolutionFolders/src/App/App.csproj +++ b/TestAssets/TestProjects/TestAppWithSlnAndCaseSensitiveSolutionFolders/src/App/App.csproj @@ -11,7 +11,7 @@ - + diff --git a/TestAssets/TestProjects/TestAppWithSlnAndCsprojFiles/App/App.csproj b/TestAssets/TestProjects/TestAppWithSlnAndCsprojFiles/App/App.csproj index ce5bf06cb..a314f6f81 100644 --- a/TestAssets/TestProjects/TestAppWithSlnAndCsprojFiles/App/App.csproj +++ b/TestAssets/TestProjects/TestAppWithSlnAndCsprojFiles/App/App.csproj @@ -11,7 +11,7 @@ - + diff --git a/TestAssets/TestProjects/TestAppWithSlnAndCsprojInSubDir/App.csproj b/TestAssets/TestProjects/TestAppWithSlnAndCsprojInSubDir/App.csproj index 92f102c88..a3f261628 100644 --- a/TestAssets/TestProjects/TestAppWithSlnAndCsprojInSubDir/App.csproj +++ b/TestAssets/TestProjects/TestAppWithSlnAndCsprojInSubDir/App.csproj @@ -11,7 +11,7 @@ - + diff --git a/TestAssets/TestProjects/TestAppWithSlnAndCsprojInSubDirToRemove/App.csproj b/TestAssets/TestProjects/TestAppWithSlnAndCsprojInSubDirToRemove/App.csproj index abea1bc3d..0fd2b18ad 100644 --- a/TestAssets/TestProjects/TestAppWithSlnAndCsprojInSubDirToRemove/App.csproj +++ b/TestAssets/TestProjects/TestAppWithSlnAndCsprojInSubDirToRemove/App.csproj @@ -7,6 +7,6 @@ - + \ No newline at end of file diff --git a/TestAssets/TestProjects/TestAppWithSlnAndCsprojProjectGuidFiles/App/App.csproj b/TestAssets/TestProjects/TestAppWithSlnAndCsprojProjectGuidFiles/App/App.csproj index ce5bf06cb..a314f6f81 100644 --- a/TestAssets/TestProjects/TestAppWithSlnAndCsprojProjectGuidFiles/App/App.csproj +++ b/TestAssets/TestProjects/TestAppWithSlnAndCsprojProjectGuidFiles/App/App.csproj @@ -11,7 +11,7 @@ - + diff --git a/TestAssets/TestProjects/TestAppWithSlnAndCsprojToRemove/App/App.csproj b/TestAssets/TestProjects/TestAppWithSlnAndCsprojToRemove/App/App.csproj index 7a2163613..c8ab8e530 100644 --- a/TestAssets/TestProjects/TestAppWithSlnAndCsprojToRemove/App/App.csproj +++ b/TestAssets/TestProjects/TestAppWithSlnAndCsprojToRemove/App/App.csproj @@ -7,7 +7,7 @@ - + diff --git a/TestAssets/TestProjects/TestAppWithSlnAndDuplicateProjectReferences/App/App.csproj b/TestAssets/TestProjects/TestAppWithSlnAndDuplicateProjectReferences/App/App.csproj index ce5bf06cb..a314f6f81 100644 --- a/TestAssets/TestProjects/TestAppWithSlnAndDuplicateProjectReferences/App/App.csproj +++ b/TestAssets/TestProjects/TestAppWithSlnAndDuplicateProjectReferences/App/App.csproj @@ -11,7 +11,7 @@ - + diff --git a/TestAssets/TestProjects/TestAppWithSlnAndExistingCsprojReferences/App/App.csproj b/TestAssets/TestProjects/TestAppWithSlnAndExistingCsprojReferences/App/App.csproj index 21cce6681..6b530243e 100644 --- a/TestAssets/TestProjects/TestAppWithSlnAndExistingCsprojReferences/App/App.csproj +++ b/TestAssets/TestProjects/TestAppWithSlnAndExistingCsprojReferences/App/App.csproj @@ -15,7 +15,7 @@ - + diff --git a/TestAssets/TestProjects/TestAppWithSlnAndExistingCsprojReferencesWithEscapedDirSep/App/App.csproj b/TestAssets/TestProjects/TestAppWithSlnAndExistingCsprojReferencesWithEscapedDirSep/App/App.csproj index 21cce6681..6b530243e 100644 --- a/TestAssets/TestProjects/TestAppWithSlnAndExistingCsprojReferencesWithEscapedDirSep/App/App.csproj +++ b/TestAssets/TestProjects/TestAppWithSlnAndExistingCsprojReferencesWithEscapedDirSep/App/App.csproj @@ -15,7 +15,7 @@ - + diff --git a/TestAssets/TestProjects/TestAppWithSlnAndLastCsprojInSubDirToRemove/App.csproj b/TestAssets/TestProjects/TestAppWithSlnAndLastCsprojInSubDirToRemove/App.csproj index abea1bc3d..0fd2b18ad 100644 --- a/TestAssets/TestProjects/TestAppWithSlnAndLastCsprojInSubDirToRemove/App.csproj +++ b/TestAssets/TestProjects/TestAppWithSlnAndLastCsprojInSubDirToRemove/App.csproj @@ -7,6 +7,6 @@ - + \ No newline at end of file diff --git a/TestAssets/TestProjects/TestAppWithSlnAndSolutionFolders/src/App/App.csproj b/TestAssets/TestProjects/TestAppWithSlnAndSolutionFolders/src/App/App.csproj index 3a31eb5bf..64870d559 100644 --- a/TestAssets/TestProjects/TestAppWithSlnAndSolutionFolders/src/App/App.csproj +++ b/TestAssets/TestProjects/TestAppWithSlnAndSolutionFolders/src/App/App.csproj @@ -11,7 +11,7 @@ - + diff --git a/TestAssets/TestProjects/XunitMulti/VSTestXunitDesktopAndNetCore.csproj b/TestAssets/TestProjects/XunitMulti/VSTestXunitDesktopAndNetCore.csproj index 3c971a5e9..e236f2945 100644 --- a/TestAssets/TestProjects/XunitMulti/VSTestXunitDesktopAndNetCore.csproj +++ b/TestAssets/TestProjects/XunitMulti/VSTestXunitDesktopAndNetCore.csproj @@ -12,7 +12,7 @@ - + diff --git a/build/BundledSdks.props b/build/BundledSdks.props index b259c4a2a..8c8bfe7bc 100644 --- a/build/BundledSdks.props +++ b/build/BundledSdks.props @@ -1,10 +1,10 @@ - - - - + + + + diff --git a/build/BundledTemplates.props b/build/BundledTemplates.props index a7a7069ab..23d0a8573 100644 --- a/build/BundledTemplates.props +++ b/build/BundledTemplates.props @@ -1,8 +1,8 @@ - - - + + + diff --git a/build/CrossGen.props b/build/CrossGen.props index 8d5dd78ec..a07ed8ba5 100644 --- a/build/CrossGen.props +++ b/build/CrossGen.props @@ -1,8 +1,8 @@ runtime.$(SharedFrameworkRid).microsoft.netcore.app - $(NuGetPackagesDir)/$(RuntimeNETCoreAppPackageName)/$(CLI_SharedFrameworkVersion)/tools/crossgen$(ExeExtension) - $(NuGetPackagesDir)/$(RuntimeNETCoreAppPackageName)/$(CLI_SharedFrameworkVersion)/runtimes/$(SharedFrameworkRid)/native/$(DynamicLibPrefix)clrjit$(DynamicLibExtension) + $(NuGetPackagesDir)/$(RuntimeNETCoreAppPackageName)/$(MicrosoftNETCoreAppPackageVersion)/tools/crossgen$(ExeExtension) + $(NuGetPackagesDir)/$(RuntimeNETCoreAppPackageName)/$(MicrosoftNETCoreAppPackageVersion)/runtimes/$(SharedFrameworkRid)/native/$(DynamicLibPrefix)clrjit$(DynamicLibExtension) $(OutputDirectory)/shared/$(SharedFrameworkName)/$(SharedFrameworkVersion) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index befa25b16..2a4aec283 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -1,34 +1,40 @@ - 2.0.3 - 15.4.8 - 2.3.2-beta1-61921-05 + 2.0.3 + 15.4.8 + 4.2.0-rtm-171027-0 + 2.3.2-beta1-61921-05 + $(MicrosoftCodeAnalysisCSharpPackageVersion) + $(MicrosoftCodeAnalysisCSharpPackageVersion) + 2.0.3-servicing-20171109-3 + $(MicrosoftNETSdkPackageVersion) + 2.0.0-rel-20170908-653 + $(MicrosoftNETSdkWebPackageVersion) + $(MicrosoftNETSdkWebPackageVersion) + 1.0.0-beta2-20170810-304 + $(MicrosoftDotNetCommonItemTemplatesPackageVersion) + $(MicrosoftDotNetCommonItemTemplatesPackageVersion) + $(MicrosoftDotNetCommonItemTemplatesPackageVersion) + $(MicrosoftDotNetCommonItemTemplatesPackageVersion) + $(MicrosoftDotNetCommonItemTemplatesPackageVersion) + $(MicrosoftDotNetCommonItemTemplatesPackageVersion) + $(MicrosoftDotNetCommonItemTemplatesPackageVersion) + 2.0.0 + 2.0.0 + 0.1.1-alpha-167 + 1.2.1-alpha-002133 + 2.3.0-pre-20170727-1 1.6.0-beta2-25304 - 4.2.0-rtm-171027-0 4.4.1-pre-20170727-1 - - - 2.0.3-servicing-20171109-3 - $(CLI_NETSDK_Version) - 4.4.0-preview3-4475 2.0.0-preview3-25514-04 - 2.0.0-rel-20170908-653 15.3.0-preview-20170628-02 - $(CLI_SharedFrameworkVersion) - $(CLI_SharedFrameworkVersion) - $(CLI_SharedFrameworkVersion) - 1.0.0-beta2-20170810-304 - 1.0.0-beta2-20170810-304 - 1.0.0-beta2-20170810-304 - 2.0.0 - 2.0.0 - 0.1.1-alpha-167 - 1.2.1-alpha-002133 + + $(MicrosoftNETCoreAppPackageVersion) + $(MicrosoftNETCoreAppPackageVersion) + $(MicrosoftNETCoreAppPackageVersion) 0.2.0 0.2.0-beta-000042 diff --git a/build/MSBuildExtensions.targets b/build/MSBuildExtensions.targets index c6dd9f7ae..fd3c473be 100644 --- a/build/MSBuildExtensions.targets +++ b/build/MSBuildExtensions.targets @@ -56,7 +56,7 @@ Microsoft.NET.Build.Extensions 15.0 - $(NuGetPackagesDir)/$(MSBuildExtensionsPackageName.ToLower())/$(CLI_MSBuildExtensions_Version.ToLower()) + $(NuGetPackagesDir)/$(MSBuildExtensionsPackageName.ToLower())/$(MicrosoftNETBuildExtensionsPackageVersion.ToLower()) NETStandard.Library.NETFramework $(NuGetPackagesDir)/$(NETStandardLibraryNETFrameworkPackageName.ToLower())/$(CLI_NETStandardLibraryNETFrameworkVersion.ToLower()) @@ -66,7 +66,7 @@ - + @@ -105,7 +105,7 @@ Text="Failed to determine the NETStandard.Library version pulled in Microsoft.NETCore.App" /> - <_NETCoreAppPackageVersion>$(CLI_SharedFrameworkVersion) + <_NETCoreAppPackageVersion>$(MicrosoftNETCoreAppPackageVersion) <_NETStandardPackageVersion>@(_NETStandardLibraryVersions->Distinct()) diff --git a/build/Test.targets b/build/Test.targets index 0b8bc0620..83591e179 100644 --- a/build/Test.targets +++ b/build/Test.targets @@ -46,7 +46,7 @@ - + netcoreapp2.0 - $(CLI_SharedFrameworkVersion) + $(MicrosoftNETCoreAppPackageVersion) diff --git a/build/publish/RuntimeCoherence.targets b/build/publish/RuntimeCoherence.targets index 5ba7482bf..5da9ffd49 100644 --- a/build/publish/RuntimeCoherence.targets +++ b/build/publish/RuntimeCoherence.targets @@ -19,7 +19,7 @@ false - true + true diff --git a/build_projects/dotnet-cli-build/dotnet-cli-build.csproj b/build_projects/dotnet-cli-build/dotnet-cli-build.csproj index 86531abc4..c74c327a0 100644 --- a/build_projects/dotnet-cli-build/dotnet-cli-build.csproj +++ b/build_projects/dotnet-cli-build/dotnet-cli-build.csproj @@ -15,7 +15,7 @@ - + @@ -23,11 +23,11 @@ - + - - + + diff --git a/build_projects/update-dependencies/Program.cs b/build_projects/update-dependencies/Program.cs index e256564d6..27926a77c 100644 --- a/build_projects/update-dependencies/Program.cs +++ b/build_projects/update-dependencies/Program.cs @@ -81,9 +81,9 @@ namespace Microsoft.DotNet.Scripts private static IEnumerable GetUpdaters() { string dependencyVersionsPath = Path.Combine("build", "DependencyVersions.props"); - yield return CreateRegexUpdater(dependencyVersionsPath, "CLI_SharedFrameworkVersion", "Microsoft.NETCore.App"); - yield return CreateRegexUpdater(dependencyVersionsPath, "PlatformAbstractionsVersion", "Microsoft.DotNet.PlatformAbstractions"); - yield return CreateRegexUpdater(dependencyVersionsPath, "DependencyModelVersion", "Microsoft.Extensions.DependencyModel"); + yield return CreateRegexUpdater(dependencyVersionsPath, "MicrosoftNETCoreAppPackageVersion", "Microsoft.NETCore.App"); + yield return CreateRegexUpdater(dependencyVersionsPath, "MicrosoftDotNetPlatformAbstractionsPackageVersion", "Microsoft.DotNet.PlatformAbstractions"); + yield return CreateRegexUpdater(dependencyVersionsPath, "MicrosoftExtensionsDependencyModelPackageVersion", "Microsoft.Extensions.DependencyModel"); } private static IDependencyUpdater CreateRegexUpdater(string repoRelativePath, string propertyName, string packageId) diff --git a/src/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj b/src/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj index ed1056755..e3ad770fd 100644 --- a/src/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj +++ b/src/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj @@ -16,14 +16,14 @@ - - + + - - + + diff --git a/src/Microsoft.DotNet.MSBuildSdkResolver/Microsoft.DotNet.MSBuildSdkResolver.csproj b/src/Microsoft.DotNet.MSBuildSdkResolver/Microsoft.DotNet.MSBuildSdkResolver.csproj index ca8867c75..715832530 100644 --- a/src/Microsoft.DotNet.MSBuildSdkResolver/Microsoft.DotNet.MSBuildSdkResolver.csproj +++ b/src/Microsoft.DotNet.MSBuildSdkResolver/Microsoft.DotNet.MSBuildSdkResolver.csproj @@ -16,8 +16,8 @@ - - + + diff --git a/src/dotnet/dotnet.csproj b/src/dotnet/dotnet.csproj index 71da96676..3c9999298 100644 --- a/src/dotnet/dotnet.csproj +++ b/src/dotnet/dotnet.csproj @@ -52,22 +52,22 @@ - + - - - - - - - - - - + + + + + + + + + + diff --git a/src/redist/redist.csproj b/src/redist/redist.csproj index b8e179c3b..b5e1fac79 100644 --- a/src/redist/redist.csproj +++ b/src/redist/redist.csproj @@ -7,7 +7,7 @@ $(CliVersionPrefix) netcoreapp2.0 - $(CLI_SharedFrameworkVersion) + $(MicrosoftNETCoreAppPackageVersion) true false $(AssetTargetFallback);dotnet5.4 @@ -16,8 +16,8 @@ - - + + @@ -25,7 +25,7 @@ - + @@ -297,7 +297,7 @@ $(PublishDir)/vstest.console.runtimeconfig.json "version": ".*" - "version": "$(CLI_SharedFrameworkVersion)" + "version": "$(MicrosoftNETCoreAppPackageVersion)" - - + + diff --git a/src/tool_msbuild/tool_msbuild.csproj b/src/tool_msbuild/tool_msbuild.csproj index 7a109b08d..3a72fc06c 100644 --- a/src/tool_msbuild/tool_msbuild.csproj +++ b/src/tool_msbuild/tool_msbuild.csproj @@ -9,8 +9,8 @@ - - - + + + diff --git a/src/tool_nuget/tool_nuget.csproj b/src/tool_nuget/tool_nuget.csproj index 5a4e4121f..9b402b456 100644 --- a/src/tool_nuget/tool_nuget.csproj +++ b/src/tool_nuget/tool_nuget.csproj @@ -9,7 +9,7 @@ - + \ No newline at end of file diff --git a/src/tool_roslyn/tool_roslyn.csproj b/src/tool_roslyn/tool_roslyn.csproj index bd702ca7c..906056133 100644 --- a/src/tool_roslyn/tool_roslyn.csproj +++ b/src/tool_roslyn/tool_roslyn.csproj @@ -5,17 +5,17 @@ $(CliVersionPrefix) netcoreapp2.0 - $(CLI_SharedFrameworkVersion) + $(MicrosoftNETCoreAppPackageVersion) true $(RoslynDirectory) $(CommitCount) - - - - + + + + diff --git a/test/ArgumentForwardingTests/ArgumentForwardingTests.csproj b/test/ArgumentForwardingTests/ArgumentForwardingTests.csproj index c71c5cf15..fbafac34b 100644 --- a/test/ArgumentForwardingTests/ArgumentForwardingTests.csproj +++ b/test/ArgumentForwardingTests/ArgumentForwardingTests.csproj @@ -3,7 +3,7 @@ $(CliTargetFramework) - $(CLI_SharedFrameworkVersion) + $(MicrosoftNETCoreAppPackageVersion) ArgumentForwardingTests Exe $(AssetTargetFallback);dotnet5.4;portable-net451+win8 @@ -18,7 +18,7 @@ - + $(CliTargetFramework) - $(CLI_SharedFrameworkVersion) + $(MicrosoftNETCoreAppPackageVersion) ArgumentsReflector Exe diff --git a/test/EndToEnd/EndToEnd.csproj b/test/EndToEnd/EndToEnd.csproj index 83c4a521a..8cb5233b6 100644 --- a/test/EndToEnd/EndToEnd.csproj +++ b/test/EndToEnd/EndToEnd.csproj @@ -3,7 +3,7 @@ $(CliTargetFramework) - $(CLI_SharedFrameworkVersion) + $(MicrosoftNETCoreAppPackageVersion) EndToEnd Exe $(AssetTargetFallback);dotnet5.4;portable-net451+win8 @@ -26,6 +26,6 @@ - + diff --git a/test/Microsoft.DotNet.Cli.Sln.Internal.Tests/Microsoft.DotNet.Cli.Sln.Internal.Tests.csproj b/test/Microsoft.DotNet.Cli.Sln.Internal.Tests/Microsoft.DotNet.Cli.Sln.Internal.Tests.csproj index 0cc22883c..368056b12 100644 --- a/test/Microsoft.DotNet.Cli.Sln.Internal.Tests/Microsoft.DotNet.Cli.Sln.Internal.Tests.csproj +++ b/test/Microsoft.DotNet.Cli.Sln.Internal.Tests/Microsoft.DotNet.Cli.Sln.Internal.Tests.csproj @@ -3,7 +3,7 @@ $(CliTargetFramework) - $(CLI_SharedFrameworkVersion) + $(MicrosoftNETCoreAppPackageVersion) true Microsoft.DotNet.Cli.Sln.Internal.Tests ../../tools/test_key.snk diff --git a/test/Microsoft.DotNet.Cli.Utils.Tests/Microsoft.DotNet.Cli.Utils.Tests.csproj b/test/Microsoft.DotNet.Cli.Utils.Tests/Microsoft.DotNet.Cli.Utils.Tests.csproj index dce7b8e2e..de6d8dc1b 100644 --- a/test/Microsoft.DotNet.Cli.Utils.Tests/Microsoft.DotNet.Cli.Utils.Tests.csproj +++ b/test/Microsoft.DotNet.Cli.Utils.Tests/Microsoft.DotNet.Cli.Utils.Tests.csproj @@ -3,7 +3,7 @@ $(CliTargetFramework) - $(CLI_SharedFrameworkVersion) + $(MicrosoftNETCoreAppPackageVersion) Microsoft.DotNet.Cli.Utils.Tests Exe ../../tools/Key.snk @@ -38,7 +38,7 @@ - - + + diff --git a/test/Microsoft.DotNet.Configurer.UnitTests/Microsoft.DotNet.Configurer.UnitTests.csproj b/test/Microsoft.DotNet.Configurer.UnitTests/Microsoft.DotNet.Configurer.UnitTests.csproj index 69269abf5..d29825acd 100644 --- a/test/Microsoft.DotNet.Configurer.UnitTests/Microsoft.DotNet.Configurer.UnitTests.csproj +++ b/test/Microsoft.DotNet.Configurer.UnitTests/Microsoft.DotNet.Configurer.UnitTests.csproj @@ -3,7 +3,7 @@ $(CliTargetFramework) - $(CLI_SharedFrameworkVersion) + $(MicrosoftNETCoreAppPackageVersion) true Microsoft.DotNet.Configurer.UnitTests ../../tools/Key.snk diff --git a/test/Microsoft.DotNet.MSBuildSdkResolver.Tests/Microsoft.DotNet.MSBuildSdkResolver.Tests.csproj b/test/Microsoft.DotNet.MSBuildSdkResolver.Tests/Microsoft.DotNet.MSBuildSdkResolver.Tests.csproj index a21bb4731..bad2c53bf 100644 --- a/test/Microsoft.DotNet.MSBuildSdkResolver.Tests/Microsoft.DotNet.MSBuildSdkResolver.Tests.csproj +++ b/test/Microsoft.DotNet.MSBuildSdkResolver.Tests/Microsoft.DotNet.MSBuildSdkResolver.Tests.csproj @@ -4,7 +4,7 @@ $(CliTargetFramework) - $(CLI_SharedFrameworkVersion) + $(MicrosoftNETCoreAppPackageVersion) Exe ../../tools/Key.snk true @@ -17,12 +17,12 @@ - + - - + + diff --git a/test/Microsoft.DotNet.Tools.Tests.Utilities/Microsoft.DotNet.Tools.Tests.Utilities.csproj b/test/Microsoft.DotNet.Tools.Tests.Utilities/Microsoft.DotNet.Tools.Tests.Utilities.csproj index c13629f52..2ac3bfe37 100644 --- a/test/Microsoft.DotNet.Tools.Tests.Utilities/Microsoft.DotNet.Tools.Tests.Utilities.csproj +++ b/test/Microsoft.DotNet.Tools.Tests.Utilities/Microsoft.DotNet.Tools.Tests.Utilities.csproj @@ -21,6 +21,6 @@ - + \ No newline at end of file diff --git a/test/Msbuild.Tests.Utilities/Msbuild.Tests.Utilities.csproj b/test/Msbuild.Tests.Utilities/Msbuild.Tests.Utilities.csproj index ded34abd0..ba6e65af5 100644 --- a/test/Msbuild.Tests.Utilities/Msbuild.Tests.Utilities.csproj +++ b/test/Msbuild.Tests.Utilities/Msbuild.Tests.Utilities.csproj @@ -3,7 +3,7 @@ $(CliTargetFramework) - $(CLI_SharedFrameworkVersion) + $(MicrosoftNETCoreAppPackageVersion) Msbuild.Tests.Utilities $(AssetTargetFallback);dotnet5.4;portable-net451+win8 @@ -20,7 +20,7 @@ - - + + diff --git a/test/binding-redirects.Tests/binding-redirects.Tests.csproj b/test/binding-redirects.Tests/binding-redirects.Tests.csproj index 7922a876d..aa58dd6e7 100644 --- a/test/binding-redirects.Tests/binding-redirects.Tests.csproj +++ b/test/binding-redirects.Tests/binding-redirects.Tests.csproj @@ -3,7 +3,7 @@ $(CliTargetFramework) - $(CLI_SharedFrameworkVersion) + $(MicrosoftNETCoreAppPackageVersion) true binding-redirects.Tests $(AssetTargetFallback);dotnet5.4;portable-net451+win8 @@ -17,6 +17,6 @@ - + diff --git a/test/crossgen.Tests/crossgen.Tests.csproj b/test/crossgen.Tests/crossgen.Tests.csproj index 980cd78e7..3050759b4 100644 --- a/test/crossgen.Tests/crossgen.Tests.csproj +++ b/test/crossgen.Tests/crossgen.Tests.csproj @@ -3,7 +3,7 @@ $(CliTargetFramework) - $(CLI_SharedFrameworkVersion) + $(MicrosoftNETCoreAppPackageVersion) true crossgen.Tests $(AssetTargetFallback);dotnet5.4;portable-net451+win8 diff --git a/test/dotnet-add-package.Tests/dotnet-add-package.Tests.csproj b/test/dotnet-add-package.Tests/dotnet-add-package.Tests.csproj index 36ec73b00..f49750d6a 100644 --- a/test/dotnet-add-package.Tests/dotnet-add-package.Tests.csproj +++ b/test/dotnet-add-package.Tests/dotnet-add-package.Tests.csproj @@ -3,7 +3,7 @@ $(CliTargetFramework) - $(CLI_SharedFrameworkVersion) + $(MicrosoftNETCoreAppPackageVersion) true dotnet-add-package.Tests ../../tools/Key.snk @@ -25,6 +25,6 @@ - + diff --git a/test/dotnet-add-reference.Tests/dotnet-add-reference.Tests.csproj b/test/dotnet-add-reference.Tests/dotnet-add-reference.Tests.csproj index 46b4c5b3a..a023511e3 100644 --- a/test/dotnet-add-reference.Tests/dotnet-add-reference.Tests.csproj +++ b/test/dotnet-add-reference.Tests/dotnet-add-reference.Tests.csproj @@ -3,7 +3,7 @@ $(CliTargetFramework) - $(CLI_SharedFrameworkVersion) + $(MicrosoftNETCoreAppPackageVersion) true dotnet-add-reference.Tests ../../tools/Key.snk @@ -24,7 +24,7 @@ - - + + diff --git a/test/dotnet-back-compat.Tests/dotnet-back-compat.Tests.csproj b/test/dotnet-back-compat.Tests/dotnet-back-compat.Tests.csproj index 0b7b9fa26..502840ae8 100644 --- a/test/dotnet-back-compat.Tests/dotnet-back-compat.Tests.csproj +++ b/test/dotnet-back-compat.Tests/dotnet-back-compat.Tests.csproj @@ -3,7 +3,7 @@ $(CliTargetFramework) - $(CLI_SharedFrameworkVersion) + $(MicrosoftNETCoreAppPackageVersion) true dotnet-back-compat.Tests diff --git a/test/dotnet-build.Tests/dotnet-build.Tests.csproj b/test/dotnet-build.Tests/dotnet-build.Tests.csproj index d72a8f986..95f80d6bf 100644 --- a/test/dotnet-build.Tests/dotnet-build.Tests.csproj +++ b/test/dotnet-build.Tests/dotnet-build.Tests.csproj @@ -3,7 +3,7 @@ $(CliTargetFramework) - $(CLI_SharedFrameworkVersion) + $(MicrosoftNETCoreAppPackageVersion) true dotnet-build.Tests $(AssetTargetFallback);dotnet5.4;portable-net451+win8 diff --git a/test/dotnet-clean.Tests/dotnet-clean.Tests.csproj b/test/dotnet-clean.Tests/dotnet-clean.Tests.csproj index 831a64d3b..2cec39474 100644 --- a/test/dotnet-clean.Tests/dotnet-clean.Tests.csproj +++ b/test/dotnet-clean.Tests/dotnet-clean.Tests.csproj @@ -3,7 +3,7 @@ $(CliTargetFramework) - $(CLI_SharedFrameworkVersion) + $(MicrosoftNETCoreAppPackageVersion) true dotnet-clean.Tests $(AssetTargetFallback);dotnet5.4;portable-net451+win8 diff --git a/test/dotnet-help.Tests/dotnet-help.Tests.csproj b/test/dotnet-help.Tests/dotnet-help.Tests.csproj index 88443c674..70ce3486e 100644 --- a/test/dotnet-help.Tests/dotnet-help.Tests.csproj +++ b/test/dotnet-help.Tests/dotnet-help.Tests.csproj @@ -3,7 +3,7 @@ $(CliTargetFramework) - $(CLI_SharedFrameworkVersion) + $(MicrosoftNETCoreAppPackageVersion) true dotnet-help.Tests ../../tools/Key.snk @@ -20,7 +20,7 @@ - + diff --git a/test/dotnet-list-reference.Tests/dotnet-list-reference.Tests.csproj b/test/dotnet-list-reference.Tests/dotnet-list-reference.Tests.csproj index c62326007..32b249ed5 100644 --- a/test/dotnet-list-reference.Tests/dotnet-list-reference.Tests.csproj +++ b/test/dotnet-list-reference.Tests/dotnet-list-reference.Tests.csproj @@ -3,7 +3,7 @@ $(CliTargetFramework) - $(CLI_SharedFrameworkVersion) + $(MicrosoftNETCoreAppPackageVersion) true dotnet-list-reference.Tests ../../tools/Key.snk @@ -23,6 +23,6 @@ - + diff --git a/test/dotnet-migrate.Tests/dotnet-migrate.Tests.csproj b/test/dotnet-migrate.Tests/dotnet-migrate.Tests.csproj index 2a9fe2963..0bc0b107c 100644 --- a/test/dotnet-migrate.Tests/dotnet-migrate.Tests.csproj +++ b/test/dotnet-migrate.Tests/dotnet-migrate.Tests.csproj @@ -3,7 +3,7 @@ $(CliTargetFramework) - $(CLI_SharedFrameworkVersion) + $(MicrosoftNETCoreAppPackageVersion) true dotnet-migrate.Tests $(AssetTargetFallback);netstandardapp1.5;dotnet5.4;portable-net451+win8 @@ -28,6 +28,6 @@ - + diff --git a/test/dotnet-msbuild.Tests/dotnet-msbuild.Tests.csproj b/test/dotnet-msbuild.Tests/dotnet-msbuild.Tests.csproj index 4a20f6cf9..cc45fc290 100644 --- a/test/dotnet-msbuild.Tests/dotnet-msbuild.Tests.csproj +++ b/test/dotnet-msbuild.Tests/dotnet-msbuild.Tests.csproj @@ -3,7 +3,7 @@ $(CliTargetFramework) - $(CLI_SharedFrameworkVersion) + $(MicrosoftNETCoreAppPackageVersion) true dotnet-msbuild.Tests ../../tools/Key.snk diff --git a/test/dotnet-new.Tests/dotnet-new.Tests.csproj b/test/dotnet-new.Tests/dotnet-new.Tests.csproj index 7dc7368f6..1d5513241 100644 --- a/test/dotnet-new.Tests/dotnet-new.Tests.csproj +++ b/test/dotnet-new.Tests/dotnet-new.Tests.csproj @@ -3,7 +3,7 @@ $(CliTargetFramework) - $(CLI_SharedFrameworkVersion) + $(MicrosoftNETCoreAppPackageVersion) true dotnet-new.Tests $(AssetTargetFallback);dnxcore50;portable-net45+win8 @@ -17,7 +17,7 @@ - + diff --git a/test/dotnet-nuget.UnitTests/dotnet-nuget.UnitTests.csproj b/test/dotnet-nuget.UnitTests/dotnet-nuget.UnitTests.csproj index 327ad4bec..842ad9f2b 100644 --- a/test/dotnet-nuget.UnitTests/dotnet-nuget.UnitTests.csproj +++ b/test/dotnet-nuget.UnitTests/dotnet-nuget.UnitTests.csproj @@ -3,7 +3,7 @@ $(CliTargetFramework) - $(CLI_SharedFrameworkVersion) + $(MicrosoftNETCoreAppPackageVersion) true dotnet-nuget.UnitTests $(AssetTargetFallback);dotnet5.4;portable-net451+win8 diff --git a/test/dotnet-pack.Tests/dotnet-pack.Tests.csproj b/test/dotnet-pack.Tests/dotnet-pack.Tests.csproj index 755ce3f43..98ab08de7 100644 --- a/test/dotnet-pack.Tests/dotnet-pack.Tests.csproj +++ b/test/dotnet-pack.Tests/dotnet-pack.Tests.csproj @@ -3,7 +3,7 @@ $(CliTargetFramework) - $(CLI_SharedFrameworkVersion) + $(MicrosoftNETCoreAppPackageVersion) true dotnet-pack.Tests $(AssetTargetFallback);dotnet5.4;portable-net451+win8 diff --git a/test/dotnet-publish.Tests/dotnet-publish.Tests.csproj b/test/dotnet-publish.Tests/dotnet-publish.Tests.csproj index 5641910fa..befc31f08 100644 --- a/test/dotnet-publish.Tests/dotnet-publish.Tests.csproj +++ b/test/dotnet-publish.Tests/dotnet-publish.Tests.csproj @@ -3,7 +3,7 @@ $(CliTargetFramework) - $(CLI_SharedFrameworkVersion) + $(MicrosoftNETCoreAppPackageVersion) true dotnet-publish.Tests $(AssetTargetFallback);dotnet5.4;portable-net451+win8 diff --git a/test/dotnet-remove-package.Tests/dotnet-remove-package.Tests.csproj b/test/dotnet-remove-package.Tests/dotnet-remove-package.Tests.csproj index 84669fe6d..7b6cbba9e 100644 --- a/test/dotnet-remove-package.Tests/dotnet-remove-package.Tests.csproj +++ b/test/dotnet-remove-package.Tests/dotnet-remove-package.Tests.csproj @@ -3,7 +3,7 @@ $(CliTargetFramework) - $(CLI_SharedFrameworkVersion) + $(MicrosoftNETCoreAppPackageVersion) true dotnet-remove-package.Tests ../../tools/Key.snk @@ -22,8 +22,8 @@ - + - + diff --git a/test/dotnet-remove-reference.Tests/dotnet-remove-reference.Tests.csproj b/test/dotnet-remove-reference.Tests/dotnet-remove-reference.Tests.csproj index 53a68dce5..315b5a6ad 100644 --- a/test/dotnet-remove-reference.Tests/dotnet-remove-reference.Tests.csproj +++ b/test/dotnet-remove-reference.Tests/dotnet-remove-reference.Tests.csproj @@ -3,7 +3,7 @@ $(CliTargetFramework) - $(CLI_SharedFrameworkVersion) + $(MicrosoftNETCoreAppPackageVersion) true dotnet-remove-reference.Tests ../../tools/Key.snk @@ -22,8 +22,8 @@ - + - + diff --git a/test/dotnet-restore.Tests/dotnet-restore.Tests.csproj b/test/dotnet-restore.Tests/dotnet-restore.Tests.csproj index 812246448..a8be52dc0 100644 --- a/test/dotnet-restore.Tests/dotnet-restore.Tests.csproj +++ b/test/dotnet-restore.Tests/dotnet-restore.Tests.csproj @@ -3,7 +3,7 @@ $(CliTargetFramework) - $(CLI_SharedFrameworkVersion) + $(MicrosoftNETCoreAppPackageVersion) true dotnet-restore.Tests $(AssetTargetFallback);dnxcore50;portable-net45+win8 @@ -17,9 +17,9 @@ - + - + diff --git a/test/dotnet-run.Tests/dotnet-run.Tests.csproj b/test/dotnet-run.Tests/dotnet-run.Tests.csproj index e1b7fbe50..efde5f7cf 100644 --- a/test/dotnet-run.Tests/dotnet-run.Tests.csproj +++ b/test/dotnet-run.Tests/dotnet-run.Tests.csproj @@ -3,7 +3,7 @@ $(CliTargetFramework) - $(CLI_SharedFrameworkVersion) + $(MicrosoftNETCoreAppPackageVersion) true dotnet-run.Tests ../../tools/Key.snk diff --git a/test/dotnet-sln-add.Tests/dotnet-sln-add.Tests.csproj b/test/dotnet-sln-add.Tests/dotnet-sln-add.Tests.csproj index 6bc9287df..66b78a5f1 100644 --- a/test/dotnet-sln-add.Tests/dotnet-sln-add.Tests.csproj +++ b/test/dotnet-sln-add.Tests/dotnet-sln-add.Tests.csproj @@ -3,7 +3,7 @@ $(CliTargetFramework) - $(CLI_SharedFrameworkVersion) + $(MicrosoftNETCoreAppPackageVersion) true dotnet-sln-add.Tests ../../tools/Key.snk @@ -25,6 +25,6 @@ - + diff --git a/test/dotnet-sln-list.Tests/dotnet-sln-list.Tests.csproj b/test/dotnet-sln-list.Tests/dotnet-sln-list.Tests.csproj index a7b806863..a315be891 100644 --- a/test/dotnet-sln-list.Tests/dotnet-sln-list.Tests.csproj +++ b/test/dotnet-sln-list.Tests/dotnet-sln-list.Tests.csproj @@ -3,7 +3,7 @@ $(CliTargetFramework) - $(CLI_SharedFrameworkVersion) + $(MicrosoftNETCoreAppPackageVersion) true dotnet-sln-list.Tests ../../tools/Key.snk diff --git a/test/dotnet-sln-remove.Tests/dotnet-sln-remove.Tests.csproj b/test/dotnet-sln-remove.Tests/dotnet-sln-remove.Tests.csproj index 8609bdb05..6c2176c9a 100644 --- a/test/dotnet-sln-remove.Tests/dotnet-sln-remove.Tests.csproj +++ b/test/dotnet-sln-remove.Tests/dotnet-sln-remove.Tests.csproj @@ -3,7 +3,7 @@ $(CliTargetFramework) - $(CLI_SharedFrameworkVersion) + $(MicrosoftNETCoreAppPackageVersion) true dotnet-sln-remove.Tests ../../tools/Key.snk diff --git a/test/dotnet-store.Tests/dotnet-store.Tests.csproj b/test/dotnet-store.Tests/dotnet-store.Tests.csproj index 650b63b6a..b3935c5cc 100644 --- a/test/dotnet-store.Tests/dotnet-store.Tests.csproj +++ b/test/dotnet-store.Tests/dotnet-store.Tests.csproj @@ -3,7 +3,7 @@ $(CliTargetFramework) - $(CLI_SharedFrameworkVersion) + $(MicrosoftNETCoreAppPackageVersion) true dotnet-cache.Tests $(AssetTargetFallback);dotnet5.4;portable-net451+win8 diff --git a/test/dotnet-test.Tests/dotnet-test.Tests.csproj b/test/dotnet-test.Tests/dotnet-test.Tests.csproj index a47ee9357..fec1c07a6 100644 --- a/test/dotnet-test.Tests/dotnet-test.Tests.csproj +++ b/test/dotnet-test.Tests/dotnet-test.Tests.csproj @@ -3,7 +3,7 @@ $(CliTargetFramework) - $(CLI_SharedFrameworkVersion) + $(MicrosoftNETCoreAppPackageVersion) true dotnet-test.Tests $(AssetTargetFallback);dotnet5.4;portable-net451+win8 diff --git a/test/dotnet-vstest.Tests/dotnet-vstest.Tests.csproj b/test/dotnet-vstest.Tests/dotnet-vstest.Tests.csproj index c774406bd..5b89d32d0 100644 --- a/test/dotnet-vstest.Tests/dotnet-vstest.Tests.csproj +++ b/test/dotnet-vstest.Tests/dotnet-vstest.Tests.csproj @@ -3,7 +3,7 @@ $(CliTargetFramework) - $(CLI_SharedFrameworkVersion) + $(MicrosoftNETCoreAppPackageVersion) true dotnet-vstest.Tests $(AssetTargetFallback);dotnet5.4;portable-net451+win8 diff --git a/test/dotnet.Tests/dotnet.Tests.csproj b/test/dotnet.Tests/dotnet.Tests.csproj index 12467295b..2aa66d8e5 100644 --- a/test/dotnet.Tests/dotnet.Tests.csproj +++ b/test/dotnet.Tests/dotnet.Tests.csproj @@ -3,7 +3,7 @@ $(CliTargetFramework) - $(CLI_SharedFrameworkVersion) + $(MicrosoftNETCoreAppPackageVersion) true dotnet.Tests ../../tools/Key.snk @@ -41,7 +41,7 @@ - - + + diff --git a/test/msbuild.IntegrationTests/msbuild.IntegrationTests.csproj b/test/msbuild.IntegrationTests/msbuild.IntegrationTests.csproj index cab0ce168..cbec7422a 100644 --- a/test/msbuild.IntegrationTests/msbuild.IntegrationTests.csproj +++ b/test/msbuild.IntegrationTests/msbuild.IntegrationTests.csproj @@ -3,7 +3,7 @@ $(CliTargetFramework) - $(CLI_SharedFrameworkVersion) + $(MicrosoftNETCoreAppPackageVersion) true msbuild.IntegrationTests $(AssetTargetFallback);dotnet5.4;portable-net451+win8 diff --git a/tools/CrossGen.Dependencies/CrossGen.Dependencies.csproj b/tools/CrossGen.Dependencies/CrossGen.Dependencies.csproj index e29aa4cdb..3e5f83352 100644 --- a/tools/CrossGen.Dependencies/CrossGen.Dependencies.csproj +++ b/tools/CrossGen.Dependencies/CrossGen.Dependencies.csproj @@ -7,7 +7,7 @@ - + From 4d694d2c56efe0a0592d27cb715ac28ee58f0ec2 Mon Sep 17 00:00:00 2001 From: John Beisner Date: Mon, 4 Dec 2017 09:31:28 -0800 Subject: [PATCH 23/34] Second pass clean-up of package names; resequencing download. --- build.proj | 3 +-- build/DependencyVersions.props | 5 +++++ build/DownloadedPackageVersions.targets | 3 ++- build_projects/dotnet-cli-build/dotnet-cli-build.csproj | 8 ++++---- .../Microsoft.DotNet.Cli.Utils.csproj | 2 +- .../Microsoft.DotNet.MSBuildSdkResolver.csproj | 2 +- src/redist/redist.csproj | 2 +- src/tool_msbuild/tool_msbuild.csproj | 4 ++-- .../Microsoft.DotNet.MSBuildSdkResolver.Tests.csproj | 4 ++-- 9 files changed, 19 insertions(+), 14 deletions(-) diff --git a/build.proj b/build.proj index 4b0078b44..144ad031f 100644 --- a/build.proj +++ b/build.proj @@ -33,8 +33,7 @@ + DependsOnTargets="WriteNugetConfigFile"> $(ExtraRestoreArgs) /p:GeneratePropsFile=$(GeneratePropsFile) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 2a4aec283..4645e867f 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -2,7 +2,12 @@ 2.0.3 + $(MicrosoftNETCoreAppPackageVersion) 15.4.8 + $(MicrosoftBuildPackageVersion) + $(MicrosoftBuildPackageVersion) + $(MicrosoftBuildPackageVersion) + $(MicrosoftBuildPackageVersion) 4.2.0-rtm-171027-0 2.3.2-beta1-61921-05 $(MicrosoftCodeAnalysisCSharpPackageVersion) diff --git a/build/DownloadedPackageVersions.targets b/build/DownloadedPackageVersions.targets index 247a40a26..b9ebc574a 100644 --- a/build/DownloadedPackageVersions.targets +++ b/build/DownloadedPackageVersions.targets @@ -1,5 +1,6 @@ - + - + @@ -23,11 +23,11 @@ - + - - + + diff --git a/src/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj b/src/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj index e3ad770fd..3bac71d14 100644 --- a/src/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj +++ b/src/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj @@ -23,7 +23,7 @@ - + diff --git a/src/Microsoft.DotNet.MSBuildSdkResolver/Microsoft.DotNet.MSBuildSdkResolver.csproj b/src/Microsoft.DotNet.MSBuildSdkResolver/Microsoft.DotNet.MSBuildSdkResolver.csproj index 715832530..f804fa356 100644 --- a/src/Microsoft.DotNet.MSBuildSdkResolver/Microsoft.DotNet.MSBuildSdkResolver.csproj +++ b/src/Microsoft.DotNet.MSBuildSdkResolver/Microsoft.DotNet.MSBuildSdkResolver.csproj @@ -17,7 +17,7 @@ - + diff --git a/src/redist/redist.csproj b/src/redist/redist.csproj index b5e1fac79..6a5d95987 100644 --- a/src/redist/redist.csproj +++ b/src/redist/redist.csproj @@ -17,7 +17,7 @@ - + diff --git a/src/tool_msbuild/tool_msbuild.csproj b/src/tool_msbuild/tool_msbuild.csproj index 3a72fc06c..9a4974600 100644 --- a/src/tool_msbuild/tool_msbuild.csproj +++ b/src/tool_msbuild/tool_msbuild.csproj @@ -10,7 +10,7 @@ - - + + diff --git a/test/Microsoft.DotNet.MSBuildSdkResolver.Tests/Microsoft.DotNet.MSBuildSdkResolver.Tests.csproj b/test/Microsoft.DotNet.MSBuildSdkResolver.Tests/Microsoft.DotNet.MSBuildSdkResolver.Tests.csproj index bad2c53bf..27fdcabbd 100644 --- a/test/Microsoft.DotNet.MSBuildSdkResolver.Tests/Microsoft.DotNet.MSBuildSdkResolver.Tests.csproj +++ b/test/Microsoft.DotNet.MSBuildSdkResolver.Tests/Microsoft.DotNet.MSBuildSdkResolver.Tests.csproj @@ -21,8 +21,8 @@ - - + + From 3cb1cca44d19aea3869200ba66f434d98a2abb15 Mon Sep 17 00:00:00 2001 From: John Beisner Date: Mon, 4 Dec 2017 09:44:51 -0800 Subject: [PATCH 24/34] Third pass clean-up of package names. --- build.proj | 2 +- build/DependencyVersions.props | 1 + build/InitRepo.targets | 6 +++--- src/dotnet/dotnet.csproj | 2 +- .../Microsoft.DotNet.MSBuildSdkResolver.Tests.csproj | 2 +- 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/build.proj b/build.proj index 144ad031f..52ea441fe 100644 --- a/build.proj +++ b/build.proj @@ -46,11 +46,11 @@ - + diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 4645e867f..60cd86e6d 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -29,6 +29,7 @@ 2.0.0 0.1.1-alpha-167 1.2.1-alpha-002133 + $(MicrosoftDotNetProjectJsonMigrationPackageVersion) 2.3.0-pre-20170727-1 1.6.0-beta2-25304 diff --git a/build/InitRepo.targets b/build/InitRepo.targets index 0f76d94c5..9db639072 100644 --- a/build/InitRepo.targets +++ b/build/InitRepo.targets @@ -1,12 +1,12 @@ + WriteBuildInfoProps; + DownloadPackageVersionsProps"/> - + diff --git a/test/Microsoft.DotNet.MSBuildSdkResolver.Tests/Microsoft.DotNet.MSBuildSdkResolver.Tests.csproj b/test/Microsoft.DotNet.MSBuildSdkResolver.Tests/Microsoft.DotNet.MSBuildSdkResolver.Tests.csproj index 27fdcabbd..b009123c0 100644 --- a/test/Microsoft.DotNet.MSBuildSdkResolver.Tests/Microsoft.DotNet.MSBuildSdkResolver.Tests.csproj +++ b/test/Microsoft.DotNet.MSBuildSdkResolver.Tests/Microsoft.DotNet.MSBuildSdkResolver.Tests.csproj @@ -17,7 +17,7 @@ - + From 80f5d9f8c7a90e2c7c3d7b2d7482473ad3d3ea51 Mon Sep 17 00:00:00 2001 From: John Beisner Date: Mon, 4 Dec 2017 13:20:37 -0800 Subject: [PATCH 25/34] Even more package dependency re-names... --- .../XUnitProject/XUnitProject.csproj | 2 +- .../dotnet-dependency-tool-invoker.csproj | 2 +- .../TestProjects/VSTestCore/VSTestCore.csproj | 2 +- .../VSTestDesktopAndNetCore.csproj | 2 +- .../TestProjects/XunitCore/XunitCore.csproj | 2 +- .../VSTestXunitDesktopAndNetCore.csproj | 2 +- build.proj | 2 +- build/BundledSdks.props | 2 +- build/DependencyVersions.props | 30 ++++++++++++++----- ...argets => DownloadPackageVersions.targets} | 2 +- build/InitRepo.props | 5 ++-- build/MicroBuild.props | 2 +- .../dotnet-cli-build/dotnet-cli-build.csproj | 2 +- dir.props | 1 - .../Microsoft.DotNet.Archive.csproj | 2 +- .../Microsoft.DotNet.Cli.Sln.Internal.csproj | 2 +- .../Microsoft.DotNet.Cli.Utils.csproj | 10 +++---- .../Microsoft.DotNet.Configurer.csproj | 6 ++-- src/dotnet/dotnet.csproj | 2 +- src/redist/redist.csproj | 8 ++--- src/tool_fsharp/tool_fsc.csproj | 2 +- src/tool_nuget/tool_nuget.csproj | 2 +- src/tool_roslyn/tool_roslyn.csproj | 4 +-- ...osoft.DotNet.Cli.Sln.Internal.Tests.csproj | 2 +- .../Microsoft.DotNet.Cli.Utils.Tests.csproj | 8 ++--- .../binding-redirects.Tests.csproj | 2 +- .../dotnet-add-package.Tests.csproj | 2 +- .../dotnet-back-compat.Tests.csproj | 2 +- .../Signing.Dependencies.csproj | 2 +- 29 files changed, 65 insertions(+), 49 deletions(-) rename build/{DownloadedPackageVersions.targets => DownloadPackageVersions.targets} (81%) diff --git a/TestAssets/DesktopTestProjects/MultiTFMXunitProject/XUnitProject/XUnitProject.csproj b/TestAssets/DesktopTestProjects/MultiTFMXunitProject/XUnitProject/XUnitProject.csproj index 2ae7ce025..7c813de92 100644 --- a/TestAssets/DesktopTestProjects/MultiTFMXunitProject/XUnitProject/XUnitProject.csproj +++ b/TestAssets/DesktopTestProjects/MultiTFMXunitProject/XUnitProject/XUnitProject.csproj @@ -10,7 +10,7 @@ - + diff --git a/TestAssets/TestPackages/dotnet-dependency-tool-invoker/dotnet-dependency-tool-invoker.csproj b/TestAssets/TestPackages/dotnet-dependency-tool-invoker/dotnet-dependency-tool-invoker.csproj index 66edff1f0..474b54070 100644 --- a/TestAssets/TestPackages/dotnet-dependency-tool-invoker/dotnet-dependency-tool-invoker.csproj +++ b/TestAssets/TestPackages/dotnet-dependency-tool-invoker/dotnet-dependency-tool-invoker.csproj @@ -17,7 +17,7 @@ - + diff --git a/TestAssets/TestProjects/VSTestCore/VSTestCore.csproj b/TestAssets/TestProjects/VSTestCore/VSTestCore.csproj index 0d07738af..c69bc4462 100644 --- a/TestAssets/TestProjects/VSTestCore/VSTestCore.csproj +++ b/TestAssets/TestProjects/VSTestCore/VSTestCore.csproj @@ -9,6 +9,6 @@ - + \ No newline at end of file diff --git a/TestAssets/TestProjects/VSTestMulti/VSTestDesktopAndNetCore.csproj b/TestAssets/TestProjects/VSTestMulti/VSTestDesktopAndNetCore.csproj index 1a8fb8e53..80517174a 100644 --- a/TestAssets/TestProjects/VSTestMulti/VSTestDesktopAndNetCore.csproj +++ b/TestAssets/TestProjects/VSTestMulti/VSTestDesktopAndNetCore.csproj @@ -12,6 +12,6 @@ - + \ No newline at end of file diff --git a/TestAssets/TestProjects/XunitCore/XunitCore.csproj b/TestAssets/TestProjects/XunitCore/XunitCore.csproj index d6016beea..277e9d3d7 100644 --- a/TestAssets/TestProjects/XunitCore/XunitCore.csproj +++ b/TestAssets/TestProjects/XunitCore/XunitCore.csproj @@ -7,7 +7,7 @@ - + diff --git a/TestAssets/TestProjects/XunitMulti/VSTestXunitDesktopAndNetCore.csproj b/TestAssets/TestProjects/XunitMulti/VSTestXunitDesktopAndNetCore.csproj index e236f2945..c74d87941 100644 --- a/TestAssets/TestProjects/XunitMulti/VSTestXunitDesktopAndNetCore.csproj +++ b/TestAssets/TestProjects/XunitMulti/VSTestXunitDesktopAndNetCore.csproj @@ -16,7 +16,7 @@ - + diff --git a/build.proj b/build.proj index 52ea441fe..060afe7d3 100644 --- a/build.proj +++ b/build.proj @@ -50,7 +50,7 @@ - + diff --git a/build/BundledSdks.props b/build/BundledSdks.props index 8c8bfe7bc..a919345c5 100644 --- a/build/BundledSdks.props +++ b/build/BundledSdks.props @@ -1,6 +1,6 @@ - + diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 60cd86e6d..eb42994d5 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -30,19 +30,32 @@ 0.1.1-alpha-167 1.2.1-alpha-002133 $(MicrosoftDotNetProjectJsonMigrationPackageVersion) + 1.6.0-beta2-25304 + 4.4.0-preview3-4475 + $(NuGetBuildTasksPackageVersion) + $(NuGetBuildTasksPackageVersion) + $(NuGetBuildTasksPackageVersion) + $(NuGetBuildTasksPackageVersion) + $(NuGetBuildTasksPackageVersion) + $(NuGetBuildTasksPackageVersion) + $(NuGetBuildTasksPackageVersion) + $(NuGetBuildTasksPackageVersion) + 15.3.0-preview-20170628-02 + $(MicrosoftNETTestSdkPackageVersion) + $(MicrosoftNETTestSdkPackageVersion) + 0.2.0-beta-000042 + 0.2.0 + 2.3.0-pre-20170727-1 + 4.4.1-pre-20170727-1 - 2.3.0-pre-20170727-1 - 1.6.0-beta2-25304 - 4.4.1-pre-20170727-1 - 4.4.0-preview3-4475 + + + 2.0.0-preview3-25514-04 - 15.3.0-preview-20170628-02 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 0.2.0 - 0.2.0-beta-000042 2.0.3 @@ -64,4 +77,7 @@ 2.0.0-preview2-25331-01 2.1.0-prerelease-02221-02 + + + diff --git a/build/DownloadedPackageVersions.targets b/build/DownloadPackageVersions.targets similarity index 81% rename from build/DownloadedPackageVersions.targets rename to build/DownloadPackageVersions.targets index b9ebc574a..dc821037b 100644 --- a/build/DownloadedPackageVersions.targets +++ b/build/DownloadPackageVersions.targets @@ -3,7 +3,7 @@ DependsOnTargets="BuildDotnetCliBuildFramework"> diff --git a/build/InitRepo.props b/build/InitRepo.props index 49601775c..c83437f02 100644 --- a/build/InitRepo.props +++ b/build/InitRepo.props @@ -4,7 +4,8 @@ $(GeneratedPropsDir)/GitCommitInfo.props $(GeneratedPropsDir)/HostInfo.props $(GeneratedPropsDir)/BuildInfo.props - $(GeneratedPropsDir)/DownloadedPackageVersions.props + $(GeneratedPropsDir)/OrchestratedPackageVersionsProps.props $(RepoRoot)/NuGet.Config - + + diff --git a/build/MicroBuild.props b/build/MicroBuild.props index 1cf77f45b..efd41d7f8 100644 --- a/build/MicroBuild.props +++ b/build/MicroBuild.props @@ -6,6 +6,6 @@ $(NUGET_PACKAGES) $(RepoRoot)/.nuget/packages - $(NuGetPackagesDir)/microbuild.core/$(MicroBuildVersion)/build/ + $(NuGetPackagesDir)/microbuild.core/$(MicroBuildCorePackageVersion)/build/ diff --git a/build_projects/dotnet-cli-build/dotnet-cli-build.csproj b/build_projects/dotnet-cli-build/dotnet-cli-build.csproj index bd003a81c..015c4b70d 100644 --- a/build_projects/dotnet-cli-build/dotnet-cli-build.csproj +++ b/build_projects/dotnet-cli-build/dotnet-cli-build.csproj @@ -22,7 +22,7 @@ - + diff --git a/dir.props b/dir.props index b423ca562..a59eba29e 100644 --- a/dir.props +++ b/dir.props @@ -25,7 +25,6 @@ - diff --git a/src/Microsoft.DotNet.Archive/Microsoft.DotNet.Archive.csproj b/src/Microsoft.DotNet.Archive/Microsoft.DotNet.Archive.csproj index 04b8f25be..368cbdc14 100644 --- a/src/Microsoft.DotNet.Archive/Microsoft.DotNet.Archive.csproj +++ b/src/Microsoft.DotNet.Archive/Microsoft.DotNet.Archive.csproj @@ -17,6 +17,6 @@ - + \ No newline at end of file diff --git a/src/Microsoft.DotNet.Cli.Sln.Internal/Microsoft.DotNet.Cli.Sln.Internal.csproj b/src/Microsoft.DotNet.Cli.Sln.Internal/Microsoft.DotNet.Cli.Sln.Internal.csproj index 2b23027fd..518040d30 100644 --- a/src/Microsoft.DotNet.Cli.Sln.Internal/Microsoft.DotNet.Cli.Sln.Internal.csproj +++ b/src/Microsoft.DotNet.Cli.Sln.Internal/Microsoft.DotNet.Cli.Sln.Internal.csproj @@ -24,6 +24,6 @@ - + diff --git a/src/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj b/src/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj index 3bac71d14..bcf9bd712 100644 --- a/src/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj +++ b/src/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj @@ -18,14 +18,14 @@ - - - - + + + + - + diff --git a/src/Microsoft.DotNet.Configurer/Microsoft.DotNet.Configurer.csproj b/src/Microsoft.DotNet.Configurer/Microsoft.DotNet.Configurer.csproj index 25a33c6f8..0b4daa29e 100644 --- a/src/Microsoft.DotNet.Configurer/Microsoft.DotNet.Configurer.csproj +++ b/src/Microsoft.DotNet.Configurer/Microsoft.DotNet.Configurer.csproj @@ -17,9 +17,9 @@ - - - + + + diff --git a/src/dotnet/dotnet.csproj b/src/dotnet/dotnet.csproj index 58fe29e4f..928a17ccb 100644 --- a/src/dotnet/dotnet.csproj +++ b/src/dotnet/dotnet.csproj @@ -68,7 +68,7 @@ - + diff --git a/src/redist/redist.csproj b/src/redist/redist.csproj index 6a5d95987..ef9390a7d 100644 --- a/src/redist/redist.csproj +++ b/src/redist/redist.csproj @@ -18,10 +18,10 @@ - - - - + + + + diff --git a/src/tool_fsharp/tool_fsc.csproj b/src/tool_fsharp/tool_fsc.csproj index b907ba121..d4088da28 100644 --- a/src/tool_fsharp/tool_fsc.csproj +++ b/src/tool_fsharp/tool_fsc.csproj @@ -13,7 +13,7 @@ - + diff --git a/src/tool_nuget/tool_nuget.csproj b/src/tool_nuget/tool_nuget.csproj index 9b402b456..9b373cb60 100644 --- a/src/tool_nuget/tool_nuget.csproj +++ b/src/tool_nuget/tool_nuget.csproj @@ -10,6 +10,6 @@ - + \ No newline at end of file diff --git a/src/tool_roslyn/tool_roslyn.csproj b/src/tool_roslyn/tool_roslyn.csproj index 906056133..81c4c1add 100644 --- a/src/tool_roslyn/tool_roslyn.csproj +++ b/src/tool_roslyn/tool_roslyn.csproj @@ -16,8 +16,8 @@ - - + + diff --git a/test/Microsoft.DotNet.Cli.Sln.Internal.Tests/Microsoft.DotNet.Cli.Sln.Internal.Tests.csproj b/test/Microsoft.DotNet.Cli.Sln.Internal.Tests/Microsoft.DotNet.Cli.Sln.Internal.Tests.csproj index 368056b12..138cc5eea 100644 --- a/test/Microsoft.DotNet.Cli.Sln.Internal.Tests/Microsoft.DotNet.Cli.Sln.Internal.Tests.csproj +++ b/test/Microsoft.DotNet.Cli.Sln.Internal.Tests/Microsoft.DotNet.Cli.Sln.Internal.Tests.csproj @@ -21,7 +21,7 @@ - + diff --git a/test/Microsoft.DotNet.Cli.Utils.Tests/Microsoft.DotNet.Cli.Utils.Tests.csproj b/test/Microsoft.DotNet.Cli.Utils.Tests/Microsoft.DotNet.Cli.Utils.Tests.csproj index de6d8dc1b..1a5f9fe31 100644 --- a/test/Microsoft.DotNet.Cli.Utils.Tests/Microsoft.DotNet.Cli.Utils.Tests.csproj +++ b/test/Microsoft.DotNet.Cli.Utils.Tests/Microsoft.DotNet.Cli.Utils.Tests.csproj @@ -32,10 +32,10 @@ - - - - + + + + diff --git a/test/binding-redirects.Tests/binding-redirects.Tests.csproj b/test/binding-redirects.Tests/binding-redirects.Tests.csproj index aa58dd6e7..072bc6352 100644 --- a/test/binding-redirects.Tests/binding-redirects.Tests.csproj +++ b/test/binding-redirects.Tests/binding-redirects.Tests.csproj @@ -14,7 +14,7 @@ - + diff --git a/test/dotnet-add-package.Tests/dotnet-add-package.Tests.csproj b/test/dotnet-add-package.Tests/dotnet-add-package.Tests.csproj index f49750d6a..9dc27f338 100644 --- a/test/dotnet-add-package.Tests/dotnet-add-package.Tests.csproj +++ b/test/dotnet-add-package.Tests/dotnet-add-package.Tests.csproj @@ -22,7 +22,7 @@ - + diff --git a/test/dotnet-back-compat.Tests/dotnet-back-compat.Tests.csproj b/test/dotnet-back-compat.Tests/dotnet-back-compat.Tests.csproj index 502840ae8..6b380559f 100644 --- a/test/dotnet-back-compat.Tests/dotnet-back-compat.Tests.csproj +++ b/test/dotnet-back-compat.Tests/dotnet-back-compat.Tests.csproj @@ -13,7 +13,7 @@ - + diff --git a/tools/Signing.Dependencies/Signing.Dependencies.csproj b/tools/Signing.Dependencies/Signing.Dependencies.csproj index c98ee321a..55fef49e4 100644 --- a/tools/Signing.Dependencies/Signing.Dependencies.csproj +++ b/tools/Signing.Dependencies/Signing.Dependencies.csproj @@ -6,7 +6,7 @@ - + From 1c5b49baeeab57c300aabe2d0febf88f77a086a1 Mon Sep 17 00:00:00 2001 From: John Beisner Date: Mon, 4 Dec 2017 14:32:56 -0800 Subject: [PATCH 26/34] Nuget.config update to align with CLI:master - add comments in DependencyVersions.prop --- build/DependencyVersions.props | 9 +++++---- build/NugetConfigFile.targets | 34 +++++++++++++++++----------------- 2 files changed, 22 insertions(+), 21 deletions(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index eb42994d5..adb5987c7 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -47,10 +47,13 @@ 0.2.0 2.3.0-pre-20170727-1 4.4.1-pre-20170727-1 + + + + - - + 2.0.0-preview3-25514-04 $(MicrosoftNETCoreAppPackageVersion) @@ -78,6 +81,4 @@ 2.1.0-prerelease-02221-02 - - diff --git a/build/NugetConfigFile.targets b/build/NugetConfigFile.targets index 8aba7ac72..06d67c109 100644 --- a/build/NugetConfigFile.targets +++ b/build/NugetConfigFile.targets @@ -10,33 +10,33 @@ - - - + + + ]]> - - - - - - - - - - - - + + + + + + + + + + + + + ]]> + ]]> From fba1ad728737db689534f3b7809b1546d09b49bd Mon Sep 17 00:00:00 2001 From: John Beisner Date: Tue, 5 Dec 2017 09:19:22 -0800 Subject: [PATCH 27/34] Fixed a typo... --- build/BundledSdks.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/BundledSdks.props b/build/BundledSdks.props index a919345c5..d5b90bba9 100644 --- a/build/BundledSdks.props +++ b/build/BundledSdks.props @@ -1,6 +1,6 @@ - + From 2c931b810d1c8a6c5107e5b235dae067ad6cc4dd Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Mon, 11 Dec 2017 10:10:08 -0800 Subject: [PATCH 28/34] Fix dotnet-install to check the right path for no-op installs when --shared-runtime is specified --- scripts/obtain/dotnet-install.ps1 | 13 +++++++++---- scripts/obtain/dotnet-install.sh | 14 ++++++++++---- 2 files changed, 19 insertions(+), 8 deletions(-) diff --git a/scripts/obtain/dotnet-install.ps1 b/scripts/obtain/dotnet-install.ps1 index e267edc76..1b92f0c20 100644 --- a/scripts/obtain/dotnet-install.ps1 +++ b/scripts/obtain/dotnet-install.ps1 @@ -472,10 +472,15 @@ if ($DryRun) { $InstallRoot = Resolve-Installation-Path $InstallDir Say-Verbose "InstallRoot: $InstallRoot" -$IsSdkInstalled = Is-Dotnet-Package-Installed -InstallRoot $InstallRoot -RelativePathToPackage "sdk" -SpecificVersion $SpecificVersion -Say-Verbose ".NET SDK installed? $IsSdkInstalled" -if ($IsSdkInstalled) { - Say ".NET SDK version $SpecificVersion is already installed." +$dotnetPackageRelativePath = if ($SharedRuntime) { "shared\Microsoft.NETCore.App" } else { "sdk" } + +$isAssetInstalled = Is-Dotnet-Package-Installed -InstallRoot $InstallRoot -RelativePathToPackage $dotnetPackageRelativePath -SpecificVersion $SpecificVersion +if ($isAssetInstalled) { + if ($SharedRuntime) { + Say ".NET Core Runtime version $SpecificVersion is already installed." + } else { + Say ".NET Core SDK version $SpecificVersion is already installed." + } Prepend-Sdk-InstallRoot-To-Path -InstallRoot $InstallRoot -BinFolderRelativePath $BinFolderRelativePath exit 0 } diff --git a/scripts/obtain/dotnet-install.sh b/scripts/obtain/dotnet-install.sh index 628751836..e69e3a1fa 100755 --- a/scripts/obtain/dotnet-install.sh +++ b/scripts/obtain/dotnet-install.sh @@ -688,9 +688,16 @@ install_dotnet() { eval $invocation local download_failed=false - if is_dotnet_package_installed "$install_root" "sdk" "$specific_version"; then - say ".NET SDK version $specific_version is already installed." - return 0 + if [ "$shared_runtime" = true ]; then + if is_dotnet_package_installed "$install_root" "shared/Microsoft.NETCore.App" "$specific_version"; then + say ".NET Core Runtime version $specific_version is already installed." + return 0 + fi + else + if is_dotnet_package_installed "$install_root" "sdk" "$specific_version"; then + say ".NET Core SDK version $specific_version is already installed." + return 0 + fi fi mkdir -p "$install_root" @@ -786,7 +793,6 @@ do runtime_id="$1" ;; --skip-non-versioned-files|-[Ss]kip[Nn]on[Vv]ersioned[Ff]iles) - shift override_non_versioned_files=false ;; -?|--?|-h|--help|-[Hh]elp) From 6313f4fc7a016800f90362000690936fe406aaab Mon Sep 17 00:00:00 2001 From: John Beisner Date: Mon, 11 Dec 2017 11:01:24 -0800 Subject: [PATCH 29/34] The 15.4.8 version of the Microsoft.Build.Runtime nuget package is currupt; use the replacement 15.4.8.1 --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index adb5987c7..d476476b5 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -5,7 +5,7 @@ $(MicrosoftNETCoreAppPackageVersion) 15.4.8 $(MicrosoftBuildPackageVersion) - $(MicrosoftBuildPackageVersion) + 15.4.8.1 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) 4.2.0-rtm-171027-0 From ed4413b9fb188bb4ecc24e9fc4691d0736c46902 Mon Sep 17 00:00:00 2001 From: John Beisner Date: Mon, 11 Dec 2017 11:25:52 -0800 Subject: [PATCH 30/34] Fixing a typo... --- .../Microsoft.DotNet.Cli.Utils.Tests.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/Microsoft.DotNet.Cli.Utils.Tests/Microsoft.DotNet.Cli.Utils.Tests.csproj b/test/Microsoft.DotNet.Cli.Utils.Tests/Microsoft.DotNet.Cli.Utils.Tests.csproj index 1a5f9fe31..97c931472 100644 --- a/test/Microsoft.DotNet.Cli.Utils.Tests/Microsoft.DotNet.Cli.Utils.Tests.csproj +++ b/test/Microsoft.DotNet.Cli.Utils.Tests/Microsoft.DotNet.Cli.Utils.Tests.csproj @@ -39,6 +39,6 @@ - + From 94e43afa68f0774910b5492e5dcc8accc353a1b2 Mon Sep 17 00:00:00 2001 From: John Beisner Date: Mon, 11 Dec 2017 16:54:35 -0800 Subject: [PATCH 31/34] Use explict and non-preview versions for the build DLL --- .../Microsoft.DotNet.Cli.Build.Framework.csproj | 2 +- build_projects/dotnet-cli-build/dotnet-cli-build.csproj | 5 +++-- .../shared-build-targets-utils.csproj | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/build_projects/Microsoft.DotNet.Cli.Build.Framework/Microsoft.DotNet.Cli.Build.Framework.csproj b/build_projects/Microsoft.DotNet.Cli.Build.Framework/Microsoft.DotNet.Cli.Build.Framework.csproj index dd2f94e91..fcaae1196 100644 --- a/build_projects/Microsoft.DotNet.Cli.Build.Framework/Microsoft.DotNet.Cli.Build.Framework.csproj +++ b/build_projects/Microsoft.DotNet.Cli.Build.Framework/Microsoft.DotNet.Cli.Build.Framework.csproj @@ -13,7 +13,7 @@ - + diff --git a/build_projects/dotnet-cli-build/dotnet-cli-build.csproj b/build_projects/dotnet-cli-build/dotnet-cli-build.csproj index 015c4b70d..2006a0122 100644 --- a/build_projects/dotnet-cli-build/dotnet-cli-build.csproj +++ b/build_projects/dotnet-cli-build/dotnet-cli-build.csproj @@ -18,16 +18,17 @@ - + - + + diff --git a/build_projects/shared-build-targets-utils/shared-build-targets-utils.csproj b/build_projects/shared-build-targets-utils/shared-build-targets-utils.csproj index 14a4c4a33..34994fa7d 100644 --- a/build_projects/shared-build-targets-utils/shared-build-targets-utils.csproj +++ b/build_projects/shared-build-targets-utils/shared-build-targets-utils.csproj @@ -16,12 +16,12 @@ - + - + From 860de6339c9fc2323f426fa2db95501556020b57 Mon Sep 17 00:00:00 2001 From: William Lee Date: Tue, 2 Jan 2018 12:37:00 -0800 Subject: [PATCH 32/34] Update wix version (#8313) --- build/package/Installer.MSI.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/package/Installer.MSI.targets b/build/package/Installer.MSI.targets index 2a4e131b8..e1baf462d 100644 --- a/build/package/Installer.MSI.targets +++ b/build/package/Installer.MSI.targets @@ -2,7 +2,7 @@ - 3.10.2 + 3.10.4 https://dotnetcli.azureedge.net/build/wix/wix.$(WixVersion).zip $(IntermediateDirectory)/WixTools/$(WixVersion) $(WixRoot)/WixTools.$(WixVersion).zip From 80933404d0fcf7011447d6289fe3462211f6aa53 Mon Sep 17 00:00:00 2001 From: Livar Cunha Date: Fri, 5 Jan 2018 12:53:03 -0800 Subject: [PATCH 33/34] Fix tool_roslyn_satellite by making it use the new dependency version properties. --- src/tool_roslyn_satellites/tool_roslyn_satellites.csproj | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/tool_roslyn_satellites/tool_roslyn_satellites.csproj b/src/tool_roslyn_satellites/tool_roslyn_satellites.csproj index d42c632b0..8e961be59 100644 --- a/src/tool_roslyn_satellites/tool_roslyn_satellites.csproj +++ b/src/tool_roslyn_satellites/tool_roslyn_satellites.csproj @@ -5,7 +5,7 @@ $(CliVersionPrefix) $(CliTargetFramework) - $(CLI_SharedFrameworkVersion) + $(MicrosoftNETCoreAppPackageVersion) $(RoslynDirectory)/bincore $(CommitCount) false @@ -14,8 +14,8 @@ - - + + Date: Fri, 5 Jan 2018 15:36:45 -0800 Subject: [PATCH 34/34] Fixing redist to use the new way to consume roslyn. I merged it wrong before. --- build/DependencyVersions.props | 2 +- src/redist/redist.csproj | 11 +++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 049a08108..69bc33d1b 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -11,7 +11,7 @@ 4.2.0-rtm-171104-0 2.6.0-beta3-62309-01 $(MicrosoftCodeAnalysisCSharpPackageVersion) - $(MicrosoftCodeAnalysisCSharpPackageVersion) + $(MicrosoftCodeAnalysisCSharpPackageVersion) 15.5.0-preview-20171116-1 $(MicrosoftNETSdkPackageVersion) 2.0.0-rel-20171110-671 diff --git a/src/redist/redist.csproj b/src/redist/redist.csproj index 183cb0fe6..b8349f820 100644 --- a/src/redist/redist.csproj +++ b/src/redist/redist.csproj @@ -22,10 +22,9 @@ - - + + All + @@ -75,7 +74,7 @@ BeforeTargets="Publish"> - + @@ -88,7 +87,7 @@ "version": ".*" - "version": "$(CLI_SharedFrameworkVersion)" + "version": "$(MicrosoftNETCoreAppPackageVersion)"