|
| 1 | +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 |
| 2 | +From: Matt Thalman < [email protected]> |
| 3 | +Date: Mon, 3 Apr 2023 08:14:22 -0500 |
| 4 | +Subject: [PATCH] Remove SB workarounds to enable PVP flow |
| 5 | + |
| 6 | +Backport: https://github.com/dotnet/arcade/pull/13009 |
| 7 | + |
| 8 | +--- |
| 9 | + .../Microsoft.DotNet.CodeAnalysis.csproj | 10 ---------- |
| 10 | + .../Microsoft.DotNet.GenFacades.csproj | 5 ----- |
| 11 | + 2 files changed, 15 deletions(-) |
| 12 | + |
| 13 | +diff --git a/src/Microsoft.DotNet.CodeAnalysis/Microsoft.DotNet.CodeAnalysis.csproj b/src/Microsoft.DotNet.CodeAnalysis/Microsoft.DotNet.CodeAnalysis.csproj |
| 14 | +index d1ac5ccb..5cdfd539 100644 |
| 15 | +--- a/src/Microsoft.DotNet.CodeAnalysis/Microsoft.DotNet.CodeAnalysis.csproj |
| 16 | ++++ b/src/Microsoft.DotNet.CodeAnalysis/Microsoft.DotNet.CodeAnalysis.csproj |
| 17 | +@@ -12,16 +12,6 @@ |
| 18 | + <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="$(MicrosoftCodeAnalysisCSharpVersion)" ExcludeAssets="analyzers" /> |
| 19 | + </ItemGroup> |
| 20 | + |
| 21 | +- <!-- |
| 22 | +- In the source-build tarball build, Microsoft.CodeAnalysis.CSharp has dependencies on old |
| 23 | +- versions of these packages due to repo build order. Override to lift them to the versions passed |
| 24 | +- in via DotNetPackageVersionPropsPath. |
| 25 | +- --> |
| 26 | +- <ItemGroup Condition="'$(DotNetBuildFromSource)' == 'true'"> |
| 27 | +- <PackageReference Include="System.Collections.Immutable" Version="$(SystemCollectionsImmutableVersion)" /> |
| 28 | +- <PackageReference Include="System.Reflection.Metadata" Version="$(SystemReflectionMetadataVersion)" /> |
| 29 | +- </ItemGroup> |
| 30 | +- |
| 31 | + <ItemGroup> |
| 32 | + <Content Include="build/*.*" PackagePath="build" /> |
| 33 | + <Content Include="content/*.*" PackagePath="content" /> |
| 34 | +diff --git a/src/Microsoft.DotNet.GenFacades/Microsoft.DotNet.GenFacades.csproj b/src/Microsoft.DotNet.GenFacades/Microsoft.DotNet.GenFacades.csproj |
| 35 | +index d73f6abd..20c0c33b 100644 |
| 36 | +--- a/src/Microsoft.DotNet.GenFacades/Microsoft.DotNet.GenFacades.csproj |
| 37 | ++++ b/src/Microsoft.DotNet.GenFacades/Microsoft.DotNet.GenFacades.csproj |
| 38 | +@@ -14,11 +14,6 @@ |
| 39 | + <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="$(MsbuildTaskMicrosoftCodeAnalysisCSharpVersion)" ExcludeAssets="analyzers" Publish="false" /> |
| 40 | + </ItemGroup> |
| 41 | + |
| 42 | +- <!-- 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. --> |
| 43 | +- <ItemGroup Condition="'$(DotNetBuildOffline)' == 'true'"> |
| 44 | +- <PackageReference Include="System.Reflection.Metadata" Version="$(SystemReflectionMetadataVersion)" /> |
| 45 | +- </ItemGroup> |
| 46 | +- |
| 47 | + <ItemGroup Condition="'$(TargetFramework)' == 'net472'"> |
| 48 | + <Compile Include="..\Common\Internal\AssemblyResolver.cs" /> |
| 49 | + <Compile Include="..\Common\Internal\BuildTask.Desktop.cs" /> |
0 commit comments