Skip to content

Commit e4851c6

Browse files
author
John Luo
committed
Update patch content
1 parent d8643f2 commit e4851c6

File tree

1 file changed

+20
-21
lines changed

1 file changed

+20
-21
lines changed
Original file line numberDiff line numberDiff line change
@@ -1,77 +1,76 @@
1-
From 83c0f95c563fa6eb9b446f09166cac2c62ab6390 Mon Sep 17 00:00:00 2001
2-
From: dseefeld <dseefeld@microsoft.com>
3-
Date: Thu, 14 May 2020 16:29:28 +0000
4-
Subject: [PATCH 04/14] Remove Yarn dependency - not used in source-build
1+
From b8957fc9b7a160717aaba88680ed654a2430262a Mon Sep 17 00:00:00 2001
2+
From: John Luo <johluo@microsoft.com>
3+
Date: Tue, 18 May 2021 10:48:34 -0700
4+
Subject: [PATCH] Remove Yarn dependency - not used in source-build
55

66
---
77
eng/targets/Npm.Common.targets | 3 ---
88
global.json | 1 -
99
.../src/Microsoft.Authentication.WebAssembly.Msal.csproj | 2 --
1010
...oft.AspNetCore.Components.WebAssembly.Authentication.csproj | 2 --
11-
src/Shared/E2ETesting/E2ETesting.targets | 3 ---
12-
5 files changed, 11 deletions(-)
11+
src/Shared/E2ETesting/E2ETesting.targets | 2 --
12+
5 files changed, 10 deletions(-)
1313

1414
diff --git a/eng/targets/Npm.Common.targets b/eng/targets/Npm.Common.targets
15-
index 696d23402b..6086dd0843 100644
15+
index 0604d1f0c0..6b5849c03a 100644
1616
--- a/eng/targets/Npm.Common.targets
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 501ba161bf..ee9dcaf4fa 100644
28+
index b84a06acea..06510aa9ea 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.21167.3",
37-
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21167.3"
36+
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21261.2",
37+
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21261.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
40-
index 939ba16f88..ea2c849ea3 100644
40+
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>
4949
<TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
5050
<Description>Authenticate your Blazor webassembly applications with Azure Active Directory and Azure Active Directory B2C</Description>
5151
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
52-
index 21a2efba4e..b4a6a75446 100644
52+
index 88bc97fb01..fcb613b38a 100644
5353
--- a/src/Components/WebAssembly/WebAssembly.Authentication/src/Microsoft.AspNetCore.Components.WebAssembly.Authentication.csproj
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>
6161
<TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
6262
<Description>Build client-side authentication for single-page applications (SPAs).</Description>
6363
diff --git a/src/Shared/E2ETesting/E2ETesting.targets b/src/Shared/E2ETesting/E2ETesting.targets
64-
index 76ced2cce9..eaecb913a9 100644
64+
index 76ced2cce9..0eb94aaf2e 100644
6565
--- a/src/Shared/E2ETesting/E2ETesting.targets
6666
+++ b/src/Shared/E2ETesting/E2ETesting.targets
67-
@@ -1,7 +1,4 @@
67+
@@ -1,6 +1,4 @@
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-
<None Update="e2eTestSettings*.json">
75-
--
76-
2.18.0
74+
--
75+
2.20.1.windows.1
7776

0 commit comments

Comments
 (0)