|
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 |
5 | 5 |
|
6 | 6 | --- |
7 | 7 | eng/targets/Npm.Common.targets | 3 --- |
8 | 8 | global.json | 1 - |
9 | 9 | .../src/Microsoft.Authentication.WebAssembly.Msal.csproj | 2 -- |
10 | 10 | ...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(-) |
13 | 13 |
|
14 | 14 | diff --git a/eng/targets/Npm.Common.targets b/eng/targets/Npm.Common.targets |
15 | | -index 696d23402b..6086dd0843 100644 |
| 15 | +index 0604d1f0c0..6b5849c03a 100644 |
16 | 16 | --- a/eng/targets/Npm.Common.targets |
17 | 17 | +++ b/eng/targets/Npm.Common.targets |
18 | 18 | @@ -1,8 +1,5 @@ |
19 | 19 | <Project DefaultTargets="Build" InitialTargets="_CheckForInvalidConfiguration"> |
20 | | - |
| 20 | + |
21 | 21 | - <!-- Version of this SDK is set in global.json --> |
22 | 22 | - <Sdk Name="Yarn.MSBuild" /> |
23 | 23 | - |
24 | 24 | <PropertyGroup> |
25 | 25 | <NormalizedPackageId>$(PackageId.Replace('@','').Replace('/','-'))</NormalizedPackageId> |
26 | 26 | <PackageFileName>$(NormalizedPackageId)-$(PackageVersion).tgz</PackageFileName> |
27 | 27 | diff --git a/global.json b/global.json |
28 | | -index 501ba161bf..ee9dcaf4fa 100644 |
| 28 | +index b84a06acea..06510aa9ea 100644 |
29 | 29 | --- a/global.json |
30 | 30 | +++ b/global.json |
31 | 31 | @@ -29,7 +29,6 @@ |
32 | 32 | "xcopy-msbuild": "16.5.0-alpha" |
33 | 33 | }, |
34 | 34 | "msbuild-sdks": { |
35 | 35 | - "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" |
38 | 38 | } |
39 | 39 | 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 |
41 | 41 | --- a/src/Components/WebAssembly/Authentication.Msal/src/Microsoft.Authentication.WebAssembly.Msal.csproj |
42 | 42 | +++ b/src/Components/WebAssembly/Authentication.Msal/src/Microsoft.Authentication.WebAssembly.Msal.csproj |
43 | 43 | @@ -1,7 +1,5 @@ |
44 | 44 | <Project Sdk="Microsoft.NET.Sdk.Razor"> |
45 | | - |
| 45 | + |
46 | 46 | - <Sdk Name="Yarn.MSBuild" /> |
47 | 47 | - |
48 | 48 | <PropertyGroup> |
49 | 49 | <TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework> |
50 | 50 | <Description>Authenticate your Blazor webassembly applications with Azure Active Directory and Azure Active Directory B2C</Description> |
51 | 51 | 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 |
53 | 53 | --- a/src/Components/WebAssembly/WebAssembly.Authentication/src/Microsoft.AspNetCore.Components.WebAssembly.Authentication.csproj |
54 | 54 | +++ b/src/Components/WebAssembly/WebAssembly.Authentication/src/Microsoft.AspNetCore.Components.WebAssembly.Authentication.csproj |
55 | 55 | @@ -1,7 +1,5 @@ |
56 | 56 | <Project Sdk="Microsoft.NET.Sdk.Razor"> |
57 | | - |
| 57 | + |
58 | 58 | - <Sdk Name="Yarn.MSBuild" /> |
59 | 59 | - |
60 | 60 | <PropertyGroup> |
61 | 61 | <TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework> |
62 | 62 | <Description>Build client-side authentication for single-page applications (SPAs).</Description> |
63 | 63 | diff --git a/src/Shared/E2ETesting/E2ETesting.targets b/src/Shared/E2ETesting/E2ETesting.targets |
64 | | -index 76ced2cce9..eaecb913a9 100644 |
| 64 | +index 76ced2cce9..0eb94aaf2e 100644 |
65 | 65 | --- a/src/Shared/E2ETesting/E2ETesting.targets |
66 | 66 | +++ b/src/Shared/E2ETesting/E2ETesting.targets |
67 | | -@@ -1,7 +1,4 @@ |
| 67 | +@@ -1,6 +1,4 @@ |
68 | 68 | <Project> |
69 | 69 | - <!-- Version of this SDK is set in global.json --> |
70 | 70 | - <Sdk Name="Yarn.MSBuild" /> |
71 | | -- |
| 71 | + |
72 | 72 | <!-- Make sure the settings files get copied to the test output folder. --> |
73 | 73 | <ItemGroup> |
74 | | - <None Update="e2eTestSettings*.json"> |
75 | | --- |
76 | | -2.18.0 |
| 74 | +-- |
| 75 | +2.20.1.windows.1 |
77 | 76 |
|
0 commit comments