Rename package

MackinnonBuck · MackinnonBuck · commit 78264c675a6d · 2024-11-05T11:17:37.000-08:00
diff --git a/AspNetCore.sln b/AspNetCore.sln
@@ -1818,7 +1818,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNetCore.App.So
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Assets", "Assets", "{2B858B82-5F0B-4A24-B3C0-5E99149F70D6}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNetCore.Assets.Pack", "src\Assets\Pack\Microsoft.AspNetCore.Assets.Pack.csproj", "{2AAE7819-BC3E-48F4-9CFA-5DD4CD5FFD62}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNetCore.App.Internal.Assets", "src\Assets\Microsoft.AspNetCore.App.Internal.Assets.csproj", "{2AAE7819-BC3E-48F4-9CFA-5DD4CD5FFD62}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/eng/ProjectReferences.props b/eng/ProjectReferences.props
@@ -5,7 +5,7 @@
 -->
 <Project>
   <ItemGroup>
-    <ProjectReferenceProvider Include="Microsoft.AspNetCore.Assets.Pack" ProjectPath="$(RepoRoot)src\Assets\Pack\Microsoft.AspNetCore.Assets.Pack.csproj" />
+    <ProjectReferenceProvider Include="Microsoft.AspNetCore.App.Internal.Assets" ProjectPath="$(RepoRoot)src\Assets\Pack\Microsoft.AspNetCore.App.Internal.Assets.csproj" />
     <ProjectReferenceProvider Include="Microsoft.Extensions.Caching.SqlServer" ProjectPath="$(RepoRoot)src\Caching\SqlServer\src\Microsoft.Extensions.Caching.SqlServer.csproj" />
     <ProjectReferenceProvider Include="Microsoft.Extensions.Caching.StackExchangeRedis" ProjectPath="$(RepoRoot)src\Caching\StackExchangeRedis\src\Microsoft.Extensions.Caching.StackExchangeRedis.csproj" />
     <ProjectReferenceProvider Include="Microsoft.AspNetCore" ProjectPath="$(RepoRoot)src\DefaultBuilder\src\Microsoft.AspNetCore.csproj" />
diff --git a/eng/ShippingAssemblies.props b/eng/ShippingAssemblies.props
@@ -105,7 +105,7 @@
     <AspNetCoreShippingAssembly Include="Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions" />
     <AspNetCoreShippingAssembly Include="Microsoft.Extensions.Diagnostics.HealthChecks" />
     <AspNetCoreShippingAssembly Include="Microsoft.Extensions.Features" />
-    <AspNetCoreShippingAssembly Include="Microsoft.AspNetCore.Assets.Pack" />
+    <AspNetCoreShippingAssembly Include="Microsoft.AspNetCore.App.Internal.Assets" />
     <AspNetCoreShippingAssembly Include="Microsoft.Extensions.Caching.SqlServer" />
     <AspNetCoreShippingAssembly Include="Microsoft.Extensions.Caching.StackExchangeRedis" />
     <AspNetCoreShippingAssembly Include="Microsoft.AspNetCore.JsonPatch" />
diff --git a/eng/tools/GenerateFiles/Directory.Build.targets.in b/eng/tools/GenerateFiles/Directory.Build.targets.in
@@ -100,7 +100,7 @@
         Condition=" '%(TargetFramework)' == '${DefaultNetCoreTargetFramework}' ">${MicrosoftNETCoreAppRuntimeVersion}</WebAssemblySdkPackVersion>
     </KnownWebAssemblySdkPack>
 
-    <KnownAspNetCorePack Update="Microsoft.AspNetCore.Assets.Pack">
+    <KnownAspNetCorePack Update="Microsoft.AspNetCore.App.Internal.Assets">
       <AspNetCorePackVersion
         Condition=" '%(TargetFramework)' == '${DefaultNetCoreTargetFramework}' ">${MicrosoftAspNetCoreAppRuntimeVersion}</AspNetCorePackVersion>
     </KnownAspNetCorePack>
diff --git a/src/Assets/Microsoft.AspNetCore.App.Internal.Assets.csproj b/src/Assets/Microsoft.AspNetCore.App.Internal.Assets.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
     <Description>ASP.NET Core static framework assets</Description>
-    <PackageId>Microsoft.AspNetCore.Assets.Pack</PackageId>
+    <PackageId>Microsoft.AspNetCore.App.Internal.Assets</PackageId>
     <IsPackable>true</IsPackable>
     <OutputType>Library</OutputType>
     <CopyBuildOutputToOutputDirectory>false</CopyBuildOutputToOutputDirectory>
diff --git a/src/Assets/build.cmd b/src/Assets/build.cmd
@@ -1,3 +1,3 @@
 @ECHO OFF
-SET RepoRoot=%~dp0..\..\..
+SET RepoRoot=%~dp0..\..
 %RepoRoot%\eng\build.cmd -projects %~dp0**\*.*proj %*
diff --git a/src/Assets/build/Microsoft.AspNetCore.App.Internal.Assets.props b/src/Assets/build/Microsoft.AspNetCore.App.Internal.Assets.props
diff --git a/src/Assets/build/Microsoft.AspNetCore.App.Internal.Assets.targets b/src/Assets/build/Microsoft.AspNetCore.App.Internal.Assets.targets
diff --git a/src/Assets/buildMultiTargeting/Microsoft.AspNetCore.App.Internal.Assets.targets b/src/Assets/buildMultiTargeting/Microsoft.AspNetCore.App.Internal.Assets.targets
@@ -1,3 +1,3 @@
 <Project>
-  <Import Project="$(MSBuildThisFileDirectory)..\buildTransitive\Microsoft.AspNetCore.Assets.Pack.targets"/>
+  <Import Project="$(MSBuildThisFileDirectory)..\buildTransitive\Microsoft.AspNetCore.App.Internal.Assets.targets"/>
 </Project>
diff --git a/src/Assets/buildTransitive/Microsoft.AspNetCore.App.Internal.Assets.targets b/src/Assets/buildTransitive/Microsoft.AspNetCore.App.Internal.Assets.targets
@@ -1,3 +1,3 @@
 <Project>
-  <Import Project="$(MSBuildThisFileDirectory)..\build\Microsoft.AspNetCore.Assets.Pack.targets"/>
+  <Import Project="$(MSBuildThisFileDirectory)..\build\Microsoft.AspNetCore.App.Internal.Assets.targets"/>
 </Project>
diff --git a/src/Components/Components.slnf b/src/Components/Components.slnf
@@ -4,7 +4,7 @@
     "projects": [
       "src\\Analyzers\\Microsoft.AspNetCore.Analyzer.Testing\\src\\Microsoft.AspNetCore.Analyzer.Testing.csproj",
       "src\\Antiforgery\\src\\Microsoft.AspNetCore.Antiforgery.csproj",
-      "src\\Assets\\Pack\\Microsoft.AspNetCore.Assets.Pack.csproj",
+      "src\\Assets\\Pack\\Microsoft.AspNetCore.App.Internal.Assets.csproj",
       "src\\Components\\Analyzers\\src\\Microsoft.AspNetCore.Components.Analyzers.csproj",
       "src\\Components\\Analyzers\\test\\Microsoft.AspNetCore.Components.Analyzers.Tests.csproj",
       "src\\Components\\Authorization\\src\\Microsoft.AspNetCore.Components.Authorization.csproj",
diff --git a/src/Components/Directory.Build.props b/src/Components/Directory.Build.props
@@ -22,7 +22,7 @@
     <!-- Temporary: Remove after package is provided by the SDK -->
     <Reference
       Condition="'$(UsingMicrosoftNETSdkRazor)' == 'true' AND '$(OutputType)' == 'Exe'"
-      Include="Microsoft.AspNetCore.Assets.Pack"
+      Include="Microsoft.AspNetCore.App.Internal.Assets"
       ReferenceOutputAssembly="false" />
   </ItemGroup>
 
diff --git a/src/ProjectTemplates/TestInfrastructure/Directory.Build.props.in b/src/ProjectTemplates/TestInfrastructure/Directory.Build.props.in
@@ -21,7 +21,7 @@
 
   <ItemGroup>
     <PackageReference
-      Include="Microsoft.AspNetCore.Assets.Pack"
+      Include="Microsoft.AspNetCore.App.Internal.Assets"
       Version="${MicrosoftAspNetCoreAppRuntimeVersion}"
       ReferenceOutputAssembly="false" />
   </ItemGroup>
