Skip to content

Commit 7276b93

Browse files
author
John Luo
committed
Update patch
1 parent e4851c6 commit 7276b93

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

eng/source-build-patches/0001-Remove-Yarn-dependency-not-used-in-source-build.patch

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From b8957fc9b7a160717aaba88680ed654a2430262a Mon Sep 17 00:00:00 2001
1+
From 96bb56ea0ea0ce6ca21ffc58d7843d7ccfab3d9b Mon Sep 17 00:00:00 2001
22
From: John Luo <[email protected]>
33
Date: Tue, 18 May 2021 10:48:34 -0700
44
Subject: [PATCH] Remove Yarn dependency - not used in source-build
@@ -17,32 +17,32 @@ index 0604d1f0c0..6b5849c03a 100644
1717
+++ b/eng/targets/Npm.Common.targets
1818
@@ -1,8 +1,5 @@
1919
<Project DefaultTargets="Build" InitialTargets="_CheckForInvalidConfiguration">
20-
20+
2121
- <!-- Version of this SDK is set in global.json -->
2222
- <Sdk Name="Yarn.MSBuild" />
2323
-
2424
<PropertyGroup>
2525
<NormalizedPackageId>$(PackageId.Replace('@','').Replace('/','-'))</NormalizedPackageId>
2626
<PackageFileName>$(NormalizedPackageId)-$(PackageVersion).tgz</PackageFileName>
2727
diff --git a/global.json b/global.json
28-
index b84a06acea..06510aa9ea 100644
28+
index 5a2b8a613d..fa6d0c7954 100644
2929
--- a/global.json
3030
+++ b/global.json
3131
@@ -29,7 +29,6 @@
3232
"xcopy-msbuild": "16.5.0-alpha"
3333
},
3434
"msbuild-sdks": {
3535
- "Yarn.MSBuild": "1.22.10",
36-
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21261.2",
37-
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21261.2"
36+
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21264.2",
37+
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21264.2"
3838
}
3939
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
4040
index 1d260d7d3c..1e794f2265 100644
4141
--- a/src/Components/WebAssembly/Authentication.Msal/src/Microsoft.Authentication.WebAssembly.Msal.csproj
4242
+++ b/src/Components/WebAssembly/Authentication.Msal/src/Microsoft.Authentication.WebAssembly.Msal.csproj
4343
@@ -1,7 +1,5 @@
4444
<Project Sdk="Microsoft.NET.Sdk.Razor">
45-
45+
4646
- <Sdk Name="Yarn.MSBuild" />
4747
-
4848
<PropertyGroup>
@@ -54,7 +54,7 @@ index 88bc97fb01..fcb613b38a 100644
5454
+++ b/src/Components/WebAssembly/WebAssembly.Authentication/src/Microsoft.AspNetCore.Components.WebAssembly.Authentication.csproj
5555
@@ -1,7 +1,5 @@
5656
<Project Sdk="Microsoft.NET.Sdk.Razor">
57-
57+
5858
- <Sdk Name="Yarn.MSBuild" />
5959
-
6060
<PropertyGroup>
@@ -68,9 +68,9 @@ index 76ced2cce9..0eb94aaf2e 100644
6868
<Project>
6969
- <!-- Version of this SDK is set in global.json -->
7070
- <Sdk Name="Yarn.MSBuild" />
71-
71+
7272
<!-- Make sure the settings files get copied to the test output folder. -->
7373
<ItemGroup>
74-
--
74+
--
7575
2.20.1.windows.1
7676

0 commit comments

Comments
 (0)