From bcac6ee6f5cd34d17f8a3bfe026ec53681027d01 Mon Sep 17 00:00:00 2001 From: William Godbe Date: Tue, 5 Apr 2022 15:59:25 -0700 Subject: [PATCH] [release/6.0] Build ProjectTemplates in Source-Build (#40840) * Revert "Revert "[release/6.0] Build ProjectTemplates in Source-Build (#40650)" (#40805)" This reverts commit a351c437ac7bc9f9be96de51832608438a7a37df. * Update Microsoft.Authentication.WebAssembly.Msal.csproj * Update Microsoft.AspNetCore.Components.WebAssembly.Authentication.csproj * Update Microsoft.Authentication.WebAssembly.Msal.csproj * Update Microsoft.AspNetCore.Components.WebAssembly.Authentication.csproj * Workaround --- Directory.Build.props | 3 +++ Directory.Build.targets | 9 +++++++-- .../src/Microsoft.Authentication.WebAssembly.Msal.csproj | 9 ++++++++- ...pNetCore.Components.WebAssembly.Authentication.csproj | 9 ++++++++- 4 files changed, 26 insertions(+), 4 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index 8f0ac5942284..721f099a7734 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -30,6 +30,9 @@ $(MSBuildProjectName.EndsWith('.Test')) OR $(MSBuildProjectName.EndsWith('.FunctionalTest')) ) ">true true + true true true true + Condition="'$(ExcludeFromSourceBuild)' == '' and + '$(DotNetBuildFromSource)' == 'true' and + '$(IsAspNetCoreApp)' != 'true' and + '$(MSBuildProjectName)' != '$(TargetingPackName)' and + '$(IsAnalyzersProject)' != 'true' and + '$(IsProjectTemplateProject)' != 'true'">true 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 8ae5d1c43d7b..1db0368b882c 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,6 +1,6 @@  - + $(DefaultNetCoreTargetFramework) @@ -25,6 +25,7 @@ $(MSBuildThisFileDirectory)Interop\ + CheckForSourceBuild; CompileInterop; IncludeCompileInteropOutput; $(ResolveStaticWebAssetsInputsDependsOn) @@ -91,5 +92,11 @@ + + + + + + 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 8d6a000d74f0..35c79a73eb8b 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,6 +1,6 @@ - + $(DefaultNetCoreTargetFramework) @@ -26,6 +26,7 @@ $(MSBuildThisFileDirectory)Interop\ + CheckForSourceBuild; CompileInterop; IncludeCompileInteropOutput; $(ResolveStaticWebAssetsInputsDependsOn) @@ -93,4 +94,10 @@ + + + + + +