Skip to content

Commit 7a1a1cc

Browse files
crummelcrummel
committed
Update to January 3.1 release.
1 parent bd8ff14 commit 7a1a1cc

File tree

37 files changed

+766
-586
lines changed

37 files changed

+766
-586
lines changed

‎NuGet.config

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,12 @@
33
<packageSources>
44
<clear />
55
<!--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" />
6+
<add key="darc-pub-microsoft-msbuild-e901037-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-microsoft-msbuild-e901037f-2/nuget/v3/index.json" />
7+
<add key="darc-pub-dotnet-templating-53a17fc-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-53a17fce-1/nuget/v3/index.json" />
78
<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" />
9+
<add key="darc-pub-aspnet-Extensions-4e1be2f" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-aspnet-Extensions-4e1be2fb/nuget/v3/index.json" />
10+
<add key="darc-pub-aspnet-AspNetCore-Tooling-2903677" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-aspnet-AspNetCore-Tooling-29036777/nuget/v3/index.json" />
11+
<add key="darc-pub-aspnet-AspNetCore-2b7e994" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-aspnet-AspNetCore-2b7e994b/nuget/v3/index.json" />
1112
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
1213
<add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" />
1314
<add key="nuget-build" value="https://dotnet.myget.org/F/nuget-build/api/v3/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://dotnetfeed.blob.core.windows.net/dotnet-core-3-1-ga-014709/index.json

‎eng/Version.Details.xml

Lines changed: 35 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@
55
<Uri>https://github.com/dotnet/arcade</Uri>
66
<Sha>ce459ae07c3d7a1e68251268855e0bc7b3d97f75</Sha>
77
</Dependency>
8-
<Dependency Name="Private.SourceBuild.ReferencePackages" Version="1.0.0-beta.20107.1">
8+
<Dependency Name="Private.SourceBuild.ReferencePackages" Version="1.0.0-beta.19577.2">
99
<Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
10-
<Sha>9cc7dad6c4d9302c00803df5dea41c8a7a59e047</Sha>
10+
<Sha>310516969c6bd9b64985572a5d1f932723571686</Sha>
1111
</Dependency>
1212
</ToolsetDependencies>
1313
<ProductDependencies>
14-
<Dependency Name="Microsoft.Build.Tasks.Git" Version="1.0.0">
14+
<Dependency Name="Microsoft.Build.Tasks.Git" Version="1.0.0-beta2-19367-01">
1515
<Uri>https://github.com/dotnet/sourcelink</Uri>
16-
<Sha>f175b06862f889474b689a57527e489101c774cc</Sha>
16+
<Sha>855afb5af9ea79e63dd9c051a7cfe0941bbb5ced</Sha>
1717
</Dependency>
1818
<!-- this is pinned to work around https://github.com/dotnet/arcade/issues/3518 -->
1919
<!-- if XDT is updated before that issue is fixed, this should be updated. After the issue is fixed, it should be unpinned. -->
@@ -27,48 +27,48 @@
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.1-servicing.19607.1" CoherentParentDependency="Microsoft.Private.CoreFx.NETCoreApp">
3131
<Uri>https://github.com/dotnet/coreclr</Uri>
32-
<Sha>fd22fd600a2526a7c58536da0e80325eb710d7f1</Sha>
32+
<Sha>5558d18aafc84ecac3630ca6a31f52699cde0b66</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.1-servicing.19607.1" CoherentParentDependency="Microsoft.Private.CoreFx.NETCoreApp">
3636
<Uri>https://github.com/dotnet/coreclr</Uri>
37-
<Sha>fd22fd600a2526a7c58536da0e80325eb710d7f1</Sha>
37+
<Sha>5558d18aafc84ecac3630ca6a31f52699cde0b66</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.19608.1" CoherentParentDependency="Microsoft.NETCore.App">
4545
<Uri>https://github.com/dotnet/corefx</Uri>
46-
<Sha>e946cebe43a510e8c6476bbc8185d1445df33a1a</Sha>
46+
<Sha>17300169760c61a90cab8d913636c1058a30a8c1</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.19608.1" CoherentParentDependency="Microsoft.NETCore.App">
5050
<Uri>https://github.com/dotnet/corefx</Uri>
51-
<Sha>e946cebe43a510e8c6476bbc8185d1445df33a1a</Sha>
51+
<Sha>17300169760c61a90cab8d913636c1058a30a8c1</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.1-servicing.19608.4" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
5555
<Uri>https://github.com/dotnet/core-setup</Uri>
56-
<Sha>916b5cba268e1e1e803243004f4276cf40b2dda8</Sha>
56+
<Sha>a1388f194c30cb21b36b75982962cb5e35954e4e</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.1-servicing.19608.4" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
6060
<Uri>https://github.com/dotnet/core-setup</Uri>
61-
<Sha>916b5cba268e1e1e803243004f4276cf40b2dda8</Sha>
61+
<Sha>a1388f194c30cb21b36b75982962cb5e35954e4e</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">
64+
<Dependency Name="Microsoft.AspNetCore.Mvc.Razor.Extensions" Version="3.1.1" CoherentParentDependency="Microsoft.AspNetCore.App.Ref">
6565
<Uri>https://github.com/dotnet/AspNetCore-Tooling</Uri>
66-
<Sha>2dab42e151ea8020a75cdaaa8c46bf5d9093b8c0</Sha>
66+
<Sha>07f16c89db55ab6f9f773cc3db6eb5a52908065e</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.1-servicing.19605.2" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
7070
<Uri>https://github.com/dotnet/templating</Uri>
71-
<Sha>247f60e9e34a03ed99e855eb1ea0c20931a968db</Sha>
71+
<Sha>13abe7e2749d95337e8d72efdc5b71611815fd43</Sha>
7272
</Dependency>
7373
<Dependency Name="Microsoft.NETCore.Compilers" Version="3.4.1-beta4-19614-01" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
7474
<Uri>https://github.com/dotnet/roslyn</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">
86+
<Dependency Name="Microsoft.Extensions.Logging" Version="3.1.1-servicing.19614.4" CoherentParentDependency="Microsoft.AspNetCore.Mvc.Razor.Extensions">
8787
<Uri>https://github.com/dotnet/Extensions</Uri>
88-
<Sha>1286a6ff55e300352dabeb6d778c9fcdd258bd08</Sha>
88+
<Sha>d00c382ec5d68a85d2eb4a49ab4559b8db7a2390</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.101-servicing.19617.12" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
9292
<Uri>https://github.com/dotnet/sdk</Uri>
93-
<Sha>90a093bbbe2c46ef19e301d717bed3cfaa56abb3</Sha>
93+
<Sha>9b38eb3b6cbbc9c82270dbd4e20286007a52a165</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,37 @@
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">
111+
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="3.1.1" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
112112
<Uri>https://github.com/dotnet/AspNetCore</Uri>
113-
<Sha>c3acdcac86dad91c3d3fbc3b93ecc6b7ba494bdc</Sha>
113+
<Sha>e276c8174b8bfdeb70efceafa81c75f8badbc8db</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.101-servicing.19617.2" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
117117
<Uri>https://github.com/dotnet/cli</Uri>
118-
<Sha>32fddd23b1e53272472f6feb27f5e12a445b7236</Sha>
118+
<Sha>91705c83e44dd9221c3071e1bb7a87ba2f47688c</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.101-servicing.19616.2" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
126126
<Uri>https://github.com/aspnet/websdk</Uri>
127-
<Sha>589ed451f2bcb51d7f47a37ebf4e3d501979174c</Sha>
127+
<Sha>4774c8edf507ac3f3ad0afff5046d12fede56cc7</Sha>
128+
<RepoName>websdk</RepoName>
128129
</Dependency>
129130
<Dependency Name="Microsoft.TestPlatform.Build" Version="16.3.0" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
130131
<Uri>https://github.com/microsoft/vstest</Uri>
131132
<Sha>55e7e45431c9c05656c999b902686e7402664573</Sha>
132133
</Dependency>
133-
<Dependency Name="Microsoft.Dotnet.Toolset.Internal" Version="3.1.102-servicing.20070.8" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
134+
<Dependency Name="Microsoft.Dotnet.Toolset.Internal" Version="3.1.101-servicing.19617.13" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
134135
<Uri>https://github.com/dotnet/toolset</Uri>
135-
<Sha>a46d93e5e100f9046cb589b5d4ba70bde41f3480</Sha>
136+
<Sha>411fe514b956a39d6080575cf35d2d64054a7ec0</Sha>
136137
<RepoName>toolset</RepoName>
137138
</Dependency>
138-
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="1.0.0-preview.20080.8">
139+
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="1.0.0-preview.19619.5">
139140
<Uri>https://github.com/dotnet/core-sdk</Uri>
140-
<Sha>573d158fea168b51e0f9e628d08c9d3ca8a40ef8</Sha>
141+
<Sha>b3775299615eedb10fc3047697208ed74eaffefe</Sha>
141142
<RepoName>core-sdk</RepoName>
142143
</Dependency>
143144
<!-- external dependencies, not handled by Maestro/Arcade -->

‎patches/aspnet-extensions/0001-Remove-auth-feeds.patch

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
From 93b6fb8abad61774edf629d6133b523b0e262297 Mon Sep 17 00:00:00 2001
2+
From: adaggarwal <aditya.aggarwal@microsoft.com>
3+
Date: Wed, 5 Feb 2020 20:04:51 +0000
4+
Subject: [PATCH] Remove-auth-feeds
5+
6+
---
7+
NuGet.config | 5 -----
8+
1 file changed, 5 deletions(-)
9+
10+
diff --git a/NuGet.config b/NuGet.config
11+
index 4d6b089..45e31d1 100644
12+
--- a/NuGet.config
13+
+++ b/NuGet.config
14+
@@ -2,11 +2,6 @@
15+
<configuration>
16+
<packageSources>
17+
<clear />
18+
- <!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
19+
- <add key="darc-pub-dotnet-core-setup-7d57652" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-core-setup-7d57652f/nuget/v3/index.json" />
20+
- <add key="darc-pub-dotnet-core-setup-65f04fb" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-core-setup-65f04fb6/nuget/v3/index.json" />
21+
- <add key="darc-pub-dotnet-corefx-0f7f38c" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-corefx-0f7f38c4/nuget/v3/index.json" />
22+
- <add key="darc-int-dotnet-core-setup-a1388f1" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-core-setup-a1388f19/nuget/v3/index.json" />
23+
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
24+
<add key="dotnet3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3/nuget/v3/index.json" />
25+
<add key="dotnet3-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3-transport/nuget/v3/index.json" />
26+
--
27+
2.7.4
28+

‎patches/aspnetcore-tooling/0001-Don-t-build-fullfx.patch

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
From 1a5a1cd558339f753323b59c86681a6d83d1ebf6 Mon Sep 17 00:00:00 2001
1+
From c62ed6c915295ee9f00415eb2a9eadb377e75600 Mon Sep 17 00:00:00 2001
22
From: Chris Rummel <crummel@microsoft.com>
33
Date: Sun, 20 Oct 2019 15:51:49 -0500
44
Subject: [PATCH 1/4] Don't build fullfx
55

66
---
77
.../src/Microsoft.NET.Sdk.Razor/Microsoft.NET.Sdk.Razor.csproj | 10 +++++-----
8-
.../build/netstandard2.0/Sdk.Razor.CurrentVersion.targets | 4 ++--
9-
2 files changed, 7 insertions(+), 7 deletions(-)
8+
.../build/netstandard2.0/Sdk.Razor.CurrentVersion.targets | 2 +-
9+
2 files changed, 6 insertions(+), 6 deletions(-)
1010

1111
diff --git a/src/Razor/src/Microsoft.NET.Sdk.Razor/Microsoft.NET.Sdk.Razor.csproj b/src/Razor/src/Microsoft.NET.Sdk.Razor/Microsoft.NET.Sdk.Razor.csproj
1212
index ba32df8..4f8ecce 100644
@@ -46,16 +46,14 @@ index ba32df8..4f8ecce 100644
4646

4747
<Copy SourceFiles="@(ProjectOutput)" DestinationFiles="$(SdkOutputPath)tasks\%(RecursiveDir)%(FileName)%(Extension)" SkipUnchangedFiles="true">
4848
diff --git a/src/Razor/src/Microsoft.NET.Sdk.Razor/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets b/src/Razor/src/Microsoft.NET.Sdk.Razor/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets
49-
index e5e8d92..b0a7c5e 100644
49+
index 84d7bb7..b0a7c5e 100644
5050
--- a/src/Razor/src/Microsoft.NET.Sdk.Razor/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets
5151
+++ b/src/Razor/src/Microsoft.NET.Sdk.Razor/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets
52-
@@ -30,8 +30,8 @@ Copyright (c) .NET Foundation. All rights reserved.
53-
<!-- Paths to tools, tasks, and extensions are calculated relative to the RazorSdkDirectoryRoot. This can be modified to test a local build. -->
52+
@@ -31,7 +31,7 @@ Copyright (c) .NET Foundation. All rights reserved.
5453
<RazorSdkDirectoryRoot Condition="'$(RazorSdkDirectoryRoot)'==''">$(MSBuildThisFileDirectory)..\..\</RazorSdkDirectoryRoot>
5554
<RazorSdkBuildTasksDirectoryRoot Condition="'$(RazorSdkBuildTasksDirectoryRoot)'==''">$(RazorSdkDirectoryRoot)tasks\</RazorSdkBuildTasksDirectoryRoot>
56-
- <_RazorSdkTasksTFM Condition=" '$(MSBuildRuntimeType)' == 'Core'">netcoreapp3.1</_RazorSdkTasksTFM>
55+
<_RazorSdkTasksTFM Condition=" '$(MSBuildRuntimeType)' == 'Core'">$(DefaultNetCoreTargetFramework)</_RazorSdkTasksTFM>
5756
- <_RazorSdkTasksTFM Condition=" '$(_RazorSdkTasksTFM)' == ''">net46</_RazorSdkTasksTFM>
58-
+ <_RazorSdkTasksTFM Condition=" '$(MSBuildRuntimeType)' == 'Core'">$(DefaultNetCoreTargetFramework)</_RazorSdkTasksTFM>
5957
+ <_RazorSdkTasksTFM Condition=" '$(_RazorSdkTasksTFM)' == ''">net472</_RazorSdkTasksTFM>
6058
<RazorSdkBuildTasksAssembly>$(RazorSdkBuildTasksDirectoryRoot)$(_RazorSdkTasksTFM)\Microsoft.NET.Sdk.Razor.Tasks.dll</RazorSdkBuildTasksAssembly>
6159
</PropertyGroup>

‎patches/aspnetcore-tooling/0002-dont-call-dotnet-without-path.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 0c8defec29ee1144a70f20870b3e46c31509cc13 Mon Sep 17 00:00:00 2001
1+
From 95781f4ffab61cef5107c4260ac66c4e393ec54b Mon Sep 17 00:00:00 2001
22
From: adaggarwal <aditya.aggarwal@microsoft.com>
33
Date: Wed, 30 Oct 2019 19:41:56 +0000
44
Subject: [PATCH 2/4] dont call dotnet without path

‎patches/aspnetcore-tooling/0003-Import-PackageVersions.props.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 0ba59aca7eb538cacfc603ccf3f0e0c283603e32 Mon Sep 17 00:00:00 2001
1+
From 58005a08ddde86ec017231e890e1a31be908f342 Mon Sep 17 00:00:00 2001
22
From: adaggarwal <aditya.aggarwal@microsoft.com>
33
Date: Wed, 13 Nov 2019 16:31:47 +0000
44
Subject: [PATCH 3/4] Import PackageVersions.props
@@ -8,10 +8,10 @@ Subject: [PATCH 3/4] Import PackageVersions.props
88
1 file changed, 3 insertions(+)
99

1010
diff --git a/eng/Versions.props b/eng/Versions.props
11-
index dd53e83..7355673 100644
11+
index 8da4160..fb9adba 100644
1212
--- a/eng/Versions.props
1313
+++ b/eng/Versions.props
14-
@@ -141,4 +141,7 @@
14+
@@ -140,4 +140,7 @@
1515
<XunitAnalyzersPackageVersion>0.10.0</XunitAnalyzersPackageVersion>
1616
<XunitVersion>2.4.1</XunitVersion>
1717
</PropertyGroup>

‎patches/aspnetcore-tooling/0004-Pin-MSBuild-version-to-reference-versions.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 7aaf76c72b2b5bb9781eca190ae59920e8def8b8 Mon Sep 17 00:00:00 2001
1+
From e6096c3adf6fc7085c89997e2b219696b0a6eb67 Mon Sep 17 00:00:00 2001
22
From: adaggarwal <aditya.aggarwal@microsoft.com>
33
Date: Wed, 13 Nov 2019 16:35:48 +0000
44
Subject: [PATCH 4/4] Pin MSBuild version to reference versions

‎patches/aspnetcore-tooling/0005-Remove-authed-feeds.patch

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
From 9682d58410501321fa2224be5b209ce2dde0e476 Mon Sep 17 00:00:00 2001
2+
From: Chris Rummel <crummel@microsoft.com>
3+
Date: Thu, 13 Feb 2020 20:29:23 +0000
4+
Subject: [PATCH 5/5] Remove authed feeds
5+
6+
---
7+
NuGet.config | 6 ------
8+
1 file changed, 6 deletions(-)
9+
10+
diff --git a/NuGet.config b/NuGet.config
11+
index 9f4a4a8..f140cdc 100644
12+
--- a/NuGet.config
13+
+++ b/NuGet.config
14+
@@ -2,12 +2,6 @@
15+
<configuration>
16+
<packageSources>
17+
<clear />
18+
- <!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
19+
- <add key="darc-pub-dotnet-core-setup-65f04fb" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-core-setup-65f04fb6/nuget/v3/index.json" />
20+
- <add key="darc-pub-dotnet-corefx-0f7f38c" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-corefx-0f7f38c4/nuget/v3/index.json" />
21+
- <add key="darc-int-dotnet-core-setup-a1388f1" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-core-setup-a1388f19/nuget/v3/index.json" />
22+
- <add key="darc-int-aspnet-Extensions-d00c382" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-aspnet-Extensions-d00c382e/nuget/v3/index.json" />
23+
- <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
24+
<add key="dotnet-core" value="https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json" />
25+
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
26+
<add key="dotnet3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3/nuget/v3/index.json" />
27+
--
28+
2.7.4
29+

0 commit comments

Comments
 (0)