Skip to content

Commit 5576aa3

Browse files
committed
Merged PR 836: Correct to 2.2.106 manifest instead of 2.2.203.
1 parent 2b3781b commit 5576aa3

32 files changed

+291
-942
lines changed

patches/cli-migrate/0001-Add-PackageProjectUrl-for-new-SDK.patch

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

patches/cli-migrate/0002-Skip-warning-for-licenseUrl.patch renamed to patches/cli-migrate/0001-Skip-warning-for-licenseUrl.patch

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From a187604f6d92552344bc4f18683f7cdf28804ab2 Mon Sep 17 00:00:00 2001
1+
From 83d9cbffdd20cf0ee1abee86cf84b3a1028173c9 Mon Sep 17 00:00:00 2001
22
From: Chris Rummel <[email protected]>
33
Date: Sun, 31 Mar 2019 00:34:18 -0500
44
Subject: [PATCH] Skip warning for licenseUrl.
@@ -8,13 +8,13 @@ Subject: [PATCH] Skip warning for licenseUrl.
88
1 file changed, 1 insertion(+)
99

1010
diff --git a/Directory.Build.props b/Directory.Build.props
11-
index 964b568..778a50f 100644
11+
index b1d15db..785547b 100644
1212
--- a/Directory.Build.props
1313
+++ b/Directory.Build.props
14-
@@ -12,5 +12,6 @@
15-
<DebugSymbols>true</DebugSymbols>
16-
<StrongNameKeyId>MicrosoftAspNetCore</StrongNameKeyId>
17-
<PackageProjectUrl>https://github.com/dotnet/cli-migrate</PackageProjectUrl>
14+
@@ -4,5 +4,6 @@
15+
<PropertyGroup>
16+
<RepositoryUrl>https://github.com/dotnet/cli-migrate</RepositoryUrl>
17+
<PackageProjectUrl>$(RepositoryUrl)</PackageProjectUrl>
1818
+ <NoWarn>$(NoWarn);NU5125</NoWarn>
1919
</PropertyGroup>
2020
</Project>

patches/cli-migrate/0003-Remove-test-projects-from-solution.patch

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

patches/fsharp/0001-Update-FSharp.Build-to-netstandard2.1.patch

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

patches/fsharp/0002-Add-type-annotation-to-F.patch

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

patches/fsharp/0003-netcoreapp2.1-cascading.patch

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

patches/fsharp/0004-Fix-casing-in-project.patch

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

patches/fsharp/0005-More-cascading-netcoreapp2.1-updates.patch

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

patches/fsharp/0006-Don-t-reset-RestoreSources-when-offline.patch

Lines changed: 0 additions & 25 deletions
This file was deleted.
Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
From b89e2a26623c89c5ac71e0a10435f8af6db3d3d7 Mon Sep 17 00:00:00 2001
2+
From: Chris Rummel <[email protected]>
3+
Date: Thu, 27 Sep 2018 17:24:52 -0500
4+
Subject: [PATCH] Consolidate versions of System.Threading.Tasks.Dataflow.
5+
6+
---
7+
src/Build/Microsoft.Build.csproj | 2 +-
8+
src/Tasks/Microsoft.Build.Tasks.csproj | 2 +-
9+
2 files changed, 2 insertions(+), 2 deletions(-)
10+
11+
diff --git a/src/Build/Microsoft.Build.csproj b/src/Build/Microsoft.Build.csproj
12+
index fb46bc4..61cc31a 100644
13+
--- a/src/Build/Microsoft.Build.csproj
14+
+++ b/src/Build/Microsoft.Build.csproj
15+
@@ -39,7 +39,7 @@
16+
17+
<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'">
18+
<PackageReference Include="Microsoft.VisualStudio.Setup.Configuration.Interop" Version="$(VisualStudioSetupInteropVersion)" />
19+
- <PackageReference Include="System.Threading.Tasks.Dataflow" Version="4.5.24.0" />
20+
+ <PackageReference Include="System.Threading.Tasks.Dataflow" Version="4.6.0" />
21+
22+
<Reference Include="System.Configuration" Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'" />
23+
</ItemGroup>
24+
diff --git a/src/Tasks/Microsoft.Build.Tasks.csproj b/src/Tasks/Microsoft.Build.Tasks.csproj
25+
index aafdf92..4da0a22 100644
26+
--- a/src/Tasks/Microsoft.Build.Tasks.csproj
27+
+++ b/src/Tasks/Microsoft.Build.Tasks.csproj
28+
@@ -955,7 +955,7 @@
29+
</ItemGroup>
30+
<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'">
31+
<PackageReference Include="Microsoft.VisualStudio.Setup.Configuration.Interop" Version="$(VisualStudioSetupInteropVersion)" />
32+
- <PackageReference Include="System.Threading.Tasks.Dataflow" Version="4.5.24.0" />
33+
+ <PackageReference Include="System.Threading.Tasks.Dataflow" Version="4.6.0" />
34+
35+
<!-- Reference compilers package without using assets, so we can copy them to the output directory under the Roslyn folder -->
36+
<PackageReference Include="Microsoft.Net.Compilers" Version="$(MicrosoftNetCompilersVersion)" ExcludeAssets="All" />
37+
--
38+
2.9.5
39+

0 commit comments

Comments
 (0)