-
Notifications
You must be signed in to change notification settings - Fork 29
/
0008-Remove-Yarn-dependency-not-used-in-source-build.patch
81 lines (75 loc) · 3.32 KB
/
0008-Remove-Yarn-dependency-not-used-in-source-build.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
From a0ae7e9b334c167943035dff556730d017baa760 Mon Sep 17 00:00:00 2001
From: adaggarwal <aditya.aggarwal@microsoft.com>
Date: Thu, 14 Nov 2019 17:34:41 +0000
Subject: [PATCH 08/13] Remove Yarn dependency - not used in source-build
---
eng/targets/Npm.Common.targets | 3 ---
global.json | 1 -
.../NodeServices/src/Microsoft.AspNetCore.NodeServices.csproj | 3 ---
.../SpaServices/src/Microsoft.AspNetCore.SpaServices.csproj | 3 ---
src/Shared/E2ETesting/E2ETesting.targets | 3 ---
5 files changed, 13 deletions(-)
diff --git a/eng/targets/Npm.Common.targets b/eng/targets/Npm.Common.targets
index 062a9d3a8f..3f91b02d42 100644
--- a/eng/targets/Npm.Common.targets
+++ b/eng/targets/Npm.Common.targets
@@ -1,8 +1,5 @@
<Project DefaultTargets="Build" InitialTargets="_CheckForInvalidConfiguration">
- <!-- Version of this SDK is set in global.json -->
- <Sdk Name="Yarn.MSBuild" />
-
<PropertyGroup>
<NormalizedPackageId>$(PackageId.Replace('@','').Replace('/','-'))</NormalizedPackageId>
<PackageFileName>$(NormalizedPackageId)-$(PackageVersion).tgz</PackageFileName>
diff --git a/global.json b/global.json
index 17454ad1bf..2f5a03b4b6 100644
--- a/global.json
+++ b/global.json
@@ -24,7 +24,6 @@
}
},
"msbuild-sdks": {
- "Yarn.MSBuild": "1.15.2",
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19517.3",
"Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19517.3"
}
diff --git a/src/Middleware/NodeServices/src/Microsoft.AspNetCore.NodeServices.csproj b/src/Middleware/NodeServices/src/Microsoft.AspNetCore.NodeServices.csproj
index e67862ea45..29c3b8c137 100644
--- a/src/Middleware/NodeServices/src/Microsoft.AspNetCore.NodeServices.csproj
+++ b/src/Middleware/NodeServices/src/Microsoft.AspNetCore.NodeServices.csproj
@@ -16,9 +16,6 @@
<Reference Include="Newtonsoft.Json" />
</ItemGroup>
- <!-- Version of this SDK is set in global.json -->
- <Sdk Name="Yarn.MSBuild" />
-
<Target Name="YarnInstall">
<Message Text="Running yarn install on $(MSBuildProjectFile)" Importance="High" />
<Yarn Command="install --mutex network" />
diff --git a/src/Middleware/SpaServices/src/Microsoft.AspNetCore.SpaServices.csproj b/src/Middleware/SpaServices/src/Microsoft.AspNetCore.SpaServices.csproj
index 3db479b01e..ad0149356f 100644
--- a/src/Middleware/SpaServices/src/Microsoft.AspNetCore.SpaServices.csproj
+++ b/src/Middleware/SpaServices/src/Microsoft.AspNetCore.SpaServices.csproj
@@ -20,9 +20,6 @@
<Reference Include="Microsoft.AspNetCore.Mvc.ViewFeatures" />
</ItemGroup>
- <!-- Version of this SDK is set in global.json -->
- <Sdk Name="Yarn.MSBuild" />
-
<Target Name="YarnInstall">
<Message Text="Running yarn install on $(MSBuildProjectFile)" Importance="High" />
<Yarn Command="install --mutex network" />
diff --git a/src/Shared/E2ETesting/E2ETesting.targets b/src/Shared/E2ETesting/E2ETesting.targets
index 500d910a30..2ccf1a431c 100644
--- a/src/Shared/E2ETesting/E2ETesting.targets
+++ b/src/Shared/E2ETesting/E2ETesting.targets
@@ -1,7 +1,4 @@
<Project>
- <!-- Version of this SDK is set in global.json -->
- <Sdk Name="Yarn.MSBuild" />
-
<!-- Make sure the settings files get copied to the test output folder. -->
<ItemGroup>
<None Update="e2eTestSettings*.json">
--
2.18.0