Skip to content

Enable source-build pvp flow for installer #16550

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
merged 6 commits into from
Jun 1, 2023
Merged

Enable source-build pvp flow for installer #16550

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
878ac3d
Enable source-build pvp flow for installer
MichaelSimons May 31, 2023
dd83767
Update CODEOWNERS
MichaelSimons Jun 1, 2023
36e546e
Refactor versions.props and versions.details.xml
MichaelSimons Jun 1, 2023
cdf2009
Merge branch 'main' of https://github.com/dotnet/installer into insta…
MichaelSimons Jun 1, 2023
22eec7e
Update versions from main
MichaelSimons Jun 1, 2023
9b4ebfa
Merge branch 'main' into installer-pvp
MichaelSimons Jun 1, 2023
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
1 change: 1 addition & 0 deletions CODEOWNERS
View file
Open in desktop
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
/src/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
View file
Open in desktop
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
View file
Open in desktop
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. -->
Copy link
Member Author

@MichaelSimons MichaelSimons May 31, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@oleksandr-didyk - I am proposing a slight wording change to reduce the length of the message. I also introduced a blank link before the first element.

<!-- 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
6 changes: 5 additions & 1 deletion eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,11 +156,15 @@
<Sha>d4c4d1ec77e88a9abcb229f3d86413fa0b2a57e1</Sha>
<SourceBuild RepoName="msbuild" ManagedOnly="true" />
</Dependency>
<Dependency Name="NuGet.Build.Tasks" Version="6.7.0-preview.2.50" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="NuGet.Packaging" Version="6.7.0-preview.2.50" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/nuget/nuget.client</Uri>
<Sha>a6fff16af6f44927a83851448a99beb1d2801600</Sha>
<SourceBuildTarball RepoName="nuget-client" ManagedOnly="true" />
</Dependency>
<Dependency Name="NuGet.Versioning" Version="6.7.0-preview.2.50" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/nuget/nuget.client</Uri>
<Sha>a6fff16af6f44927a83851448a99beb1d2801600</Sha>
</Dependency>
<Dependency Name="Microsoft.ApplicationInsights" Version="2.0.0">
<Uri>https://github.com/Microsoft/ApplicationInsights-dotnet</Uri>
<Sha>53b80940842204f78708a538628288ff5d741a1d</Sha>
Expand Down
3 changes: 2 additions & 1 deletion eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,8 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/NuGet/NuGet.Client -->
<NuGetVersioningPackageVersion>5.8.0</NuGetVersioningPackageVersion>
<NuGetPackagingPackageVersion>6.7.0-preview.2.50</NuGetPackagingPackageVersion>
<NuGetVersioningPackageVersion>6.7.0-preview.2.50</NuGetVersioningPackageVersion>
</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
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion src/core-sdk-tasks/core-sdk-tasks.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<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.Packaging" Version="$(NuGetPackagingPackageVersion)" />
<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