diff --git a/Directory.Build.props b/Directory.Build.props index d22528dda..30ff5d86d 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,11 +1,12 @@ - - false - - + + $(CopyrightNetFoundation) + MIT + + True embedded diff --git a/Microsoft.DotNet.Cli.sln b/Microsoft.DotNet.Cli.sln index 2df65f361..0b8150d41 100644 --- a/Microsoft.DotNet.Cli.sln +++ b/Microsoft.DotNet.Cli.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.27130.2020 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.28603.18 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{ED2FE3E2-F7E7-4389-8231-B65123F2076F}" EndProject @@ -15,118 +15,34 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "core-sdk-tasks", "src\core- EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.Tools.Tests.Utilities", "test\Microsoft.DotNet.Tools.Tests.Utilities\Microsoft.DotNet.Tools.Tests.Utilities.csproj", "{78E15EC1-7732-41E3-8591-934E9F583254}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SdkResolver", "src\SdkResolver\SdkResolver.csproj", "{7EE15292-2CAD-44FA-8A1F-BAC4688A49E0}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU - Debug|x64 = Debug|x64 - Debug|x86 = Debug|x86 - MinSizeRel|Any CPU = MinSizeRel|Any CPU - MinSizeRel|x64 = MinSizeRel|x64 - MinSizeRel|x86 = MinSizeRel|x86 Release|Any CPU = Release|Any CPU - Release|x64 = Release|x64 - Release|x86 = Release|x86 - RelWithDebInfo|Any CPU = RelWithDebInfo|Any CPU - RelWithDebInfo|x64 = RelWithDebInfo|x64 - RelWithDebInfo|x86 = RelWithDebInfo|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {098D9321-1201-4974-A75E-F58EBCD98ACF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {098D9321-1201-4974-A75E-F58EBCD98ACF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {098D9321-1201-4974-A75E-F58EBCD98ACF}.Debug|x64.ActiveCfg = Release|Any CPU - {098D9321-1201-4974-A75E-F58EBCD98ACF}.Debug|x64.Build.0 = Release|Any CPU - {098D9321-1201-4974-A75E-F58EBCD98ACF}.Debug|x86.ActiveCfg = Release|Any CPU - {098D9321-1201-4974-A75E-F58EBCD98ACF}.Debug|x86.Build.0 = Release|Any CPU - {098D9321-1201-4974-A75E-F58EBCD98ACF}.MinSizeRel|Any CPU.ActiveCfg = Release|Any CPU - {098D9321-1201-4974-A75E-F58EBCD98ACF}.MinSizeRel|Any CPU.Build.0 = Release|Any CPU - {098D9321-1201-4974-A75E-F58EBCD98ACF}.MinSizeRel|x64.ActiveCfg = Release|Any CPU - {098D9321-1201-4974-A75E-F58EBCD98ACF}.MinSizeRel|x64.Build.0 = Release|Any CPU - {098D9321-1201-4974-A75E-F58EBCD98ACF}.MinSizeRel|x86.ActiveCfg = Release|Any CPU - {098D9321-1201-4974-A75E-F58EBCD98ACF}.MinSizeRel|x86.Build.0 = Release|Any CPU {098D9321-1201-4974-A75E-F58EBCD98ACF}.Release|Any CPU.ActiveCfg = Release|Any CPU {098D9321-1201-4974-A75E-F58EBCD98ACF}.Release|Any CPU.Build.0 = Release|Any CPU - {098D9321-1201-4974-A75E-F58EBCD98ACF}.Release|x64.ActiveCfg = Release|Any CPU - {098D9321-1201-4974-A75E-F58EBCD98ACF}.Release|x64.Build.0 = Release|Any CPU - {098D9321-1201-4974-A75E-F58EBCD98ACF}.Release|x86.ActiveCfg = Release|Any CPU - {098D9321-1201-4974-A75E-F58EBCD98ACF}.Release|x86.Build.0 = Release|Any CPU - {098D9321-1201-4974-A75E-F58EBCD98ACF}.RelWithDebInfo|Any CPU.ActiveCfg = Release|Any CPU - {098D9321-1201-4974-A75E-F58EBCD98ACF}.RelWithDebInfo|Any CPU.Build.0 = Release|Any CPU - {098D9321-1201-4974-A75E-F58EBCD98ACF}.RelWithDebInfo|x64.ActiveCfg = Release|Any CPU - {098D9321-1201-4974-A75E-F58EBCD98ACF}.RelWithDebInfo|x64.Build.0 = Release|Any CPU - {098D9321-1201-4974-A75E-F58EBCD98ACF}.RelWithDebInfo|x86.ActiveCfg = Release|Any CPU - {098D9321-1201-4974-A75E-F58EBCD98ACF}.RelWithDebInfo|x86.Build.0 = Release|Any CPU {1BFF54F9-4E35-49DB-893C-AF2047722FC6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {1BFF54F9-4E35-49DB-893C-AF2047722FC6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1BFF54F9-4E35-49DB-893C-AF2047722FC6}.Debug|x64.ActiveCfg = Release|Any CPU - {1BFF54F9-4E35-49DB-893C-AF2047722FC6}.Debug|x64.Build.0 = Release|Any CPU - {1BFF54F9-4E35-49DB-893C-AF2047722FC6}.Debug|x86.ActiveCfg = Release|Any CPU - {1BFF54F9-4E35-49DB-893C-AF2047722FC6}.Debug|x86.Build.0 = Release|Any CPU - {1BFF54F9-4E35-49DB-893C-AF2047722FC6}.MinSizeRel|Any CPU.ActiveCfg = Release|Any CPU - {1BFF54F9-4E35-49DB-893C-AF2047722FC6}.MinSizeRel|Any CPU.Build.0 = Release|Any CPU - {1BFF54F9-4E35-49DB-893C-AF2047722FC6}.MinSizeRel|x64.ActiveCfg = Release|Any CPU - {1BFF54F9-4E35-49DB-893C-AF2047722FC6}.MinSizeRel|x64.Build.0 = Release|Any CPU - {1BFF54F9-4E35-49DB-893C-AF2047722FC6}.MinSizeRel|x86.ActiveCfg = Release|Any CPU - {1BFF54F9-4E35-49DB-893C-AF2047722FC6}.MinSizeRel|x86.Build.0 = Release|Any CPU {1BFF54F9-4E35-49DB-893C-AF2047722FC6}.Release|Any CPU.ActiveCfg = Release|Any CPU {1BFF54F9-4E35-49DB-893C-AF2047722FC6}.Release|Any CPU.Build.0 = Release|Any CPU - {1BFF54F9-4E35-49DB-893C-AF2047722FC6}.Release|x64.ActiveCfg = Release|Any CPU - {1BFF54F9-4E35-49DB-893C-AF2047722FC6}.Release|x64.Build.0 = Release|Any CPU - {1BFF54F9-4E35-49DB-893C-AF2047722FC6}.Release|x86.ActiveCfg = Release|Any CPU - {1BFF54F9-4E35-49DB-893C-AF2047722FC6}.Release|x86.Build.0 = Release|Any CPU - {1BFF54F9-4E35-49DB-893C-AF2047722FC6}.RelWithDebInfo|Any CPU.ActiveCfg = Release|Any CPU - {1BFF54F9-4E35-49DB-893C-AF2047722FC6}.RelWithDebInfo|Any CPU.Build.0 = Release|Any CPU - {1BFF54F9-4E35-49DB-893C-AF2047722FC6}.RelWithDebInfo|x64.ActiveCfg = Release|Any CPU - {1BFF54F9-4E35-49DB-893C-AF2047722FC6}.RelWithDebInfo|x64.Build.0 = Release|Any CPU - {1BFF54F9-4E35-49DB-893C-AF2047722FC6}.RelWithDebInfo|x86.ActiveCfg = Release|Any CPU - {1BFF54F9-4E35-49DB-893C-AF2047722FC6}.RelWithDebInfo|x86.Build.0 = Release|Any CPU {53AF2D01-B69F-4CD0-86A7-8FD95967D23C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {53AF2D01-B69F-4CD0-86A7-8FD95967D23C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {53AF2D01-B69F-4CD0-86A7-8FD95967D23C}.Debug|x64.ActiveCfg = Debug|Any CPU - {53AF2D01-B69F-4CD0-86A7-8FD95967D23C}.Debug|x64.Build.0 = Debug|Any CPU - {53AF2D01-B69F-4CD0-86A7-8FD95967D23C}.Debug|x86.ActiveCfg = Debug|Any CPU - {53AF2D01-B69F-4CD0-86A7-8FD95967D23C}.Debug|x86.Build.0 = Debug|Any CPU - {53AF2D01-B69F-4CD0-86A7-8FD95967D23C}.MinSizeRel|Any CPU.ActiveCfg = Debug|Any CPU - {53AF2D01-B69F-4CD0-86A7-8FD95967D23C}.MinSizeRel|Any CPU.Build.0 = Debug|Any CPU - {53AF2D01-B69F-4CD0-86A7-8FD95967D23C}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU - {53AF2D01-B69F-4CD0-86A7-8FD95967D23C}.MinSizeRel|x64.Build.0 = Debug|Any CPU - {53AF2D01-B69F-4CD0-86A7-8FD95967D23C}.MinSizeRel|x86.ActiveCfg = Debug|Any CPU - {53AF2D01-B69F-4CD0-86A7-8FD95967D23C}.MinSizeRel|x86.Build.0 = Debug|Any CPU {53AF2D01-B69F-4CD0-86A7-8FD95967D23C}.Release|Any CPU.ActiveCfg = Release|Any CPU {53AF2D01-B69F-4CD0-86A7-8FD95967D23C}.Release|Any CPU.Build.0 = Release|Any CPU - {53AF2D01-B69F-4CD0-86A7-8FD95967D23C}.Release|x64.ActiveCfg = Release|Any CPU - {53AF2D01-B69F-4CD0-86A7-8FD95967D23C}.Release|x64.Build.0 = Release|Any CPU - {53AF2D01-B69F-4CD0-86A7-8FD95967D23C}.Release|x86.ActiveCfg = Release|Any CPU - {53AF2D01-B69F-4CD0-86A7-8FD95967D23C}.Release|x86.Build.0 = Release|Any CPU - {53AF2D01-B69F-4CD0-86A7-8FD95967D23C}.RelWithDebInfo|Any CPU.ActiveCfg = Release|Any CPU - {53AF2D01-B69F-4CD0-86A7-8FD95967D23C}.RelWithDebInfo|Any CPU.Build.0 = Release|Any CPU - {53AF2D01-B69F-4CD0-86A7-8FD95967D23C}.RelWithDebInfo|x64.ActiveCfg = Release|Any CPU - {53AF2D01-B69F-4CD0-86A7-8FD95967D23C}.RelWithDebInfo|x64.Build.0 = Release|Any CPU - {53AF2D01-B69F-4CD0-86A7-8FD95967D23C}.RelWithDebInfo|x86.ActiveCfg = Release|Any CPU - {53AF2D01-B69F-4CD0-86A7-8FD95967D23C}.RelWithDebInfo|x86.Build.0 = Release|Any CPU {78E15EC1-7732-41E3-8591-934E9F583254}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {78E15EC1-7732-41E3-8591-934E9F583254}.Debug|Any CPU.Build.0 = Debug|Any CPU - {78E15EC1-7732-41E3-8591-934E9F583254}.Debug|x64.ActiveCfg = Debug|Any CPU - {78E15EC1-7732-41E3-8591-934E9F583254}.Debug|x64.Build.0 = Debug|Any CPU - {78E15EC1-7732-41E3-8591-934E9F583254}.Debug|x86.ActiveCfg = Debug|Any CPU - {78E15EC1-7732-41E3-8591-934E9F583254}.Debug|x86.Build.0 = Debug|Any CPU - {78E15EC1-7732-41E3-8591-934E9F583254}.MinSizeRel|Any CPU.ActiveCfg = Debug|Any CPU - {78E15EC1-7732-41E3-8591-934E9F583254}.MinSizeRel|Any CPU.Build.0 = Debug|Any CPU - {78E15EC1-7732-41E3-8591-934E9F583254}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU - {78E15EC1-7732-41E3-8591-934E9F583254}.MinSizeRel|x64.Build.0 = Debug|Any CPU - {78E15EC1-7732-41E3-8591-934E9F583254}.MinSizeRel|x86.ActiveCfg = Debug|Any CPU - {78E15EC1-7732-41E3-8591-934E9F583254}.MinSizeRel|x86.Build.0 = Debug|Any CPU {78E15EC1-7732-41E3-8591-934E9F583254}.Release|Any CPU.ActiveCfg = Release|Any CPU {78E15EC1-7732-41E3-8591-934E9F583254}.Release|Any CPU.Build.0 = Release|Any CPU - {78E15EC1-7732-41E3-8591-934E9F583254}.Release|x64.ActiveCfg = Release|Any CPU - {78E15EC1-7732-41E3-8591-934E9F583254}.Release|x64.Build.0 = Release|Any CPU - {78E15EC1-7732-41E3-8591-934E9F583254}.Release|x86.ActiveCfg = Release|Any CPU - {78E15EC1-7732-41E3-8591-934E9F583254}.Release|x86.Build.0 = Release|Any CPU - {78E15EC1-7732-41E3-8591-934E9F583254}.RelWithDebInfo|Any CPU.ActiveCfg = Release|Any CPU - {78E15EC1-7732-41E3-8591-934E9F583254}.RelWithDebInfo|Any CPU.Build.0 = Release|Any CPU - {78E15EC1-7732-41E3-8591-934E9F583254}.RelWithDebInfo|x64.ActiveCfg = Release|Any CPU - {78E15EC1-7732-41E3-8591-934E9F583254}.RelWithDebInfo|x64.Build.0 = Release|Any CPU - {78E15EC1-7732-41E3-8591-934E9F583254}.RelWithDebInfo|x86.ActiveCfg = Release|Any CPU - {78E15EC1-7732-41E3-8591-934E9F583254}.RelWithDebInfo|x86.Build.0 = Release|Any CPU + {7EE15292-2CAD-44FA-8A1F-BAC4688A49E0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {7EE15292-2CAD-44FA-8A1F-BAC4688A49E0}.Debug|Any CPU.Build.0 = Debug|Any CPU + {7EE15292-2CAD-44FA-8A1F-BAC4688A49E0}.Release|Any CPU.ActiveCfg = Release|Any CPU + {7EE15292-2CAD-44FA-8A1F-BAC4688A49E0}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -136,6 +52,7 @@ Global {1BFF54F9-4E35-49DB-893C-AF2047722FC6} = {17735A9D-BFD9-4585-A7CB-3208CA6EA8A7} {53AF2D01-B69F-4CD0-86A7-8FD95967D23C} = {ED2FE3E2-F7E7-4389-8231-B65123F2076F} {78E15EC1-7732-41E3-8591-934E9F583254} = {17735A9D-BFD9-4585-A7CB-3208CA6EA8A7} + {7EE15292-2CAD-44FA-8A1F-BAC4688A49E0} = {ED2FE3E2-F7E7-4389-8231-B65123F2076F} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {B526D2CE-EE2D-4AD4-93EF-1867D90FF1F5} diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f0a10268e..2c6db0cbe 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,39 +2,43 @@ - + https://devdiv.visualstudio.com/DevDiv/_git/DotNet-Trusted - 6808ad852c63ca765088873b0f88bafcbb7bb7fd + cec5867556ba6778f958f0600a92d3728acc19cc - + https://github.com/dotnet/core-setup - cc146b444df76e62d606f3431ff954b0cc112f92 + c38cd49ad5eee02e20e7e76dadac6b51cff035fb https://github.com/aspnet/AspNetCore e65004907a633a21e7e93b1c00e3944ffb10d8f8 - + https://github.com/aspnet/EntityFrameworkCore - ec6044a9d3b6a8b28c76cda4b97ec9182081bd58 + b7c17b1eca39ccbdd82ba403f2ae04ef6b4f02ec - + https://github.com/dotnet/templating - ac8f12b90238542dfd2ea596178ae24ea20a0f55 + 42a212514e375a0821baab69fbac462e39590cfb - + https://github.com/dotnet/toolset - 0d8427d1a876c5585f9733b9618ee5fc32f2c926 + de6587837888584f67b0d4fe389c40e704c19e9f - + https://github.com/dotnet/standard + e2dfe6f4656806953ab18edccc9c2c9c116ce15c + + + https://github.com/dotnet/cli - + https://github.com/dotnet/arcade - 9a5da1c8a3232c6304955c7a6ffe6109a1b13d9f + 78ccbeb1c8de779a6650257b408f5b3b4de16a0f diff --git a/eng/Versions.props b/eng/Versions.props index bf2d30cf6..71a93628e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -16,7 +16,7 @@ - 3.0.0-preview3.19123.1 + 3.0.0-preview4.19121.2 @@ -27,31 +27,34 @@ $(MicrosoftAspNetCoreAppPackageVersion) $(MicrosoftAspNetCoreAppPackageVersion) + + + 3.0.100-preview4.19111.1 + 3.0.0-preview3-27422-6 $(MicrosoftNETCoreAppPackageVersion) - 2.1.0-prerelease.19078.1 + 2.1.0-prerelease.19123.1 $(NETStandardLibraryPackageVersion) - 1.0.2-beta5.19066.2 + 1.0.2-beta5.19115.3 $(MicrosoftDotNetCommonItemTemplatesPackageVersion) 1.0.2-beta4.19106.1 0.2.0 1.6.1 - 2.0.1-servicing-26011-01 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftAspNetCoreAppPackageVersion) + 3.0.0-preview4-27422-21 $(MicrosoftAspNetCoreAppPackageVersion) - 3.0.0-preview3-27420-40 $(MicrosoftWindowsDesktopAppPackageVersion) $(MicrosoftWindowsDesktopPackageVersion) $(MicrosoftWindowsDesktopPackageVersion) diff --git a/eng/common/build.ps1 b/eng/common/build.ps1 index 8279dc713..316061382 100644 --- a/eng/common/build.ps1 +++ b/eng/common/build.ps1 @@ -99,7 +99,6 @@ function Build { /p:PerformanceTest=$performanceTest ` /p:Sign=$sign ` /p:Publish=$publish ` - /p:ContinuousIntegrationBuild=$ci ` @properties } diff --git a/eng/common/build.sh b/eng/common/build.sh index 4fe8b41ed..43b7ccb5c 100755 --- a/eng/common/build.sh +++ b/eng/common/build.sh @@ -10,7 +10,7 @@ set -e usage() { echo "Common settings:" - echo " --configuration Build configuration: 'Debug' or 'Release' (short: --c)" + echo " --configuration Build configuration: 'Debug' or 'Release' (short: -c)" echo " --verbosity Msbuild verbosity: q[uiet], m[inimal], n[ormal], d[etailed], and diag[nostic] (short: -v)" echo " --binaryLog Create MSBuild binary log (short: -bl)" echo "" @@ -191,7 +191,6 @@ function Build { /p:PerformanceTest=$performance_test \ /p:Sign=$sign \ /p:Publish=$publish \ - /p:ContinuousIntegrationBuild=$ci \ $properties ExitWithExitCode 0 diff --git a/eng/common/darc-init.ps1 b/eng/common/darc-init.ps1 index 57db185df..24676b261 100644 --- a/eng/common/darc-init.ps1 +++ b/eng/common/darc-init.ps1 @@ -19,7 +19,7 @@ function InstallDarcCli ($darcVersion) { # Until we can anonymously query the BAR API for the latest arcade-services # build applied to the PROD channel, this is hardcoded. if (-not $darcVersion) { - $darcVersion = '1.1.0-beta.19081.1' + $darcVersion = '1.1.0-beta.19120.2' } $arcadeServicesSource = 'https://dotnetfeed.blob.core.windows.net/dotnet-arcade/index.json' diff --git a/eng/common/darc-init.sh b/eng/common/darc-init.sh index bad07c3ae..d4dfdc94f 100755 --- a/eng/common/darc-init.sh +++ b/eng/common/darc-init.sh @@ -1,6 +1,24 @@ #!/usr/bin/env bash source="${BASH_SOURCE[0]}" +darcVersion="1.1.0-beta.19120.2" + +while [[ $# > 0 ]]; do + opt="$(echo "$1" | awk '{print tolower($0)}')" + case "$opt" in + --darcversion) + darcVersion=$2 + shift + ;; + *) + echo "Invalid argument: $1" + usage + exit 1 + ;; + esac + + shift +done # resolve $source until the file is no longer a symlink while [[ -h "$source" ]]; do @@ -27,12 +45,11 @@ function InstallDarcCli { echo $($dotnet_root/dotnet tool uninstall $darc_cli_package_name -g) fi - ReadGlobalVersion "Microsoft.DotNet.Arcade.Sdk" - local toolset_version=$_ReadGlobalVersion + local arcadeServicesSource="https://dotnetfeed.blob.core.windows.net/dotnet-arcade/index.json" echo "Installing Darc CLI version $toolset_version..." echo "You may need to restart your command shell if this is the first dotnet tool you have installed." - echo $($dotnet_root/dotnet tool install $darc_cli_package_name --version $toolset_version -v $verbosity -g) + echo $($dotnet_root/dotnet tool install $darc_cli_package_name --version $darcVersion --add-source "$arcadeServicesSource" -v $verbosity -g) } InstallDarcCli diff --git a/eng/common/templates/job/job.yml b/eng/common/templates/job/job.yml index 98ca94c32..cd4e5731a 100644 --- a/eng/common/templates/job/job.yml +++ b/eng/common/templates/job/job.yml @@ -108,6 +108,10 @@ jobs: - name: ${{ pair.key }} value: ${{ pair.value }} + # DotNet-HelixApi-Access provides 'HelixApiAccessToken' for internal builds + - ${{ if and(eq(parameters.enableTelemetry, 'true'), eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - group: DotNet-HelixApi-Access + ${{ if ne(parameters.workspace, '') }}: workspace: ${{ parameters.workspace }} diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index d1ed296dd..de7523cae 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -417,15 +417,15 @@ function InitializeToolset() { $proj = Join-Path $ToolsetDir "restore.proj" $bl = if ($binaryLog) { "/bl:" + (Join-Path $LogDir "ToolsetRestore.binlog") } else { "" } - + '' | Set-Content $proj - MSBuild $proj $bl /t:__WriteToolsetLocation /noconsolelogger /p:__ToolsetLocationOutputFile=$toolsetLocationFile - + MSBuild $proj $bl /t:__WriteToolsetLocation /clp:ErrorsOnly`;NoSummary /p:__ToolsetLocationOutputFile=$toolsetLocationFile + $path = Get-Content $toolsetLocationFile -TotalCount 1 if (!(Test-Path $path)) { throw "Invalid toolset path: $path" } - + return $global:_ToolsetBuildProj = $path } @@ -461,7 +461,7 @@ function MSBuild() { $buildTool = InitializeBuildTool - $cmdArgs = "$($buildTool.Command) /m /nologo /clp:Summary /v:$verbosity /nr:$nodeReuse" + $cmdArgs = "$($buildTool.Command) /m /nologo /clp:Summary /v:$verbosity /nr:$nodeReuse /p:ContinuousIntegrationBuild=$ci" if ($warnAsError) { $cmdArgs += " /warnaserror /p:TreatWarningsAsErrors=true" diff --git a/eng/common/tools.sh b/eng/common/tools.sh index 115a56a82..ecdece1f8 100644 --- a/eng/common/tools.sh +++ b/eng/common/tools.sh @@ -238,11 +238,15 @@ function InitializeToolset { ExitWithExitCode 2 fi - local toolset_restore_log="$log_dir/ToolsetRestore.binlog" local proj="$toolset_dir/restore.proj" + local bl="" + if [[ "$binary_log" == true ]]; then + bl="/bl:$log_dir/ToolsetRestore.binlog" + fi + echo '' > "$proj" - MSBuild "$proj" /t:__WriteToolsetLocation /noconsolelogger /bl:"$toolset_restore_log" /p:__ToolsetLocationOutputFile="$toolset_location_file" + MSBuild "$proj" $bl /t:__WriteToolsetLocation /clp:ErrorsOnly\;NoSummary /p:__ToolsetLocationOutputFile="$toolset_location_file" local toolset_build_proj=`cat "$toolset_location_file"` @@ -289,7 +293,7 @@ function MSBuild { warnaserror_switch="/warnaserror" fi - "$_InitializeBuildTool" "$_InitializeBuildToolCommand" /m /nologo /clp:Summary /v:$verbosity /nr:$node_reuse $warnaserror_switch /p:TreatWarningsAsErrors=$warn_as_error "$@" || { + "$_InitializeBuildTool" "$_InitializeBuildToolCommand" /m /nologo /clp:Summary /v:$verbosity /nr:$node_reuse $warnaserror_switch /p:TreatWarningsAsErrors=$warn_as_error /p:ContinuousIntegrationBuild=$ci "$@" || { local exit_code=$? echo "Build failed (exit code '$exit_code')." >&2 ExitWithExitCode $exit_code diff --git a/global.json b/global.json index f606a04bd..e8fe39ae0 100644 --- a/global.json +++ b/global.json @@ -3,6 +3,6 @@ "dotnet": "3.0.100-preview-009812" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19112.3" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19122.3" } } diff --git a/src/CopyToLatest/targets/BranchInfo.props b/src/CopyToLatest/targets/BranchInfo.props index d103b00f0..9bd214aa9 100644 --- a/src/CopyToLatest/targets/BranchInfo.props +++ b/src/CopyToLatest/targets/BranchInfo.props @@ -1,5 +1,5 @@ - release/3.0.1xx + master diff --git a/src/CopyToLatest/targets/FinishBuild.targets b/src/CopyToLatest/targets/FinishBuild.targets index f7675f24a..2fb9a3d5a 100644 --- a/src/CopyToLatest/targets/FinishBuild.targets +++ b/src/CopyToLatest/targets/FinishBuild.targets @@ -2,7 +2,7 @@ + BeforeTargets="AfterBuild"> + + + $(CoreSdkTargetFramework) + false + false + false + false + UNUSED + + + + + + + + + + + + + + + + <_SdkResolverSrc Include="$(Pkgruntime_win-x86_Microsoft_NETCore_DotNetHostResolver)\runtimes\win-x86\native\hostfxr.dll" Arch="x86\" /> + <_SdkResolverSrc Include="$(Pkgruntime_win-x64_Microsoft_NETCore_DotNetHostResolver)\runtimes\win-x64\native\hostfxr.dll" Arch="x64\" /> + <_SdkResolverSrc Include="$(PkgMicrosoft_DotNet_MSBuildSdkResolver)\lib\net472\**\*.dll" Arch="" /> + <_SdkResolverDst Include="@(_SdkResolverSrc->'$(OutputPath)%(Arch)%(RecursiveDir)%(Filename)%(Extension)')" /> + + + + + + diff --git a/src/redist/redist.csproj b/src/redist/redist.csproj index f462ea307..e48bbd806 100644 --- a/src/redist/redist.csproj +++ b/src/redist/redist.csproj @@ -11,6 +11,8 @@ of the version from the stage 0 SDK. --> + + diff --git a/src/redist/targets/Badge.targets b/src/redist/targets/Badge.targets index 31321b8db..8e9ccc4ac 100644 --- a/src/redist/targets/Badge.targets +++ b/src/redist/targets/Badge.targets @@ -6,7 +6,7 @@ + BeforeTargets="AfterBuild"> - + + Library false @@ -10,4 +10,8 @@ + + + + diff --git a/src/redist/targets/GenerateArchives.targets b/src/redist/targets/GenerateArchives.targets index 135542317..ec38e81d6 100644 --- a/src/redist/targets/GenerateArchives.targets +++ b/src/redist/targets/GenerateArchives.targets @@ -1,7 +1,7 @@ + BeforeTargets="AfterBuild"> diff --git a/src/redist/targets/GenerateInstallers.targets b/src/redist/targets/GenerateInstallers.targets index 32a7bf21b..fa4a65c64 100644 --- a/src/redist/targets/GenerateInstallers.targets +++ b/src/redist/targets/GenerateInstallers.targets @@ -1,8 +1,13 @@ + + <_BuildUnlessNoBuild Condition="'$(NoBuild)' != 'true'">Build + + + BeforeTargets="AfterBuild"> + BeforeTargets="AfterBuild"> diff --git a/src/redist/targets/GenerateMSIs.targets b/src/redist/targets/GenerateMSIs.targets index 86e5bcfdf..5b46f16b1 100644 --- a/src/redist/targets/GenerateMSIs.targets +++ b/src/redist/targets/GenerateMSIs.targets @@ -24,6 +24,10 @@ $(MSBuildThisFileDirectory)/packaging/windows/clisdk/VS.Tools.Net.Core.SDK.$(Architecture).nuspec $(ArtifactsNonShippingPackagesDir)VS.Tools.Net.Core.SDK.$(Architecture).$(FullNugetVersion).nupkg + $(ArtifactsDir)bin/SdkResolver/$(Configuration) + $(MSBuildThisFileDirectory)/packaging/windows/clisdk/VS.Tools.Net.Core.SDK.Resolver.nuspec + $(ArtifactsNonShippingPackagesDir)VS.Tools.Net.Core.SDK.Resolver.nupkg + @@ -181,6 +185,21 @@ '$(VSToolsNupkgFile)'" /> + + + + + diff --git a/src/redist/targets/Signing.targets b/src/redist/targets/Signing.targets index 35bb9f6d6..7b4fd5a32 100644 --- a/src/redist/targets/Signing.targets +++ b/src/redist/targets/Signing.targets @@ -1,5 +1,7 @@ - + + + diff --git a/src/redist/targets/Versions.targets b/src/redist/targets/Versions.targets index 4de284967..f59d228ea 100644 --- a/src/redist/targets/Versions.targets +++ b/src/redist/targets/Versions.targets @@ -4,7 +4,7 @@ 0 1 00 - preview3 + preview4 diff --git a/src/redist/targets/packaging/windows/clisdk/Init.cmd b/src/redist/targets/packaging/windows/clisdk/Init.cmd index b8455ac7f..8b3cb1bbc 100644 --- a/src/redist/targets/packaging/windows/clisdk/Init.cmd +++ b/src/redist/targets/packaging/windows/clisdk/Init.cmd @@ -1,5 +1,5 @@ @echo off set DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1 -set DOTNET_MULTILELVEL_LOOKUP=0 -set PATH=%~dp0;%PATH% \ No newline at end of file +set DOTNET_MULTILEVEL_LOOKUP=0 +set PATH=%~dp0;%PATH% diff --git a/src/redist/targets/packaging/windows/clisdk/VS.Tools.Net.Core.SDK.Resolver.cxspec b/src/redist/targets/packaging/windows/clisdk/VS.Tools.Net.Core.SDK.Resolver.cxspec new file mode 100644 index 000000000..c457e5ab7 --- /dev/null +++ b/src/redist/targets/packaging/windows/clisdk/VS.Tools.Net.Core.SDK.Resolver.cxspec @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/src/redist/targets/packaging/windows/clisdk/VS.Tools.Net.Core.SDK.Resolver.nuspec b/src/redist/targets/packaging/windows/clisdk/VS.Tools.Net.Core.SDK.Resolver.nuspec new file mode 100644 index 000000000..1ebc2f8a8 --- /dev/null +++ b/src/redist/targets/packaging/windows/clisdk/VS.Tools.Net.Core.SDK.Resolver.nuspec @@ -0,0 +1,19 @@ + + + + VS.Tools.Net.Core.SDK.Resolver + 1.0.0 + VS.Tools.Net.Core.SDK.Resolver + Microsoft + Microsoft + https://www.microsoft.com/net/dotnet_library_license.htm + https://github.com/dotnet/cli + true + .Net Core SDK MSBuild resolver for internal VS build consumption + © Microsoft Corporation. All rights reserved. + + + + + + \ No newline at end of file diff --git a/src/redist/targets/packaging/windows/clisdk/bundle.wxs b/src/redist/targets/packaging/windows/clisdk/bundle.wxs index 3944adbab..e5502d02d 100644 --- a/src/redist/targets/packaging/windows/clisdk/bundle.wxs +++ b/src/redist/targets/packaging/windows/clisdk/bundle.wxs @@ -42,25 +42,25 @@ - - - - - + VersionNT64 AND DOTNETHOME_X64 - + - + DOTNETHOME_X86 - +