From 247119051b5e54a0a3b220f8d9e0c634db382307 Mon Sep 17 00:00:00 2001 From: Scott Jones Date: Mon, 28 Sep 2020 09:03:51 -0700 Subject: [PATCH 1/2] always create global.json and prerelease targets files on every build --- build.cmd | 35 +++++++++++++++-------------------- 1 file changed, 15 insertions(+), 20 deletions(-) diff --git a/build.cmd b/build.cmd index 776e8830e..a97cf0c4c 100644 --- a/build.cmd +++ b/build.cmd @@ -12,7 +12,7 @@ powershell -NoProfile -ExecutionPolicy unrestricted -Command ^ [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; ^ &([scriptblock]::Create((Invoke-WebRequest -UseBasicParsing 'https://dot.net/v1/dotnet-install.ps1'))) ^ -Version '%CsWinRTNet5SdkVersion%' -InstallDir "%DOTNET_ROOT%" -Architecture 'x64' ^ --AzureFeed 'https://dotnetcli.blob.core.windows.net/dotnet' " +-AzureFeed 'https://dotnetcli.blob.core.windows.net/dotnet' "n powershell -NoProfile -ExecutionPolicy unrestricted -Command ^ [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; ^ &([scriptblock]::Create((Invoke-WebRequest -UseBasicParsing 'https://dot.net/v1/dotnet-install.ps1'))) ^ @@ -20,16 +20,13 @@ powershell -NoProfile -ExecutionPolicy unrestricted -Command ^ -AzureFeed 'https://dotnetcli.blob.core.windows.net/dotnet' " :globaljson -rem User expected to provide global.json with allowPrerelease=true -if not exist %~dp0global.json ( - echo Creating default global.json to allowPrelease for unit test project builds - echo { > global.json - echo "sdk": { >> global.json - echo "version": "%CsWinRTNet5SdkVersion%", >> global.json - echo "allowPrerelease": true >> global.json - echo } >> global.json - echo } >> global.json -) +rem Create global.json for current .NET SDK, and with allowPrerelease=true +echo { > global.json +echo "sdk": { >> global.json +echo "version": "%CsWinRTNet5SdkVersion%", >> global.json +echo "allowPrerelease": true >> global.json +echo } >> global.json +echo } >> global.json rem Preserve above for Visual Studio launch inheritance setlocal ENABLEDELAYEDEXPANSION @@ -69,15 +66,13 @@ if "%cswinrt_version_string%"=="" set cswinrt_version_string=0.0.0-private.0 rem Generate prerelease targets file to exercise build warnings set prerelease_targets=nuget\Microsoft.Windows.CsWinRT.Prerelease.targets -if not exist %prerelease_targets% ( - echo Creating default %prerelease_targets% - echo ^ > %prerelease_targets% - echo ^> %prerelease_targets% - echo Condition="'$(NetCoreSdkVersion)' ^!= '%CsWinRTNet5SdkVersion%' and '$(Net5SdkVersion)' ^!= '%CsWinRTNet5SdkVersion%'"^> >> %prerelease_targets% - echo ^ >> %prerelease_targets% - echo ^ >> %prerelease_targets% - echo ^ >> %prerelease_targets% -) +rem Create default %prerelease_targets% +echo ^ > %prerelease_targets% +echo ^> %prerelease_targets% +echo Condition="'$(NetCoreSdkVersion)' ^!= '%CsWinRTNet5SdkVersion%' and '$(Net5SdkVersion)' ^!= '%CsWinRTNet5SdkVersion%'"^> >> %prerelease_targets% +echo ^ >> %prerelease_targets% +echo ^ >> %prerelease_targets% +echo ^ >> %prerelease_targets% rem VS 16.8 BuildTools support (temporary, until VS 16.8 is deployed to Azure Devops agents in 12/2020) msbuild -ver | findstr 16.8 >nul From f0c7b1f942c8f09fdabb91f09b4f3301df95c875 Mon Sep 17 00:00:00 2001 From: Scott Jones Date: Mon, 28 Sep 2020 09:06:22 -0700 Subject: [PATCH 2/2] typo --- build.cmd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.cmd b/build.cmd index a97cf0c4c..3d2ed2fad 100644 --- a/build.cmd +++ b/build.cmd @@ -12,7 +12,7 @@ powershell -NoProfile -ExecutionPolicy unrestricted -Command ^ [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; ^ &([scriptblock]::Create((Invoke-WebRequest -UseBasicParsing 'https://dot.net/v1/dotnet-install.ps1'))) ^ -Version '%CsWinRTNet5SdkVersion%' -InstallDir "%DOTNET_ROOT%" -Architecture 'x64' ^ --AzureFeed 'https://dotnetcli.blob.core.windows.net/dotnet' "n +-AzureFeed 'https://dotnetcli.blob.core.windows.net/dotnet' " powershell -NoProfile -ExecutionPolicy unrestricted -Command ^ [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; ^ &([scriptblock]::Create((Invoke-WebRequest -UseBasicParsing 'https://dot.net/v1/dotnet-install.ps1'))) ^