Skip to content

Commit 8f01b7d

Browse files
Enable source-build pvp flow for installer (#16550)
Co-authored-by: Matt Thalman <[email protected]>
1 parent 56fe550 commit 8f01b7d

File tree

6 files changed

+12
-15
lines changed

6 files changed

+12
-15
lines changed

CODEOWNERS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
# See https://help.github.com/articles/about-code-owners/
33

44
/.devcontainer/ @dotnet/source-build-internal
5+
/eng/SourceBuild* @dotnet/source-build-internal
56
/src/snaps/ @rbhanda
67
/src/SourceBuild/ @dotnet/source-build-internal
78
/src/VirtualMonoRepo/ @dotnet/product-construction

eng/SourceBuild.props

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
<!-- Whenever altering this or other Source Build files, please include @dotnet/source-build-internal as a reviewer. -->
2+
13
<Project>
24

35
<PropertyGroup>

eng/SourceBuildPrebuiltBaseline.xml

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,15 @@
1+
<!-- Whenever altering this or other Source Build files, please include @dotnet/source-build-internal as a reviewer. -->
2+
<!-- See aka.ms/dotnet/prebuilts for guidance on what pre-builts are and how to eliminate them. -->
3+
14
<UsageData>
25
<IgnorePatterns>
36
<UsagePattern IdentityGlob="Microsoft.SourceBuild.Intermediate.*/*" />
47

58
<!--
69
Temporary exclusion for NuGet packages, since NuGet is not producing source-build intermediate package,
710
see: https://github.com/NuGet/Home/issues/11059
8-
9-
Once that's fixed, NuGet package version should be updated to newest, and intermediate product dependency
10-
added to Version.Details.xml
1111
-->
12-
<UsagePattern IdentityGlob="NuGet.Common/*5.8.0*" />
13-
<UsagePattern IdentityGlob="NuGet.Configuration/*5.8.0*" />
14-
<UsagePattern IdentityGlob="NuGet.Frameworks/*5.8.0*" />
15-
<UsagePattern IdentityGlob="NuGet.Packaging/*5.8.0*" />
16-
<UsagePattern IdentityGlob="NuGet.Versioning/*5.8.0*" />
17-
18-
<!-- Referenced by NuGet.Packaging.5.8.0 - could be resolved when version of NuGet packages gets updated. -->
19-
<UsagePattern IdentityGlob="System.Security.Cryptography.Cng/5.0.0-preview.3.20214.6" />
20-
<UsagePattern IdentityGlob="System.Security.Cryptography.Pkcs/5.0.0-preview.3.20214.6" />
12+
<UsagePattern IdentityGlob="NuGet.*/*" />
2113

2214
<!-- These are coming in via runtime but the source-build infra isn't able to automatically pick up the right intermediate. -->
2315
<UsagePattern IdentityGlob="Microsoft.NETCore.App.Crossgen2.linux-x64/*8.0.*" />

eng/Versions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@
120120
</PropertyGroup>
121121
<PropertyGroup>
122122
<!-- Dependencies from https://github.com/NuGet/NuGet.Client -->
123-
<NuGetVersioningPackageVersion>5.8.0</NuGetVersioningPackageVersion>
123+
<NuGetBuildTasksPackageVersion>6.7.0-preview.2.51</NuGetBuildTasksPackageVersion>
124124
</PropertyGroup>
125125
<!-- Dependencies from https://github.com/dotnet/deployment-tools -->
126126
<PropertyGroup>

src/SourceBuild/content/repo-projects/installer.proj

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,8 @@
4343

4444
<BuildCommand>$(StandardSourceBuildCommand) $(BuildCommandArgs)</BuildCommand>
4545

46+
<PackageVersionPropsFlowType>DependenciesOnly</PackageVersionPropsFlowType>
47+
4648
<!-- CS9057 - Caused by incoherency of analyzer assemblies during pre-release builds. -->
4749
<RepoNoWarns>CS9057</RepoNoWarns>
4850
</PropertyGroup>

src/core-sdk-tasks/core-sdk-tasks.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
<PackageReference Include="Microsoft.Build" Version="15.7.179" />
1313
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="15.7.179" />
1414
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
15-
<PackageReference Include="NuGet.Versioning" Version="$(NuGetVersioningPackageVersion)" />
16-
<PackageReference Include="NuGet.Packaging" Version="$(NuGetVersioningPackageVersion)" />
15+
<PackageReference Include="NuGet.Versioning" Version="$(NuGetBuildTasksPackageVersion)" />
16+
<PackageReference Include="NuGet.Packaging" Version="$(NuGetBuildTasksPackageVersion)" />
1717
<PackageReference Include="System.Reflection.Metadata" Version="1.4.2" />
1818
<PackageReference Include="WindowsAzure.Storage" Version="9.3.3" Condition="'$(DotNetBuildFromSource)' != 'true'" />
1919
<PackageReference Include="System.Net.Http" Version="4.3.4" />

0 commit comments

Comments
 (0)