mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Try to resolve source-build patch conflicts

Browse source
This commit is contained in:
Jason Zhai 2023-07-12 01:42:25 -07:00
parent ba7651ffbc
commit 7381bec755
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/SourceBuild/tarball/patches/format/0002-Add-explicit-System.Text.Json-dependency.patch
View file

@ -32,7 +32,7 @@ index cdfa5f5e..86f02b44 100644
+++ b/eng/Version.Details.xml +++ b/eng/Version.Details.xml
@@ -13,6 +13,10 @@ @@ -13,6 +13,10 @@
<Uri>https://github.com/dotnet/command-line-api</Uri> <Uri>https://github.com/dotnet/command-line-api</Uri>
<Sha>e5861a73ad3f08c820319b56b302387a8832ed59</Sha> <Sha>c776cd4e906b669b9cce1017fee7d0ba9845d163</Sha>
</Dependency> </Dependency>
+ <Dependency Name="System.Text.Json" Version="6.0.8"> + <Dependency Name="System.Text.Json" Version="6.0.8">
+ <Uri>https://github.com/dotnet/runtime</Uri> + <Uri>https://github.com/dotnet/runtime</Uri>
@ -40,15 +40,15 @@ index cdfa5f5e..86f02b44 100644
+ </Dependency> + </Dependency>
</ProductDependencies> </ProductDependencies>
<ToolsetDependencies> <ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.22466.3"> <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.23254.2">
diff --git a/eng/Versions.props b/eng/Versions.props diff --git a/eng/Versions.props b/eng/Versions.props
index 27582078..bccaf176 100644 index 27582078..bccaf176 100644
--- a/eng/Versions.props --- a/eng/Versions.props
+++ b/eng/Versions.props +++ b/eng/Versions.props
@@ -20,6 +20,8 @@ @@ -20,6 +20,8 @@
<!-- Dependencies from https://github.com/dotnet/command-line-api --> <!-- Dependencies from https://github.com/dotnet/command-line-api -->
<SystemCommandLineVersion>2.0.0-beta4.22430.1</SystemCommandLineVersion> <SystemCommandLineVersion>2.0.0-beta4.22504.1</SystemCommandLineVersion>
<SystemCommandLineRenderingVersion>0.4.0-alpha.22430.1</SystemCommandLineRenderingVersion> <SystemCommandLineRenderingVersion>0.4.0-alpha.22504.1</SystemCommandLineRenderingVersion>
+ <!-- Dependencies from https://github.com/dotnet/runtime --> + <!-- Dependencies from https://github.com/dotnet/runtime -->
+ <SystemTextJsonVersion>6.0.8</SystemTextJsonVersion> + <SystemTextJsonVersion>6.0.8</SystemTextJsonVersion>
</PropertyGroup> </PropertyGroup>