Skip to content

Commit

Permalink
Enable source-build pvp flow for installer (#16550)
Browse files Browse the repository at this point in the history
Co-authored-by: Matt Thalman <mthalman@microsoft.com>
  • Loading branch information
MichaelSimons and mthalman authored Jun 1, 2023
1 parent 56fe550 commit 8f01b7d
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 15 deletions.
1 change: 1 addition & 0 deletions CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
# See https://help.github.com/articles/about-code-owners/

/.devcontainer/ @dotnet/source-build-internal
/eng/SourceBuild* @dotnet/source-build-internal
/src/snaps/ @rbhanda
/src/SourceBuild/ @dotnet/source-build-internal
/src/VirtualMonoRepo/ @dotnet/product-construction
2 changes: 2 additions & 0 deletions eng/SourceBuild.props
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
<!-- Whenever altering this or other Source Build files, please include @dotnet/source-build-internal as a reviewer. -->

<Project>

<PropertyGroup>
Expand Down
16 changes: 4 additions & 12 deletions eng/SourceBuildPrebuiltBaseline.xml
Original file line number Diff line number Diff line change
@@ -1,23 +1,15 @@
<!-- Whenever altering this or other Source Build files, please include @dotnet/source-build-internal as a reviewer. -->
<!-- See aka.ms/dotnet/prebuilts for guidance on what pre-builts are and how to eliminate them. -->

<UsageData>
<IgnorePatterns>
<UsagePattern IdentityGlob="Microsoft.SourceBuild.Intermediate.*/*" />

<!--
Temporary exclusion for NuGet packages, since NuGet is not producing source-build intermediate package,
see: https://github.com/NuGet/Home/issues/11059
Once that's fixed, NuGet package version should be updated to newest, and intermediate product dependency
added to Version.Details.xml
-->
<UsagePattern IdentityGlob="NuGet.Common/*5.8.0*" />
<UsagePattern IdentityGlob="NuGet.Configuration/*5.8.0*" />
<UsagePattern IdentityGlob="NuGet.Frameworks/*5.8.0*" />
<UsagePattern IdentityGlob="NuGet.Packaging/*5.8.0*" />
<UsagePattern IdentityGlob="NuGet.Versioning/*5.8.0*" />

<!-- Referenced by NuGet.Packaging.5.8.0 - could be resolved when version of NuGet packages gets updated. -->
<UsagePattern IdentityGlob="System.Security.Cryptography.Cng/5.0.0-preview.3.20214.6" />
<UsagePattern IdentityGlob="System.Security.Cryptography.Pkcs/5.0.0-preview.3.20214.6" />
<UsagePattern IdentityGlob="NuGet.*/*" />

<!-- These are coming in via runtime but the source-build infra isn't able to automatically pick up the right intermediate. -->
<UsagePattern IdentityGlob="Microsoft.NETCore.App.Crossgen2.linux-x64/*8.0.*" />
Expand Down
2 changes: 1 addition & 1 deletion eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/NuGet/NuGet.Client -->
<NuGetVersioningPackageVersion>5.8.0</NuGetVersioningPackageVersion>
<NuGetBuildTasksPackageVersion>6.7.0-preview.2.51</NuGetBuildTasksPackageVersion>
</PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/deployment-tools -->
<PropertyGroup>
Expand Down
2 changes: 2 additions & 0 deletions src/SourceBuild/content/repo-projects/installer.proj
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@

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

<PackageVersionPropsFlowType>DependenciesOnly</PackageVersionPropsFlowType>

<!-- CS9057 - Caused by incoherency of analyzer assemblies during pre-release builds. -->
<RepoNoWarns>CS9057</RepoNoWarns>
</PropertyGroup>
Expand Down
4 changes: 2 additions & 2 deletions src/core-sdk-tasks/core-sdk-tasks.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
<PackageReference Include="Microsoft.Build" Version="15.7.179" />
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="15.7.179" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include="NuGet.Versioning" Version="$(NuGetVersioningPackageVersion)" />
<PackageReference Include="NuGet.Packaging" Version="$(NuGetVersioningPackageVersion)" />
<PackageReference Include="NuGet.Versioning" Version="$(NuGetBuildTasksPackageVersion)" />
<PackageReference Include="NuGet.Packaging" Version="$(NuGetBuildTasksPackageVersion)" />
<PackageReference Include="System.Reflection.Metadata" Version="1.4.2" />
<PackageReference Include="WindowsAzure.Storage" Version="9.3.3" Condition="'$(DotNetBuildFromSource)' != 'true'" />
<PackageReference Include="System.Net.Http" Version="4.3.4" />
Expand Down

0 comments on commit 8f01b7d

Please sign in to comment.