Skip to content

Commit 2d5b506

Browse files
adaggarwaladaggarwal
authored
[March 3.1 update] (#1488)
* versionDetails: manual SHA1 updates * coreclr: patch update * prebuilt: online baseline version changes * 3.1.3 available: manual updates * patch-rework: aspnetcore * baseline: version update for online build && prodconfeed: update to 3.1.3 * corefx version sync with VSU * aspnetcore-patch: update version number patch * update corefx version * prebuilt production: update online baseline * prebuilt removal - utilize the latest source-built-artifacts version containing the current set of newly introduced prebuilts * update online baseline for prebuilts that could be included via previously source-built artifacts * update arcade sdk * revert global json arcade sdk version * arcade:rebase patches * arcade: port patch to not update manifest data icon * arcade-update: update baseline (version change - ms.netcoreappref.301) * update smoke tests nuget config * remove unneeded patches causing erros in coresetup * disable poison check * toolset: add patch to remove dependency flow feeds * turn off warnaserror in sdk * bootstrap: turn off warnAsError for vstest,fsharp,cli * revert warnaserror setting in fsharp * revert warnaserror setting in cli * remove dependency flow feeds from sourcebuild * corefx: patch: remove unneeded feeds * patch:aspnetcore: remove temp feeds * patch: extensions: remove temp feeds * patch: tooling: remove temp feeds * revert coresdk patch to onnly exclude corefx feed
1 parent 8ffc4e5 commit 2d5b506

File tree

86 files changed

+586
-373
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

86 files changed

+586
-373
lines changed

‎.vsts.pipelines/builds/matrix.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
parameters:
1515
job: centos71
1616
imageName: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-3e800f1-20190501005343
17-
reportPrebuiltLeaks: true
17+
reportPrebuiltLeaks: false
1818
matrix:
1919
Production: { generatePrebuiltBurndown: true, runUnitTests: true }
2020
Online: { type: Online }

‎NuGet.config

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,6 @@
22
<configuration>
33
<packageSources>
44
<clear />
5-
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
6-
<add key="darc-pub-microsoft-msbuild-e901037-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-microsoft-msbuild-e901037f-3/nuget/v3/index.json" />
7-
<add key="darc-pub-dotnet-standard-a5b5f2e" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-standard-a5b5f2e1/nuget/v3/index.json" />
8-
<add key="darc-pub-dotnet-aspnetcore-tooling-2dab42e" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-aspnetcore-tooling-2dab42e1/nuget/v3/index.json" />
9-
<add key="darc-pub-dotnet-aspnetcore-c3acdca-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-aspnetcore-c3acdcac-2/nuget/v3/index.json" />
10-
<add key="darc-pub-aspnet-Extensions-1286a6f" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-aspnet-Extensions-1286a6ff/nuget/v3/index.json" />
11-
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
125
<add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" />
136
<add key="nuget-build" value="https://dotnet.myget.org/F/nuget-build/api/v3/index.json" />
147
<add key="arcade" value="https://dotnetfeed.blob.core.windows.net/dotnet-tools-internal/index.json" />

‎ProdConFeed.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
https://pkgs.dev.azure.com/dnceng/public/_packaging/3.1.102-servicing-014865/nuget/v3/index.json
1+
https://pkgs.dev.azure.com/dnceng/public/_packaging/3.1.103-servicing-014936/nuget/v3/index.json

‎eng/Version.Details.xml

Lines changed: 37 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
33
<ToolsetDependencies>
4-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19568.1">
4+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.20113.5">
55
<Uri>https://github.com/dotnet/arcade</Uri>
6-
<Sha>ce459ae07c3d7a1e68251268855e0bc7b3d97f75</Sha>
6+
<Sha>15f00efd583eab4372b2e9ca25bd80ace5b119ad</Sha>
77
</Dependency>
88
<Dependency Name="Private.SourceBuild.ReferencePackages" Version="1.0.0-beta.20107.1">
99
<Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
@@ -27,52 +27,52 @@
2727
<Sha>1127689f262d52ea8ff68ef03d706fa62b3b40a1</Sha>
2828
<RepoName>linker</RepoName>
2929
</Dependency>
30-
<Dependency Name="Microsoft.NETCore.Runtime.CoreCLR" Version="3.1.2-servicing.20066.2" CoherentParentDependency="Microsoft.Private.CoreFx.NETCoreApp">
30+
<Dependency Name="Microsoft.NETCore.Runtime.CoreCLR" Version="3.1.3-servicing.20118.3" CoherentParentDependency="Microsoft.Private.CoreFx.NETCoreApp">
3131
<Uri>https://github.com/dotnet/coreclr</Uri>
32-
<Sha>fd22fd600a2526a7c58536da0e80325eb710d7f1</Sha>
32+
<Sha>c5d3d752260383fbed72ba2b4d86d82fea673c76</Sha>
3333
<RepoName>coreclr</RepoName>
3434
</Dependency>
35-
<Dependency Name="Microsoft.NETCore.Runtime.CoreCLR" Version="3.1.2-servicing.20066.2" CoherentParentDependency="Microsoft.Private.CoreFx.NETCoreApp">
35+
<Dependency Name="Microsoft.NETCore.Runtime.CoreCLR" Version="3.1.3-servicing.20118.3" CoherentParentDependency="Microsoft.Private.CoreFx.NETCoreApp">
3636
<Uri>https://github.com/dotnet/coreclr</Uri>
37-
<Sha>fd22fd600a2526a7c58536da0e80325eb710d7f1</Sha>
37+
<Sha>c5d3d752260383fbed72ba2b4d86d82fea673c76</Sha>
3838
<RepoName>coreclr-portable</RepoName>
3939
</Dependency>
4040
<Dependency Name="NETStandard.Library" Version="2.1.0" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
4141
<Uri>https://github.com/dotnet/standard</Uri>
4242
<Sha>a5b5f2e1e369972c8ff1e2183979fab6099f52ef</Sha>
4343
</Dependency>
44-
<Dependency Name="Microsoft.Private.CoreFx.NETCoreApp" Version="4.7.0-servicing.20067.2" CoherentParentDependency="Microsoft.NETCore.App">
44+
<Dependency Name="Microsoft.Private.CoreFx.NETCoreApp" Version="4.7.0-servicing.20120.1" CoherentParentDependency="Microsoft.NETCore.App">
4545
<Uri>https://github.com/dotnet/corefx</Uri>
46-
<Sha>e946cebe43a510e8c6476bbc8185d1445df33a1a</Sha>
46+
<Sha>8a3ffed558ddf943c1efa87d693227722d6af094</Sha>
4747
<RepoName>corefx</RepoName>
4848
</Dependency>
49-
<Dependency Name="Microsoft.Private.CoreFx.NETCoreApp" Version="4.7.0-servicing.20067.2" CoherentParentDependency="Microsoft.NETCore.App">
49+
<Dependency Name="Microsoft.Private.CoreFx.NETCoreApp" Version="4.7.0-servicing.20120.1" CoherentParentDependency="Microsoft.NETCore.App">
5050
<Uri>https://github.com/dotnet/corefx</Uri>
51-
<Sha>e946cebe43a510e8c6476bbc8185d1445df33a1a</Sha>
51+
<Sha>8a3ffed558ddf943c1efa87d693227722d6af094</Sha>
5252
<RepoName>corefx-portable</RepoName>
5353
</Dependency>
54-
<Dependency Name="Microsoft.NETCore.App" Version="3.1.2-servicing.20067.4" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
54+
<Dependency Name="Microsoft.NETCore.App" Version="3.1.3-servicing.20128.1" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
5555
<Uri>https://github.com/dotnet/core-setup</Uri>
56-
<Sha>916b5cba268e1e1e803243004f4276cf40b2dda8</Sha>
56+
<Sha>4a9f85e9f89d7f686fef2ae2109d876b1e2eed2a</Sha>
5757
<RepoName>core-setup</RepoName>
5858
</Dependency>
59-
<Dependency Name="Microsoft.NETCore.App" Version="3.1.2-servicing.20067.4" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
59+
<Dependency Name="Microsoft.NETCore.App" Version="3.1.3-servicing.20128.1" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
6060
<Uri>https://github.com/dotnet/core-setup</Uri>
61-
<Sha>916b5cba268e1e1e803243004f4276cf40b2dda8</Sha>
61+
<Sha>4a9f85e9f89d7f686fef2ae2109d876b1e2eed2a</Sha>
6262
<RepoName>core-setup-portable</RepoName>
6363
</Dependency>
64-
<Dependency Name="Microsoft.AspNetCore.Mvc.Razor.Extensions" Version="3.1.2" CoherentParentDependency="Microsoft.AspNetCore.App.Ref">
65-
<Uri>https://github.com/dotnet/AspNetCore-Tooling</Uri>
66-
<Sha>2dab42e151ea8020a75cdaaa8c46bf5d9093b8c0</Sha>
64+
<Dependency Name="Microsoft.AspNetCore.Mvc.Razor.Extensions" Version="3.1.3" CoherentParentDependency="Microsoft.AspNetCore.App.Ref">
65+
<Uri>https://github.com/dotnet/aspnetcore-tooling</Uri>
66+
<Sha>5ecfad7e0515ee580f7e1b51d1558fc2a1d27ee5</Sha>
6767
<RepoName>aspnetcore-tooling</RepoName>
6868
</Dependency>
69-
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="3.1.2" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
69+
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="3.1.3" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
7070
<Uri>https://github.com/dotnet/templating</Uri>
71-
<Sha>247f60e9e34a03ed99e855eb1ea0c20931a968db</Sha>
71+
<Sha>46091435536c53242905ab4e991bdc0bac153e64</Sha>
7272
</Dependency>
73-
<Dependency Name="Microsoft.NETCore.Compilers" Version="3.4.1-beta4-19614-01" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
73+
<Dependency Name="Microsoft.NETCore.Compilers" Version="3.4.1-beta4-20127-10" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
7474
<Uri>https://github.com/dotnet/roslyn</Uri>
75-
<Sha>165046097562cfe65b09c2e9a9d8f7cd88526f2c</Sha>
75+
<Sha>d8180a5ecafb92adcfbfe8cf9199eb23be1a1ccf</Sha>
7676
</Dependency>
7777
<Dependency Name="Microsoft.Build" Version="16.4.0" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
7878
<Uri>https://github.com/microsoft/msbuild</Uri>
@@ -83,14 +83,14 @@
8383
<Sha>6f8eb3a2e1db6b458451b9cfd2a4f5557769b041</Sha>
8484
<RepoName>nuget-client</RepoName>
8585
</Dependency>
86-
<Dependency Name="Microsoft.Extensions.Logging" Version="3.1.2" CoherentParentDependency="Microsoft.AspNetCore.Mvc.Razor.Extensions">
87-
<Uri>https://github.com/dotnet/Extensions</Uri>
88-
<Sha>1286a6ff55e300352dabeb6d778c9fcdd258bd08</Sha>
86+
<Dependency Name="Microsoft.Extensions.Logging" Version="3.1.3" CoherentParentDependency="Microsoft.AspNetCore.Mvc.Razor.Extensions">
87+
<Uri>https://github.com/dotnet/extensions</Uri>
88+
<Sha>7d9baaf617741d775578c8018729ac5b75734c69</Sha>
8989
<RepoName>aspnet-extensions</RepoName>
9090
</Dependency>
91-
<Dependency Name="Microsoft.NET.Sdk" Version="3.1.102-servicing.20068.5" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
91+
<Dependency Name="Microsoft.NET.Sdk" Version="3.1.103-servicing.20128.3" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
9292
<Uri>https://github.com/dotnet/sdk</Uri>
93-
<Sha>90a093bbbe2c46ef19e301d717bed3cfaa56abb3</Sha>
93+
<Sha>ab04d19191b70ce82adc3830fdea05eec952505f</Sha>
9494
<RepoName>sdk</RepoName>
9595
</Dependency>
9696
<Dependency Name="Microsoft.DotNet.Cli.CommandLine" Version="1.0.0-preview.19208.1" CoherentParentDependency="Microsoft.DotNet.Cli.Runtime">
@@ -108,36 +108,36 @@
108108
<Uri>https://github.com/dotnet/xliff-tasks</Uri>
109109
<Sha>173ee3bd61c9549557eefa3cfb718bdef157cb87</Sha>
110110
</Dependency>
111-
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="3.1.2" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
112-
<Uri>https://github.com/dotnet/AspNetCore</Uri>
113-
<Sha>c3acdcac86dad91c3d3fbc3b93ecc6b7ba494bdc</Sha>
111+
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="3.1.3" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
112+
<Uri>https://github.com/dotnet/aspnetcore</Uri>
113+
<Sha>64a7f37e8afb060f3dbf8a679e1f7112a4558562</Sha>
114114
<RepoName>aspnetcore</RepoName>
115115
</Dependency>
116-
<Dependency Name="Microsoft.DotNet.Cli.Runtime" Version="3.1.102-servicing.20069.1" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
116+
<Dependency Name="Microsoft.DotNet.Cli.Runtime" Version="3.1.103-servicing.20152.1" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
117117
<Uri>https://github.com/dotnet/cli</Uri>
118-
<Sha>32fddd23b1e53272472f6feb27f5e12a445b7236</Sha>
118+
<Sha>8f624d0138a176b89b415c37d7d3285a940d1780</Sha>
119119
<RepoName>cli</RepoName>
120120
</Dependency>
121121
<Dependency Name="Microsoft.FSharp.Compiler" Version="10.7.0-beta.19610.6" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
122122
<Uri>https://github.com/dotnet/fsharp</Uri>
123123
<Sha>dc86ab5d2c46e9a7c49290e7e2270ab1eeb0c61e</Sha>
124124
</Dependency>
125-
<Dependency Name="Microsoft.NET.Sdk.Web" Version="3.1.102-servicing.20068.3" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
125+
<Dependency Name="Microsoft.NET.Sdk.Web" Version="3.1.103-servicing.20152.1" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
126126
<Uri>https://github.com/aspnet/websdk</Uri>
127-
<Sha>589ed451f2bcb51d7f47a37ebf4e3d501979174c</Sha>
127+
<Sha>699b7bad4d82e7f36a8def94c1718cb9f352eae1</Sha>
128128
</Dependency>
129129
<Dependency Name="Microsoft.TestPlatform.Build" Version="16.3.0" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
130130
<Uri>https://github.com/microsoft/vstest</Uri>
131131
<Sha>55e7e45431c9c05656c999b902686e7402664573</Sha>
132132
</Dependency>
133-
<Dependency Name="Microsoft.Dotnet.Toolset.Internal" Version="3.1.102-servicing.20070.8" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
133+
<Dependency Name="Microsoft.Dotnet.Toolset.Internal" Version="3.1.103-servicing.20152.3" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
134134
<Uri>https://github.com/dotnet/toolset</Uri>
135-
<Sha>a46d93e5e100f9046cb589b5d4ba70bde41f3480</Sha>
135+
<Sha>0e71a8b3f024bbebf7bc7506ac3fbb8c60c55c1e</Sha>
136136
<RepoName>toolset</RepoName>
137137
</Dependency>
138-
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="1.0.0-preview.20080.8">
138+
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="1.0.0-preview.20152.8">
139139
<Uri>https://github.com/dotnet/core-sdk</Uri>
140-
<Sha>573d158fea168b51e0f9e628d08c9d3ca8a40ef8</Sha>
140+
<Sha>abf73fdb91629e10df642815218ba5522fd13b54</Sha>
141141
<RepoName>core-sdk</RepoName>
142142
</Dependency>
143143
<!-- external dependencies, not handled by Maestro/Arcade -->

‎eng/Versions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@
88
<!-- Production Dependencies -->
99
<PropertyGroup>
1010
<PrivateSourceBuildReferencePackagesPackageVersion>1.0.0-beta.20107.1</PrivateSourceBuildReferencePackagesPackageVersion>
11-
<PrivateSourceBuiltArtifactsPackageVersion>0.1.0-3.1.100-preview3.dev.19571.3</PrivateSourceBuiltArtifactsPackageVersion>
11+
<PrivateSourceBuiltArtifactsPackageVersion>0.1.0-3.1.101</PrivateSourceBuiltArtifactsPackageVersion>
1212
</PropertyGroup>
1313
</Project>

‎global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"tools": {
3-
"dotnet": "3.1.100-preview1-014459"
3+
"dotnet": "3.1.102"
44
},
55
"msbuild-sdks": {
66
"Microsoft.Build.CentralPackageVersions": "2.0.1",

‎patches/arcade/0001-Enable-sourcelink-in-sourcebuild.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
From fd9f51181005127671d37fc4d8c48770ec791c68 Mon Sep 17 00:00:00 2001
1+
From 0c5f1d4096d7ecba330f2bde130d98ea51a1fb55 Mon Sep 17 00:00:00 2001
22
From: Chris Rummel <crummel@microsoft.com>
33
Date: Wed, 7 Aug 2019 19:23:07 -0500
4-
Subject: [PATCH 01/13] Enable sourcelink in sourcebuild.
4+
Subject: [PATCH 01/14] Enable sourcelink in sourcebuild.
55

66
---
77
.../tools/RepositoryInfo.targets | 14 +-------------
@@ -37,5 +37,5 @@ index 550ad298..8d31d833 100644
3737
<SourceRoot Include="$(RepoRoot)" />
3838
</ItemGroup>
3939
--
40-
2.18.0
40+
2.21.0
4141

‎patches/arcade/0002-Do-not-build-.NET-Fx-binaries-in-source-build.patch

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
From 51a98744d9ea10d42a04dabfbac465e1f69a16ab Mon Sep 17 00:00:00 2001
1+
From 9680ebee4f350299cf4a37d1fccca4e0852c40fb Mon Sep 17 00:00:00 2001
22
From: Nikola Milosavljevic <nikolam@microsoft.com>
33
Date: Fri, 6 Sep 2019 18:18:33 +0000
4-
Subject: [PATCH 02/13] Do not build .NET Fx binaries in source build.
4+
Subject: [PATCH 02/14] Do not build .NET Fx binaries in source build.
55

66
---
77
Directory.Build.props | 1 +
@@ -27,7 +27,7 @@ index eba8e1c9..06382559 100644
2727
</PropertyGroup>
2828
</Project>
2929
diff --git a/eng/Versions.props b/eng/Versions.props
30-
index bf38e650..2c945967 100644
30+
index b8f5b548..4610d005 100644
3131
--- a/eng/Versions.props
3232
+++ b/eng/Versions.props
3333
@@ -6,7 +6,7 @@
@@ -71,7 +71,7 @@ index 1ee3064c..ce6a5e5e 100644
7171
\ No newline at end of file
7272
+</Project>
7373
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
74-
index 678ba714..955d343b 100644
74+
index 3fe97520..7e201442 100644
7575
--- a/src/Microsoft.DotNet.Build.Tasks.Packaging/src/Microsoft.DotNet.Build.Tasks.Packaging.csproj
7676
+++ b/src/Microsoft.DotNet.Build.Tasks.Packaging/src/Microsoft.DotNet.Build.Tasks.Packaging.csproj
7777
@@ -2,6 +2,7 @@
@@ -95,7 +95,7 @@ index 78d8c94c..33e90e49 100644
9595
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
9696
<ExcludeFromSourceBuild>true</ExcludeFromSourceBuild>
9797
diff --git a/src/Microsoft.DotNet.Deployment.Tasks.Links/Microsoft.DotNet.Deployment.Tasks.Links.csproj b/src/Microsoft.DotNet.Deployment.Tasks.Links/Microsoft.DotNet.Deployment.Tasks.Links.csproj
98-
index 5adb4419..43f0b4e5 100644
98+
index 66feb016..94f2dbd2 100644
9999
--- a/src/Microsoft.DotNet.Deployment.Tasks.Links/Microsoft.DotNet.Deployment.Tasks.Links.csproj
100100
+++ b/src/Microsoft.DotNet.Deployment.Tasks.Links/Microsoft.DotNet.Deployment.Tasks.Links.csproj
101101
@@ -3,6 +3,7 @@
@@ -138,5 +138,5 @@ index a201af86..e84959e2 100644
138138
<LangVersion>Latest</LangVersion>
139139
<IsPackable>true</IsPackable>
140140
--
141-
2.18.0
141+
2.21.0
142142

‎patches/arcade/0003-Build-CoreFxTesting-in-source-build.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
From ac55296e8c51ad49d31f49465577f2a416f29291 Mon Sep 17 00:00:00 2001
1+
From 53374db5f8f9c90f75fb61a868f9236f60434e51 Mon Sep 17 00:00:00 2001
22
From: Chris Rummel <crummel@microsoft.com>
33
Date: Tue, 24 Sep 2019 11:39:15 -0500
4-
Subject: [PATCH 03/13] Build CoreFxTesting in source-build
4+
Subject: [PATCH 03/14] Build CoreFxTesting in source-build
55

66
---
77
.../Microsoft.DotNet.CoreFxTesting.csproj | 1 -
@@ -20,5 +20,5 @@ index 33e90e49..694e3381 100644
2020

2121
<ItemGroup>
2222
--
23-
2.18.0
23+
2.21.0
2424

‎patches/arcade/0004-Update-SystemNetHttpPackageVersion.patch

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
From 90774c2d7acb2e10fd0c550037353057d44a40f5 Mon Sep 17 00:00:00 2001
1+
From 3077a71d79c0b2bf553efc262f04be967a5becf5 Mon Sep 17 00:00:00 2001
22
From: dseefeld <dseefeld@microsoft.com>
33
Date: Mon, 23 Sep 2019 16:32:11 +0000
4-
Subject: [PATCH 04/13] Update SystemNetHttpPackageVersion
4+
Subject: [PATCH 04/14] Update SystemNetHttpPackageVersion
55

66
---
77
eng/Versions.props | 2 +-
88
1 file changed, 1 insertion(+), 1 deletion(-)
99

1010
diff --git a/eng/Versions.props b/eng/Versions.props
11-
index 2c945967..a2bb1be8 100644
11+
index 4610d005..ef02123c 100644
1212
--- a/eng/Versions.props
1313
+++ b/eng/Versions.props
1414
@@ -14,7 +14,7 @@
@@ -21,5 +21,5 @@ index 2c945967..a2bb1be8 100644
2121
<MicrosoftAzureKeyVaultVersion>3.0.0</MicrosoftAzureKeyVaultVersion>
2222
<MicrosoftBuildVersion>15.7.179</MicrosoftBuildVersion>
2323
--
24-
2.18.0
24+
2.21.0
2525

0 commit comments

Comments
 (0)