Blazor: Add SelfContained in SDK tasks project instead of the test pr…

…ojects
nagilson · Jan 25, 2023 · 552b1b3 · 552b1b3
1 parent 07848f6
commit 552b1b3
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 22 deletions.
diff --git a/src/Assets/TestProjects/BlazorHosted/blazorhosted/blazorhosted.csproj b/src/Assets/TestProjects/BlazorHosted/blazorhosted/blazorhosted.csproj
@@ -8,11 +8,6 @@
     <ProjectReference Include="..\blazorwasm\blazorwasm.csproj" />
   </ItemGroup>
 
-  <!-- Based on .NET 8 breaking change: Add SC like old behavior if RID is defined. -->
-  <PropertyGroup Condition="'$(RuntimeIdentifier)' != '' and '$(SelfContained)' == ''">
-    <SelfContained>true</SelfContained>
-  </PropertyGroup>
-
   <!-- Enabling compression increases build time. We want to avoid this for tests so we
   disable it here. This doesn't affect any test assertions. -->
   <PropertyGroup>

diff --git a/src/Assets/TestProjects/BlazorHosted/blazorwasm/blazorwasm.csproj b/src/Assets/TestProjects/BlazorHosted/blazorwasm/blazorwasm.csproj
@@ -36,10 +36,5 @@
   <PropertyGroup>
     <_BlazorBrotliCompressionLevel>NoCompression</_BlazorBrotliCompressionLevel>
   </PropertyGroup>
-
-    <!-- Based on .NET 8 breaking change: Add SC like old behavior if RID is defined. -->
-  <PropertyGroup Condition="'$(RuntimeIdentifier)' != '' and '$(SelfContained)' == ''">
-    <SelfContained>true</SelfContained>
-  </PropertyGroup>
 
 </Project>
diff --git a/src/Assets/TestProjects/BlazorHostedRID/blazorhosted/blazorhosted-rid.csproj b/src/Assets/TestProjects/BlazorHostedRID/blazorhosted/blazorhosted-rid.csproj
@@ -13,11 +13,6 @@
     <FrameworkReference Remove="Microsoft.AspNetCore.App" />
     <KnownFrameworkReference Remove="Microsoft.AspNetCore.App" />
   </ItemGroup>
-
-  <!-- Based on .NET 8 breaking change: Add SC like old behavior if RID is defined. -->
-  <PropertyGroup Condition="'$(RuntimeIdentifier)' != '' and '$(SelfContained)' == ''">
-    <SelfContained>true</SelfContained>
-  </PropertyGroup>
 
   <!-- Enabling compression increases build time. We want to avoid this for tests so we
   disable it here. This doesn't affect any test assertions. -->

diff --git a/src/Assets/TestProjects/BlazorWasmWithLibrary/blazorwasm/blazorwasm.csproj b/src/Assets/TestProjects/BlazorWasmWithLibrary/blazorwasm/blazorwasm.csproj
@@ -35,11 +35,5 @@
   <PropertyGroup>
     <_BlazorBrotliCompressionLevel>NoCompression</_BlazorBrotliCompressionLevel>
   </PropertyGroup>
-
-    <!-- Based on .NET 8 breaking change: Add SC like old behavior if RID is defined. -->
-  <PropertyGroup Condition="'$(RuntimeIdentifier)' != '' and '$(SelfContained)' == ''">
-    <SelfContained>true</SelfContained>
-  </PropertyGroup>
 
-
 </Project>
diff --git a/src/BlazorWasmSdk/Tasks/Microsoft.NET.Sdk.BlazorWebAssembly.Tasks.csproj b/src/BlazorWasmSdk/Tasks/Microsoft.NET.Sdk.BlazorWebAssembly.Tasks.csproj
@@ -1,4 +1,4 @@
-<Project>
+<Project>
 
   <PropertyGroup>
     <BlazorWasmSdkRoot>$(RepoRoot)\src\BlazorWasmSdk\</BlazorWasmSdkRoot>
@@ -28,6 +28,11 @@
     <NoDefaultExcludes>true</NoDefaultExcludes>
   </PropertyGroup>
 
+  <!-- Based on .NET 8 breaking change: Add SC like old behavior if RID is defined. -->
+  <PropertyGroup Condition="'$(RuntimeIdentifier)' != '' and '$(SelfContained)' == ''">
+    <SelfContained>true</SelfContained>
+  </PropertyGroup>
+
   <PropertyGroup>
     <Description>SDK for building and publishing Blazor WebAssembly applications.</Description>
     <OutputType>Library</OutputType>