mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Enable source-build pvp flow for installer (#16550)

Browse source 
Co-authored-by: Matt Thalman <mthalman@microsoft.com>
This commit is contained in:
Michael Simons 2023-06-01 14:01:35 -05:00 • committed by GitHub
parent 56fe550223
commit 8f01b7d3f7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 12 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

1
CODEOWNERS
View file

@ -2,6 +2,7 @@
# See https://help.github.com/articles/about-code-owners/ # See https://help.github.com/articles/about-code-owners/
/.devcontainer/ @dotnet/source-build-internal /.devcontainer/ @dotnet/source-build-internal
/eng/SourceBuild* @dotnet/source-build-internal
/src/snaps/ @rbhanda /src/snaps/ @rbhanda
/src/SourceBuild/ @dotnet/source-build-internal /src/SourceBuild/ @dotnet/source-build-internal
/src/VirtualMonoRepo/ @dotnet/product-construction /src/VirtualMonoRepo/ @dotnet/product-construction

2
eng/SourceBuild.props
View file

@ -1,3 +1,5 @@
<!-- Whenever altering this or other Source Build files, please include @dotnet/source-build-internal as a reviewer. -->
<Project> <Project>
<PropertyGroup> <PropertyGroup>

16
eng/SourceBuildPrebuiltBaseline.xml
View file

@ -1,3 +1,6 @@
<!-- 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> <UsageData>
<IgnorePatterns> <IgnorePatterns>
<UsagePattern IdentityGlob="Microsoft.SourceBuild.Intermediate.*/*" /> <UsagePattern IdentityGlob="Microsoft.SourceBuild.Intermediate.*/*" />
@ -5,19 +8,8 @@
<!-- <!--
Temporary exclusion for NuGet packages, since NuGet is not producing source-build intermediate package, Temporary exclusion for NuGet packages, since NuGet is not producing source-build intermediate package,
see: https://github.com/NuGet/Home/issues/11059 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.*/*" />
<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" />
<!-- These are coming in via runtime but the source-build infra isn't able to automatically pick up the right intermediate. --> <!-- 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.*" /> <UsagePattern IdentityGlob="Microsoft.NETCore.App.Crossgen2.linux-x64/*8.0.*" />

2
eng/Versions.props
View file

@ -120,7 +120,7 @@
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<!-- Dependencies from https://github.com/NuGet/NuGet.Client --> <!-- Dependencies from https://github.com/NuGet/NuGet.Client -->
<NuGetVersioningPackageVersion>5.8.0</NuGetVersioningPackageVersion> <NuGetBuildTasksPackageVersion>6.7.0-preview.2.51</NuGetBuildTasksPackageVersion>
</PropertyGroup> </PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/deployment-tools --> <!-- Dependencies from https://github.com/dotnet/deployment-tools -->
<PropertyGroup> <PropertyGroup>

2
src/SourceBuild/content/repo-projects/installer.proj
View file

@ -43,6 +43,8 @@
<BuildCommand>$(StandardSourceBuildCommand) $(BuildCommandArgs)</BuildCommand> <BuildCommand>$(StandardSourceBuildCommand) $(BuildCommandArgs)</BuildCommand>
<PackageVersionPropsFlowType>DependenciesOnly</PackageVersionPropsFlowType>
<!-- CS9057 - Caused by incoherency of analyzer assemblies during pre-release builds. --> <!-- CS9057 - Caused by incoherency of analyzer assemblies during pre-release builds. -->
<RepoNoWarns>CS9057</RepoNoWarns> <RepoNoWarns>CS9057</RepoNoWarns>
</PropertyGroup> </PropertyGroup>

4
src/core-sdk-tasks/core-sdk-tasks.csproj
View file

@ -12,8 +12,8 @@
<PackageReference Include="Microsoft.Build" Version="15.7.179" /> <PackageReference Include="Microsoft.Build" Version="15.7.179" />
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="15.7.179" /> <PackageReference Include="Microsoft.Build.Utilities.Core" Version="15.7.179" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" /> <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include="NuGet.Versioning" Version="$(NuGetVersioningPackageVersion)" /> <PackageReference Include="NuGet.Versioning" Version="$(NuGetBuildTasksPackageVersion)" />
<PackageReference Include="NuGet.Packaging" Version="$(NuGetVersioningPackageVersion)" /> <PackageReference Include="NuGet.Packaging" Version="$(NuGetBuildTasksPackageVersion)" />
<PackageReference Include="System.Reflection.Metadata" Version="1.4.2" /> <PackageReference Include="System.Reflection.Metadata" Version="1.4.2" />
<PackageReference Include="WindowsAzure.Storage" Version="9.3.3" Condition="'$(DotNetBuildFromSource)' != 'true'" /> <PackageReference Include="WindowsAzure.Storage" Version="9.3.3" Condition="'$(DotNetBuildFromSource)' != 'true'" />
<PackageReference Include="System.Net.Http" Version="4.3.4" /> <PackageReference Include="System.Net.Http" Version="4.3.4" />