Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

always create global.json and prerelease targets files on every build #441

Merged
merged 3 commits into from
Sep 29, 2020
Merged

always create global.json and prerelease targets files on every build #441

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2471190
always create global.json and prerelease targets files on every build
Scottj1s Sep 28, 2020
f0c7b1f
typo
Scottj1s Sep 28, 2020
8378b8c
Merge branch 'master' into scottj1s/build_tweak
Scottj1s Sep 29, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 14 additions & 19 deletions build.cmd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
j0shuams marked this conversation as resolved.
Show resolved Hide resolved
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
Expand Down Expand Up @@ -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 ^<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" InitialTargets="CsWinRTVerifyPrerelease"^> > %prerelease_targets%
echo ^<Target Name="CsWinRTVerifyPrerelease" >> %prerelease_targets%
echo Condition="'$(NetCoreSdkVersion)' ^!= '%CsWinRTNet5SdkVersion%' and '$(Net5SdkVersion)' ^!= '%CsWinRTNet5SdkVersion%'"^> >> %prerelease_targets%
echo ^<Warning Text="This C#/WinRT prerelease is designed for .Net SDK %CsWinRTNet5SdkVersion%. Other prereleases may be incompatible due to breaking changes." /^> >> %prerelease_targets%
echo ^</Target^> >> %prerelease_targets%
echo ^</Project^> >> %prerelease_targets%
)
rem Create default %prerelease_targets%
echo ^<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" InitialTargets="CsWinRTVerifyPrerelease"^> > %prerelease_targets%
echo ^<Target Name="CsWinRTVerifyPrerelease" >> %prerelease_targets%
echo Condition="'$(NetCoreSdkVersion)' ^!= '%CsWinRTNet5SdkVersion%' and '$(Net5SdkVersion)' ^!= '%CsWinRTNet5SdkVersion%'"^> >> %prerelease_targets%
echo ^<Warning Text="This C#/WinRT prerelease is designed for .Net SDK %CsWinRTNet5SdkVersion%. Other prereleases may be incompatible due to breaking changes." /^> >> %prerelease_targets%
echo ^</Target^> >> %prerelease_targets%
echo ^</Project^> >> %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
Expand Down