Skip to content

Commit 07303a5

Browse files
dseefelddseefeld
authored
Add patches to fix Arcade prebuilts (#1331)
* Add patches to fix Arcade prebuilts * A couple more patch changes * Update online baseline * One more osx specific baseline update
1 parent 9d0ba1c commit 07303a5

8 files changed

+158
-219
lines changed

‎patches/arcade/0004-Import-PackageVersions-props-if-exists.patch

Lines changed: 0 additions & 37 deletions
This file was deleted.

‎patches/arcade/0008-Use-ref-version-of-CodeAnalysis.patch

Lines changed: 0 additions & 24 deletions
This file was deleted.

‎patches/arcade/0014-Import-PackageVersions-props-if-exists-and-update-Co.patch

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
From 0280d8f6684cade2051962c5cdf31c275e752181 Mon Sep 17 00:00:00 2001
2+
From: dseefeld <[email protected]>
3+
Date: Thu, 24 Oct 2019 13:00:54 +0000
4+
Subject: [PATCH] Import PackageVersions props if exists and update
5+
CodeAnalysis version
6+
7+
---
8+
eng/Versions.props | 4 ++++
9+
1 file changed, 4 insertions(+)
10+
11+
diff --git a/eng/Versions.props b/eng/Versions.props
12+
index 0389531..a8a2a0c 100644
13+
--- a/eng/Versions.props
14+
+++ b/eng/Versions.props
15+
@@ -72,4 +72,8 @@
16+
<MicrosoftDotNetMaestroClientVersion>1.1.0-beta.19454.3</MicrosoftDotNetMaestroClientVersion>
17+
<MicrosoftDotNetSwaggerGeneratorMSBuildVersion>1.0.0-beta.19459.10</MicrosoftDotNetSwaggerGeneratorMSBuildVersion>
18+
</PropertyGroup>
19+
+ <Import Project="$(DotNetPackageVersionPropsPath)" Condition="'$(DotNetPackageVersionPropsPath)' != ''" />
20+
+ <PropertyGroup>
21+
+ <MsbuildTaskMicrosoftCodeAnalysisCSharpVersion Condition="'$(DotNetBuildFromSource)' == 'true'">$(MicrosoftCodeAnalysisCSharpVersion)</MsbuildTaskMicrosoftCodeAnalysisCSharpVersion>
22+
+ </PropertyGroup>
23+
</Project>
24+
--
25+
1.8.3.1
26+

‎patches/arcade/0015-Use-SystemReflectionMetadata-from-package-flow.patch

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
From 171dc26fc5372ba42e6d0d55e1a4e91f2c4b4b2d Mon Sep 17 00:00:00 2001
2+
From: dseefeld <[email protected]>
3+
Date: Thu, 24 Oct 2019 13:20:30 +0000
4+
Subject: [PATCH] Use SystemReflectionMetadata from package flow
5+
6+
---
7+
.../Microsoft.DotNet.CoreFxTesting.csproj | 2 +-
8+
src/Microsoft.DotNet.GenFacades/Microsoft.DotNet.GenFacades.csproj | 2 +-
9+
2 files changed, 2 insertions(+), 2 deletions(-)
10+
11+
diff --git a/src/Microsoft.DotNet.CoreFxTesting/Microsoft.DotNet.CoreFxTesting.csproj b/src/Microsoft.DotNet.CoreFxTesting/Microsoft.DotNet.CoreFxTesting.csproj
12+
index 694e338..6d7becb 100644
13+
--- a/src/Microsoft.DotNet.CoreFxTesting/Microsoft.DotNet.CoreFxTesting.csproj
14+
+++ b/src/Microsoft.DotNet.CoreFxTesting/Microsoft.DotNet.CoreFxTesting.csproj
15+
@@ -11,7 +11,7 @@
16+
<PackageReference Include="Microsoft.Build" Version="$(MicrosoftBuildVersion)" />
17+
<PackageReference Include="Microsoft.Build.Framework" Version="$(MicrosoftBuildFrameworkVersion)" />
18+
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="$(MicrosoftBuildUtilitiesCoreVersion)" />
19+
- <PackageReference Include="System.Reflection.Metadata" Version="1.6.0" Condition="'$(TargetFramework)' == 'net472'" />
20+
+ <PackageReference Include="System.Reflection.Metadata" Version="$(SystemReflectionMetadataVersion)" Condition="'$(TargetFramework)' == 'net472'" />
21+
<PackageReference Include="Microsoft.Extensions.DependencyModel" Version="$(MicrosoftExtensionsDependencyModelVersion)" />
22+
</ItemGroup>
23+
24+
diff --git a/src/Microsoft.DotNet.GenFacades/Microsoft.DotNet.GenFacades.csproj b/src/Microsoft.DotNet.GenFacades/Microsoft.DotNet.GenFacades.csproj
25+
index 6678ac4..04b4d46 100644
26+
--- a/src/Microsoft.DotNet.GenFacades/Microsoft.DotNet.GenFacades.csproj
27+
+++ b/src/Microsoft.DotNet.GenFacades/Microsoft.DotNet.GenFacades.csproj
28+
@@ -14,7 +14,7 @@
29+
<PackageReference Include="Microsoft.Build.Tasks.Core" Version="$(MicrosoftBuildTasksCoreVersion)" Publish="false" />
30+
<!-- Microsoft.CodeAnalysis is also loaded by the msbuild. So this version should match the msbuild version of the assembly. -->
31+
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="$(MsbuildTaskMicrosoftCodeAnalysisCSharpVersion)" ExcludeAssets="analyzers" />
32+
- <PackageReference Include="System.Reflection.Metadata" Version="1.6.0" />
33+
+ <PackageReference Include="System.Reflection.Metadata" Version="$(SystemReflectionMetadataVersion)" />
34+
</ItemGroup>
35+
36+
<!-- Required for compiling Microsoft.DotNet.GenFacades.ILRewriter -->
37+
--
38+
1.8.3.1
39+

‎patches/arcade/0016-Fix-version-of-NewtonsoftJson.patch

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
From 8f04243447640e483edb742616266187c8d46198 Mon Sep 17 00:00:00 2001
2+
From: dseefeld <[email protected]>
3+
Date: Thu, 24 Oct 2019 13:36:06 +0000
4+
Subject: [PATCH] Fix version of NewtonsoftJson
5+
6+
---
7+
eng/Versions.props | 2 +-
8+
1 file changed, 1 insertion(+), 1 deletion(-)
9+
10+
diff --git a/eng/Versions.props b/eng/Versions.props
11+
index a8a2a0c..e0bb462 100644
12+
--- a/eng/Versions.props
13+
+++ b/eng/Versions.props
14+
@@ -35,7 +35,6 @@
15+
<MoqVersion>4.8.3</MoqVersion>
16+
<MonoOptionsVersion>5.3.0.1</MonoOptionsVersion>
17+
<McMasterExtensionsCommandLineUtils>2.3.0</McMasterExtensionsCommandLineUtils>
18+
- <NewtonsoftJsonVersion>9.0.1</NewtonsoftJsonVersion>
19+
<MicrosoftBclJsonSourcesVersion>4.6.0-preview4.19202.2</MicrosoftBclJsonSourcesVersion>
20+
<NuGetVersioningVersion>4.4.0</NuGetVersioningVersion>
21+
<NuGetVersion>5.1.0</NuGetVersion>
22+
@@ -74,6 +73,7 @@
23+
</PropertyGroup>
24+
<Import Project="$(DotNetPackageVersionPropsPath)" Condition="'$(DotNetPackageVersionPropsPath)' != ''" />
25+
<PropertyGroup>
26+
+ <NewtonsoftJsonVersion>9.0.1</NewtonsoftJsonVersion>
27+
<MsbuildTaskMicrosoftCodeAnalysisCSharpVersion Condition="'$(DotNetBuildFromSource)' == 'true'">$(MicrosoftCodeAnalysisCSharpVersion)</MsbuildTaskMicrosoftCodeAnalysisCSharpVersion>
28+
</PropertyGroup>
29+
</Project>
30+
--
31+
1.8.3.1
32+

‎patches/arcade/0017-Update-SystemTextJson-version-from-Package-flow.patch

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
From 1d08bd0bfe32864d00f565e1d11cc0630d40c95c Mon Sep 17 00:00:00 2001
2+
From: dseefeld <[email protected]>
3+
Date: Thu, 24 Oct 2019 14:27:00 +0000
4+
Subject: [PATCH] Update SystemTextJson version from Package flow
5+
6+
---
7+
.../src/Microsoft.DotNet.Build.Tasks.Packaging.csproj | 2 +-
8+
1 file changed, 1 insertion(+), 1 deletion(-)
9+
10+
diff --git a/src/Microsoft.DotNet.Build.Tasks.Packaging/src/Microsoft.DotNet.Build.Tasks.Packaging.csproj b/src/Microsoft.DotNet.Build.Tasks.Packaging/src/Microsoft.DotNet.Build.Tasks.Packaging.csproj
11+
index 22f5cde..5455c36 100644
12+
--- a/src/Microsoft.DotNet.Build.Tasks.Packaging/src/Microsoft.DotNet.Build.Tasks.Packaging.csproj
13+
+++ b/src/Microsoft.DotNet.Build.Tasks.Packaging/src/Microsoft.DotNet.Build.Tasks.Packaging.csproj
14+
@@ -62,7 +62,7 @@
15+
<PackageReference Include="NuGet.Commands" Version="$(NuGetVersion)" />
16+
<PackageReference Include="NuGet.Packaging" Version="$(NuGetVersion)" />
17+
<PackageReference Include="NuGet.ProjectModel" Version="$(NuGetVersion)" />
18+
- <PackageReference Include="System.Text.Json" Version="4.6.0-preview7.19362.9" />
19+
+ <PackageReference Include="System.Text.Json" Version="$(SystemTextJsonVersion)" />
20+
<PackageReference Include="System.Reflection.Metadata" Version="$(SystemReflectionMetadataVersion)" />
21+
<PackageReference Include="Microsoft.NETCore.Platforms" Version="$(MicrosoftNETCorePlatformsVersion)" />
22+
</ItemGroup>
23+
--
24+
1.8.3.1
25+

‎patches/arcade/0018-Update-versions-of-some-packages.patch

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
From 30902906d4e1abbb27cd17808ed6509f2fbeed10 Mon Sep 17 00:00:00 2001
2+
From: dseefeld <[email protected]>
3+
Date: Thu, 24 Oct 2019 16:10:07 +0000
4+
Subject: [PATCH] Update versions of some packages
5+
6+
---
7+
eng/Versions.props | 4 ++--
8+
1 file changed, 2 insertions(+), 2 deletions(-)
9+
10+
diff --git a/eng/Versions.props b/eng/Versions.props
11+
index e0bb462..29eb25b 100644
12+
--- a/eng/Versions.props
13+
+++ b/eng/Versions.props
14+
@@ -42,14 +42,14 @@
15+
<DotNetSleetLibVersion>2.2.139</DotNetSleetLibVersion>
16+
<SwashbuckleAspNetCoreSwaggerVersion>3.0.0</SwashbuckleAspNetCoreSwaggerVersion>
17+
<SystemBuffersVersion>4.5.0</SystemBuffersVersion>
18+
- <SystemCollectionsImmutableVersion>1.3.1</SystemCollectionsImmutableVersion>
19+
+ <SystemCollectionsImmutableVersion>1.5.0</SystemCollectionsImmutableVersion>
20+
<SystemDiagnosticsTraceSourceVersion>4.0.0</SystemDiagnosticsTraceSourceVersion>
21+
<SystemIOCompressionVersion>4.3.0</SystemIOCompressionVersion>
22+
<SystemIOPackagingVersion>4.5.0</SystemIOPackagingVersion>
23+
<SystemIOFileSystemPrimitivesVersion>4.3.0</SystemIOFileSystemPrimitivesVersion>
24+
<SystemMemoryVersion>4.5.1</SystemMemoryVersion>
25+
<SystemNumericsVectorsVersion>4.4.0</SystemNumericsVectorsVersion>
26+
- <SystemReflectionMetadataVersion>1.4.2</SystemReflectionMetadataVersion>
27+
+ <SystemReflectionMetadataVersion>1.6.0</SystemReflectionMetadataVersion>
28+
<SystemRuntimeCompilerServicesUnsafeVersion>4.5.0</SystemRuntimeCompilerServicesUnsafeVersion>
29+
<SystemTextEncodingsWebVersion>4.5.0</SystemTextEncodingsWebVersion>
30+
<SystemThreadingTasksExtensionVersion>4.5.1</SystemThreadingTasksExtensionVersion>
31+
--
32+
1.8.3.1
33+

0 commit comments

Comments
 (0)