-
Notifications
You must be signed in to change notification settings - Fork 136
Add patches to fix Arcade prebuilts #1331
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.
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
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
37 changes: 0 additions & 37 deletions
37
patches/arcade/0004-Import-PackageVersions-props-if-exists.patch
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
26 changes: 26 additions & 0 deletions
26
patches/arcade/0014-Import-PackageVersions-props-if-exists-and-update-Co.patch
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,26 @@ | ||
| From 0280d8f6684cade2051962c5cdf31c275e752181 Mon Sep 17 00:00:00 2001 | ||
| From: dseefeld <[email protected]> | ||
| Date: Thu, 24 Oct 2019 13:00:54 +0000 | ||
| Subject: [PATCH] Import PackageVersions props if exists and update | ||
| CodeAnalysis version | ||
|
|
||
| --- | ||
| eng/Versions.props | 4 ++++ | ||
| 1 file changed, 4 insertions(+) | ||
|
|
||
| diff --git a/eng/Versions.props b/eng/Versions.props | ||
| index 0389531..a8a2a0c 100644 | ||
| --- a/eng/Versions.props | ||
| +++ b/eng/Versions.props | ||
| @@ -72,4 +72,8 @@ | ||
| <MicrosoftDotNetMaestroClientVersion>1.1.0-beta.19454.3</MicrosoftDotNetMaestroClientVersion> | ||
| <MicrosoftDotNetSwaggerGeneratorMSBuildVersion>1.0.0-beta.19459.10</MicrosoftDotNetSwaggerGeneratorMSBuildVersion> | ||
| </PropertyGroup> | ||
| + <Import Project="$(DotNetPackageVersionPropsPath)" Condition="'$(DotNetPackageVersionPropsPath)' != ''" /> | ||
| + <PropertyGroup> | ||
| + <MsbuildTaskMicrosoftCodeAnalysisCSharpVersion Condition="'$(DotNetBuildFromSource)' == 'true'">$(MicrosoftCodeAnalysisCSharpVersion)</MsbuildTaskMicrosoftCodeAnalysisCSharpVersion> | ||
| + </PropertyGroup> | ||
| </Project> | ||
| -- | ||
| 1.8.3.1 | ||
|
|
||
39 changes: 39 additions & 0 deletions
39
patches/arcade/0015-Use-SystemReflectionMetadata-from-package-flow.patch
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,39 @@ | ||
| From 171dc26fc5372ba42e6d0d55e1a4e91f2c4b4b2d Mon Sep 17 00:00:00 2001 | ||
| From: dseefeld <[email protected]> | ||
| Date: Thu, 24 Oct 2019 13:20:30 +0000 | ||
| Subject: [PATCH] Use SystemReflectionMetadata from package flow | ||
|
|
||
| --- | ||
| .../Microsoft.DotNet.CoreFxTesting.csproj | 2 +- | ||
| src/Microsoft.DotNet.GenFacades/Microsoft.DotNet.GenFacades.csproj | 2 +- | ||
| 2 files changed, 2 insertions(+), 2 deletions(-) | ||
|
|
||
| diff --git a/src/Microsoft.DotNet.CoreFxTesting/Microsoft.DotNet.CoreFxTesting.csproj b/src/Microsoft.DotNet.CoreFxTesting/Microsoft.DotNet.CoreFxTesting.csproj | ||
| index 694e338..6d7becb 100644 | ||
| --- a/src/Microsoft.DotNet.CoreFxTesting/Microsoft.DotNet.CoreFxTesting.csproj | ||
| +++ b/src/Microsoft.DotNet.CoreFxTesting/Microsoft.DotNet.CoreFxTesting.csproj | ||
| @@ -11,7 +11,7 @@ | ||
| <PackageReference Include="Microsoft.Build" Version="$(MicrosoftBuildVersion)" /> | ||
| <PackageReference Include="Microsoft.Build.Framework" Version="$(MicrosoftBuildFrameworkVersion)" /> | ||
| <PackageReference Include="Microsoft.Build.Utilities.Core" Version="$(MicrosoftBuildUtilitiesCoreVersion)" /> | ||
| - <PackageReference Include="System.Reflection.Metadata" Version="1.6.0" Condition="'$(TargetFramework)' == 'net472'" /> | ||
| + <PackageReference Include="System.Reflection.Metadata" Version="$(SystemReflectionMetadataVersion)" Condition="'$(TargetFramework)' == 'net472'" /> | ||
| <PackageReference Include="Microsoft.Extensions.DependencyModel" Version="$(MicrosoftExtensionsDependencyModelVersion)" /> | ||
| </ItemGroup> | ||
|
|
||
| diff --git a/src/Microsoft.DotNet.GenFacades/Microsoft.DotNet.GenFacades.csproj b/src/Microsoft.DotNet.GenFacades/Microsoft.DotNet.GenFacades.csproj | ||
| index 6678ac4..04b4d46 100644 | ||
| --- a/src/Microsoft.DotNet.GenFacades/Microsoft.DotNet.GenFacades.csproj | ||
| +++ b/src/Microsoft.DotNet.GenFacades/Microsoft.DotNet.GenFacades.csproj | ||
| @@ -14,7 +14,7 @@ | ||
| <PackageReference Include="Microsoft.Build.Tasks.Core" Version="$(MicrosoftBuildTasksCoreVersion)" Publish="false" /> | ||
| <!-- Microsoft.CodeAnalysis is also loaded by the msbuild. So this version should match the msbuild version of the assembly. --> | ||
| <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="$(MsbuildTaskMicrosoftCodeAnalysisCSharpVersion)" ExcludeAssets="analyzers" /> | ||
| - <PackageReference Include="System.Reflection.Metadata" Version="1.6.0" /> | ||
| + <PackageReference Include="System.Reflection.Metadata" Version="$(SystemReflectionMetadataVersion)" /> | ||
| </ItemGroup> | ||
|
|
||
| <!-- Required for compiling Microsoft.DotNet.GenFacades.ILRewriter --> | ||
| -- | ||
| 1.8.3.1 | ||
|
|
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,32 @@ | ||
| From 8f04243447640e483edb742616266187c8d46198 Mon Sep 17 00:00:00 2001 | ||
| From: dseefeld <[email protected]> | ||
| Date: Thu, 24 Oct 2019 13:36:06 +0000 | ||
| Subject: [PATCH] Fix version of NewtonsoftJson | ||
|
|
||
| --- | ||
| eng/Versions.props | 2 +- | ||
| 1 file changed, 1 insertion(+), 1 deletion(-) | ||
|
|
||
| diff --git a/eng/Versions.props b/eng/Versions.props | ||
| index a8a2a0c..e0bb462 100644 | ||
| --- a/eng/Versions.props | ||
| +++ b/eng/Versions.props | ||
| @@ -35,7 +35,6 @@ | ||
| <MoqVersion>4.8.3</MoqVersion> | ||
| <MonoOptionsVersion>5.3.0.1</MonoOptionsVersion> | ||
| <McMasterExtensionsCommandLineUtils>2.3.0</McMasterExtensionsCommandLineUtils> | ||
| - <NewtonsoftJsonVersion>9.0.1</NewtonsoftJsonVersion> | ||
| <MicrosoftBclJsonSourcesVersion>4.6.0-preview4.19202.2</MicrosoftBclJsonSourcesVersion> | ||
| <NuGetVersioningVersion>4.4.0</NuGetVersioningVersion> | ||
| <NuGetVersion>5.1.0</NuGetVersion> | ||
| @@ -74,6 +73,7 @@ | ||
| </PropertyGroup> | ||
| <Import Project="$(DotNetPackageVersionPropsPath)" Condition="'$(DotNetPackageVersionPropsPath)' != ''" /> | ||
| <PropertyGroup> | ||
| + <NewtonsoftJsonVersion>9.0.1</NewtonsoftJsonVersion> | ||
| <MsbuildTaskMicrosoftCodeAnalysisCSharpVersion Condition="'$(DotNetBuildFromSource)' == 'true'">$(MicrosoftCodeAnalysisCSharpVersion)</MsbuildTaskMicrosoftCodeAnalysisCSharpVersion> | ||
| </PropertyGroup> | ||
| </Project> | ||
| -- | ||
| 1.8.3.1 | ||
|
|
25 changes: 25 additions & 0 deletions
25
patches/arcade/0017-Update-SystemTextJson-version-from-Package-flow.patch
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,25 @@ | ||
| From 1d08bd0bfe32864d00f565e1d11cc0630d40c95c Mon Sep 17 00:00:00 2001 | ||
| From: dseefeld <[email protected]> | ||
| Date: Thu, 24 Oct 2019 14:27:00 +0000 | ||
| Subject: [PATCH] Update SystemTextJson version from Package flow | ||
|
|
||
| --- | ||
| .../src/Microsoft.DotNet.Build.Tasks.Packaging.csproj | 2 +- | ||
| 1 file changed, 1 insertion(+), 1 deletion(-) | ||
|
|
||
| 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 | ||
| index 22f5cde..5455c36 100644 | ||
| --- 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 | ||
| @@ -62,7 +62,7 @@ | ||
| <PackageReference Include="NuGet.Commands" Version="$(NuGetVersion)" /> | ||
| <PackageReference Include="NuGet.Packaging" Version="$(NuGetVersion)" /> | ||
| <PackageReference Include="NuGet.ProjectModel" Version="$(NuGetVersion)" /> | ||
| - <PackageReference Include="System.Text.Json" Version="4.6.0-preview7.19362.9" /> | ||
| + <PackageReference Include="System.Text.Json" Version="$(SystemTextJsonVersion)" /> | ||
| <PackageReference Include="System.Reflection.Metadata" Version="$(SystemReflectionMetadataVersion)" /> | ||
| <PackageReference Include="Microsoft.NETCore.Platforms" Version="$(MicrosoftNETCorePlatformsVersion)" /> | ||
| </ItemGroup> | ||
| -- | ||
| 1.8.3.1 | ||
|
|
33 changes: 33 additions & 0 deletions
33
patches/arcade/0018-Update-versions-of-some-packages.patch
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,33 @@ | ||
| From 30902906d4e1abbb27cd17808ed6509f2fbeed10 Mon Sep 17 00:00:00 2001 | ||
| From: dseefeld <[email protected]> | ||
| Date: Thu, 24 Oct 2019 16:10:07 +0000 | ||
| Subject: [PATCH] Update versions of some packages | ||
|
|
||
| --- | ||
| eng/Versions.props | 4 ++-- | ||
| 1 file changed, 2 insertions(+), 2 deletions(-) | ||
|
|
||
| diff --git a/eng/Versions.props b/eng/Versions.props | ||
| index e0bb462..29eb25b 100644 | ||
| --- a/eng/Versions.props | ||
| +++ b/eng/Versions.props | ||
| @@ -42,14 +42,14 @@ | ||
| <DotNetSleetLibVersion>2.2.139</DotNetSleetLibVersion> | ||
| <SwashbuckleAspNetCoreSwaggerVersion>3.0.0</SwashbuckleAspNetCoreSwaggerVersion> | ||
| <SystemBuffersVersion>4.5.0</SystemBuffersVersion> | ||
| - <SystemCollectionsImmutableVersion>1.3.1</SystemCollectionsImmutableVersion> | ||
| + <SystemCollectionsImmutableVersion>1.5.0</SystemCollectionsImmutableVersion> | ||
| <SystemDiagnosticsTraceSourceVersion>4.0.0</SystemDiagnosticsTraceSourceVersion> | ||
| <SystemIOCompressionVersion>4.3.0</SystemIOCompressionVersion> | ||
| <SystemIOPackagingVersion>4.5.0</SystemIOPackagingVersion> | ||
| <SystemIOFileSystemPrimitivesVersion>4.3.0</SystemIOFileSystemPrimitivesVersion> | ||
| <SystemMemoryVersion>4.5.1</SystemMemoryVersion> | ||
| <SystemNumericsVectorsVersion>4.4.0</SystemNumericsVectorsVersion> | ||
| - <SystemReflectionMetadataVersion>1.4.2</SystemReflectionMetadataVersion> | ||
| + <SystemReflectionMetadataVersion>1.6.0</SystemReflectionMetadataVersion> | ||
| <SystemRuntimeCompilerServicesUnsafeVersion>4.5.0</SystemRuntimeCompilerServicesUnsafeVersion> | ||
| <SystemTextEncodingsWebVersion>4.5.0</SystemTextEncodingsWebVersion> | ||
| <SystemThreadingTasksExtensionVersion>4.5.1</SystemThreadingTasksExtensionVersion> | ||
| -- | ||
| 1.8.3.1 | ||
|
|
Oops, something went wrong.
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.
Since we're already patching here I don't think this matters, but I've been doing these one-off properties here:
source-build/dir.props
Line 198 in 9dd007e