Skip to content
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

Jump to bottom

enable repo pvp for msbuild #16637

Merged
merged 6 commits into from
Jun 15, 2023
Merged

enable repo pvp for msbuild #16637

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8e4c7ba
enable repo pvp for msbuild
oleksandr-didyk Jun 9, 2023
1bcf288
Merge branch 'main' into add-repo-pvp-for-msbuild
oleksandr-didyk Jun 9, 2023
df103cc
add Security.Cryptography patch
oleksandr-didyk Jun 15, 2023
895a47f
Merge branch 'main' into add-repo-pvp-for-msbuild
oleksandr-didyk Jun 15, 2023
2ed1855
Merge branch 'main' into add-repo-pvp-for-msbuild
MichaelSimons Jun 15, 2023
7142c84
Delete backported patch
MichaelSimons Jun 15, 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 src/SourceBuild/content/repo-projects/msbuild.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
<Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />

<PropertyGroup>
<PackageVersionPropsFlowType>DependenciesOnly</PackageVersionPropsFlowType>

<OutputVersionArgs>$(OutputVersionArgs) /p:DisableNerdbankVersioning=true</OutputVersionArgs>

Expand Down
30 changes: 30 additions & 0 deletions src/SourceBuild/patches/msbuild/0001-add-ConfigurationManager-to-Version.Details.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
From 33f010f82437aed851a6dc4bc8892e60c9765d0e Mon Sep 17 00:00:00 2001
From: Oleksandr Didyk <odidyk@microsoft.com>
Date: Wed, 31 May 2023 16:45:22 +0000
Subject: [PATCH] add ConfigurationManager to Version.Details

Backport: https://github.com/dotnet/msbuild/pull/8818
---
eng/Version.Details.xml | 6 ++++++
1 file changed, 6 insertions(+)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 61d002998..2c36cf24e 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -6,6 +6,12 @@
<Sha>525b6c35cc5c5c9b80b47044be2e4e77858d505a</Sha>
<SourceBuild RepoName="source-build-reference-packages" ManagedOnly="true" />
</Dependency>
+ <!-- Necessary for source-build. This allows the package to be retrieved from previously-source-built artifacts
+ and flow in as dependencies of the packages produced by msbuild. -->
+ <Dependency Name="System.Configuration.ConfigurationManager" Version="7.0.0">
+ <Uri>https://github.com/dotnet/runtime</Uri>
+ <Sha>d099f075e45d2aa6007a22b71b45a08758559f80</Sha>
+ </Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.23254.1">
--
2.25.1

Loading