Add Windows DevVersions VMR build leg #44387
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
- Disable join points in GenerateLayout and GenerateMSIs.targets - Condition MSBuildSdkResolver & SdkResolver - Use a toolset version for Microsoft.Deployment.DotNet.Releases for netfx build as VS expects a hardcoded version (follows what STJ does). - Move aliased version properties out of Versions.props as those have a wrong value when being overridden by the VMR infra.
dotnet-issue-labeler
bot
added
Area-Infrastructure
untriaged
akoeplinger
approved these changes
Oct 23, 2024
| @@ -77,5 +77,18 @@ | |||
| <Using Include="System.Xml.Linq" /> | |||
| </ItemGroup> | |||
|
|
|||
| <!-- These aliases need to live outside of Versions.props as VMR / source-build overwrites some of the version properties for live builds. --> | |||
| <PropertyGroup> | |||
| <!-- Runtime and Apphost pack versions are the same for all RIDs. We flow the x64 version above and create aliases without the winx64 here for clarity elsewhere. --> | |||
There was a problem hiding this comment.
nit: the x64 version is no longer "above" :)
Suggested change
| <!-- Runtime and Apphost pack versions are the same for all RIDs. We flow the x64 version above and create aliases without the winx64 here for clarity elsewhere. --> | |
| <!-- Runtime and Apphost pack versions are the same for all RIDs. We flow the x64 version and create aliases without the winx64 here for clarity elsewhere. --> |
| @@ -63,7 +63,9 @@ | |||
|
|
|||
| <ItemGroup> | |||
| <PackageReference Include="Microsoft.Build.Framework" PrivateAssets="All" /> | |||
| <PackageReference Include="Microsoft.Deployment.DotNet.Releases" /> | |||
| <PackageReference Include="Microsoft.Deployment.DotNet.Releases"> | |||
| <VersionOverride Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'">$(MicrosoftDeploymentDotNetReleasesToolsetPackageVersion)</VersionOverride> | |||
There was a problem hiding this comment.
why only for netfx? can you add a comment?
| <PackageDownload Include="Microsoft.NETCore.App.Runtime.win-x86" Version="[$(MicrosoftNETCoreAppRuntimePackageVersion)]" /> | ||
| <PackageDownload Include="Microsoft.NETCore.App.Runtime.win-x64" Version="[$(MicrosoftNETCoreAppRuntimePackageVersion)]" /> | ||
| <PackageDownload Include="Microsoft.NETCore.App.Runtime.win-arm64" Version="[$(MicrosoftNETCoreAppRuntimePackageVersion)]" /> | ||
| <PackageDownload Include="Microsoft.NETCore.App.Runtime.win-x86" Version="[$(MicrosoftNETCoreAppRuntimePackageVersion)]" Condition="'$(DotNetBuild)' != 'true' or '$(DotNetBuildPass)' == '2'" /> |
There was a problem hiding this comment.
we could extract '$(DotNetBuild)' != 'true' or '$(DotNetBuildPass)' == '2' into a separate property since it's used a couple times
|
Sorry, this was set to auto-merge. I will add the comments in my next PR. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes dotnet/source-build#4691
Contributes to dotnet/source-build#3739