Skip to content

set runtime framework version with microsoft net core app #708

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

Merged
zsd4yr merged 7 commits into from
Apr 16, 2019
Merged

set runtime framework version with microsoft net core app #708

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
2a83772
set runtime framework version with microsoft net core app
Apr 8, 2019
48a38c0
move to directory build props
Apr 8, 2019
66647a4
no templates no
Apr 8, 2019
8ec4729
runtime framework ver
Apr 8, 2019
39ea28c
/p:EnableInstallDotNetCoreRuntimes=true in cibuild
Apr 8, 2019
1a99e9e
Merge branch 'master' into dev/zadanz/runtime-framework-ver
Apr 16, 2019
0c6052e
copy wpf for this
Apr 16, 2019
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
Prev Previous commit
copy wpf for this
  • Loading branch information
Zachary Danz committed Apr 16, 2019
commit 0c6052e08aad7538e06129d0db0432647931ab12
1 change: 1 addition & 0 deletions Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
</PropertyGroup>

<PropertyGroup>
<!-- Set RuntimeFrameworkVersion to MicrosoftNETCoreAppPackageVersion from Core Setup to prevent large SDK cycle -->
<RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp3.0' ">$(MicrosoftNETCoreAppPackageVersion)</RuntimeFrameworkVersion>
</PropertyGroup>

Expand Down
6 changes: 6 additions & 0 deletions Directory.Build.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,10 @@
<CallTarget Targets="GenerateCoverageResult" />
</Target>

<PropertyGroup>
<!-- If TargetFramework is not netcoreapp3.x, then reset RuntimeFrameworkVersion -->
<!-- TODO: /p:EnableInstallDotNetCoreRuntimes=true to endable this for tests once dotnet/arcade#2343 is in -->
<RuntimeFrameworkVersion Condition="!$(TargetFramework.StartsWith('netcoreapp3.'))" />
</PropertyGroup>

</Project>
2 changes: 1 addition & 1 deletion eng/CIBuild.cmd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
@echo off
powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0\common\Build.ps1""" -ci -preparemachine /p:EnableInstallDotNetCoreRuntimes=true %*"
powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0\common\Build.ps1""" -ci -preparemachine %*"