Enable PVP flow for arcade #16111
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,49 @@ | ||
| From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 | ||
| From: Matt Thalman <[email protected]> | ||
| Date: Mon, 3 Apr 2023 08:14:22 -0500 | ||
| Subject: [PATCH] Remove SB workarounds to enable PVP flow | ||
|
|
||
| Backport: https://github.com/dotnet/arcade/pull/13009 | ||
|
|
||
| --- | ||
| .../Microsoft.DotNet.CodeAnalysis.csproj | 10 ---------- | ||
| .../Microsoft.DotNet.GenFacades.csproj | 5 ----- | ||
| 2 files changed, 15 deletions(-) | ||
|
|
||
| diff --git a/src/Microsoft.DotNet.CodeAnalysis/Microsoft.DotNet.CodeAnalysis.csproj b/src/Microsoft.DotNet.CodeAnalysis/Microsoft.DotNet.CodeAnalysis.csproj | ||
| index d1ac5ccb..5cdfd539 100644 | ||
| --- a/src/Microsoft.DotNet.CodeAnalysis/Microsoft.DotNet.CodeAnalysis.csproj | ||
| +++ b/src/Microsoft.DotNet.CodeAnalysis/Microsoft.DotNet.CodeAnalysis.csproj | ||
| @@ -12,16 +12,6 @@ | ||
| <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="$(MicrosoftCodeAnalysisCSharpVersion)" ExcludeAssets="analyzers" /> | ||
| </ItemGroup> | ||
|
|
||
| - <!-- | ||
| - In the source-build tarball build, Microsoft.CodeAnalysis.CSharp has dependencies on old | ||
| - versions of these packages due to repo build order. Override to lift them to the versions passed | ||
| - in via DotNetPackageVersionPropsPath. | ||
| - --> | ||
| - <ItemGroup Condition="'$(DotNetBuildFromSource)' == 'true'"> | ||
| - <PackageReference Include="System.Collections.Immutable" Version="$(SystemCollectionsImmutableVersion)" /> | ||
| - <PackageReference Include="System.Reflection.Metadata" Version="$(SystemReflectionMetadataVersion)" /> | ||
| - </ItemGroup> | ||
| - | ||
| <ItemGroup> | ||
| <Content Include="build/*.*" PackagePath="build" /> | ||
| <Content Include="content/*.*" PackagePath="content" /> | ||
| diff --git a/src/Microsoft.DotNet.GenFacades/Microsoft.DotNet.GenFacades.csproj b/src/Microsoft.DotNet.GenFacades/Microsoft.DotNet.GenFacades.csproj | ||
| index d73f6abd..20c0c33b 100644 | ||
| --- a/src/Microsoft.DotNet.GenFacades/Microsoft.DotNet.GenFacades.csproj | ||
| +++ b/src/Microsoft.DotNet.GenFacades/Microsoft.DotNet.GenFacades.csproj | ||
| @@ -14,11 +14,6 @@ | ||
| <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="$(MsbuildTaskMicrosoftCodeAnalysisCSharpVersion)" ExcludeAssets="analyzers" Publish="false" /> | ||
| </ItemGroup> | ||
|
|
||
| - <!-- When building offline we need to bump the version of System.Reflection.Metadata that CodeAnalysis package depends on to match what the source build tarball expects. --> | ||
| - <ItemGroup Condition="'$(DotNetBuildOffline)' == 'true'"> | ||
| - <PackageReference Include="System.Reflection.Metadata" Version="$(SystemReflectionMetadataVersion)" /> | ||
| - </ItemGroup> | ||
| - | ||
|
Comment on lines
+34
to
+46
Member
There was a problem hiding this comment. This patch is no longer necessary. Remove. |
||
| <ItemGroup Condition="'$(TargetFramework)' == 'net472'"> | ||
| <Compile Include="..\Common\Internal\AssemblyResolver.cs" /> | ||
| <Compile Include="..\Common\Internal\BuildTask.Desktop.cs" /> | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| @@ -0,0 +1,31 @@ | ||||||||||||||||||
| From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 | ||||||||||||||||||
| From: Matt Thalman <[email protected]> | ||||||||||||||||||
| Date: Mon, 17 Apr 2023 13:43:08 -0500 | ||||||||||||||||||
| Subject: [PATCH] Add packages to Version.Details | ||||||||||||||||||
|
|
||||||||||||||||||
| --- | ||||||||||||||||||
| eng/Version.Details.xml | 11 +++++++++++ | ||||||||||||||||||
| 1 file changed, 11 insertions(+) | ||||||||||||||||||
|
|
||||||||||||||||||
| diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml | ||||||||||||||||||
| index c0f06f69..2fc9ced7 100644 | ||||||||||||||||||
| --- a/eng/Version.Details.xml | ||||||||||||||||||
| +++ b/eng/Version.Details.xml | ||||||||||||||||||
| @@ -106,6 +106,17 @@ | ||||||||||||||||||
| <Uri>https://github.com/dotnet/sdk</Uri> | ||||||||||||||||||
| <Sha>39aef81ec6cffa06da9964b46d4b9e3bf2fc9979</Sha> | ||||||||||||||||||
| <SourceBuild RepoName="sdk" ManagedOnly="true" /> | ||||||||||||||||||
| + <!-- Necessary for source-build. This allows the package to be retrieved from previously-source-build artifacts | ||||||||||||||||||
| + and flow in as dependencies of the packages produced by arcade. --> | ||||||||||||||||||
| + <Dependency Name="System.IO.Packaging" Version="4.5.0"> | ||||||||||||||||||
| + <Uri>https://github.com/dotnet/corefx</Uri> | ||||||||||||||||||
| + <Sha>30ab651fcb4354552bd4891619a0bdd81e0ebdbf</Sha> | ||||||||||||||||||
| + </Dependency> | ||||||||||||||||||
|
Comment on lines
+20
to
+23
Member
There was a problem hiding this comment.
Suggested change
|
||||||||||||||||||
| + <!-- Necessary for source-build. This allows the package to be retrieved from previously-source-build artifacts | ||||||||||||||||||
| + and flow in as dependencies of the packages produced by arcade. --> | ||||||||||||||||||
| + <Dependency Name="Microsoft.Extensions.DependencyModel" Version="6.0.0"> | ||||||||||||||||||
| + <Uri>https://github.com/dotnet/runtime</Uri> | ||||||||||||||||||
| + <Sha>8470979eb44c2218025515234d3e01138bd74afb</Sha> | ||||||||||||||||||
| </Dependency> | ||||||||||||||||||
|
Comment on lines
+26
to
+29
Member
There was a problem hiding this comment. This is outdated as well but I'm not sure what the version should be. |
||||||||||||||||||
| </ToolsetDependencies> | ||||||||||||||||||
| </Dependencies> | ||||||||||||||||||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This patch is no longer necessary either.