forked from dotnet/aspnetcore
/
0004-Remove-Yarn-dependency-not-used-in-source-build.patch
77 lines (71 loc) · 3.57 KB
/
0004-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
From 83c0f95c563fa6eb9b446f09166cac2c62ab6390 Mon Sep 17 00:00:00 2001
From: dseefeld <dseefeld@microsoft.com>
Date: Thu, 14 May 2020 16:29:28 +0000
Subject: [PATCH 04/14] Remove Yarn dependency - not used in source-build
---
eng/targets/Npm.Common.targets | 3 ---
global.json | 1 -
.../src/Microsoft.Authentication.WebAssembly.Msal.csproj | 2 --
...oft.AspNetCore.Components.WebAssembly.Authentication.csproj | 2 --
src/Shared/E2ETesting/E2ETesting.targets | 3 ---
5 files changed, 11 deletions(-)
diff --git a/eng/targets/Npm.Common.targets b/eng/targets/Npm.Common.targets
index 696d23402b..6086dd0843 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 501ba161bf..ee9dcaf4fa 100644
--- a/global.json
+++ b/global.json
@@ -29,7 +29,6 @@
"xcopy-msbuild": "16.5.0-alpha"
},
"msbuild-sdks": {
- "Yarn.MSBuild": "1.22.10",
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21167.3",
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21167.3"
}
diff --git a/src/Components/WebAssembly/Authentication.Msal/src/Microsoft.Authentication.WebAssembly.Msal.csproj b/src/Components/WebAssembly/Authentication.Msal/src/Microsoft.Authentication.WebAssembly.Msal.csproj
index 939ba16f88..ea2c849ea3 100644
--- a/src/Components/WebAssembly/Authentication.Msal/src/Microsoft.Authentication.WebAssembly.Msal.csproj
+++ b/src/Components/WebAssembly/Authentication.Msal/src/Microsoft.Authentication.WebAssembly.Msal.csproj
@@ -1,7 +1,5 @@
<Project Sdk="Microsoft.NET.Sdk.Razor">
- <Sdk Name="Yarn.MSBuild" />
-
<PropertyGroup>
<TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
<Description>Authenticate your Blazor webassembly applications with Azure Active Directory and Azure Active Directory B2C</Description>
diff --git a/src/Components/WebAssembly/WebAssembly.Authentication/src/Microsoft.AspNetCore.Components.WebAssembly.Authentication.csproj b/src/Components/WebAssembly/WebAssembly.Authentication/src/Microsoft.AspNetCore.Components.WebAssembly.Authentication.csproj
index 21a2efba4e..b4a6a75446 100644
--- a/src/Components/WebAssembly/WebAssembly.Authentication/src/Microsoft.AspNetCore.Components.WebAssembly.Authentication.csproj
+++ b/src/Components/WebAssembly/WebAssembly.Authentication/src/Microsoft.AspNetCore.Components.WebAssembly.Authentication.csproj
@@ -1,7 +1,5 @@
<Project Sdk="Microsoft.NET.Sdk.Razor">
- <Sdk Name="Yarn.MSBuild" />
-
<PropertyGroup>
<TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
<Description>Build client-side authentication for single-page applications (SPAs).</Description>
diff --git a/src/Shared/E2ETesting/E2ETesting.targets b/src/Shared/E2ETesting/E2ETesting.targets
index 76ced2cce9..eaecb913a9 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