Restructured Fusion Packages (#6991)

ChilliCream · Mar 14, 2024 · 2714fa4 · 2714fa4
1 parent 552d24d
commit 2714fa4
Show file tree

Hide file tree

Showing 27 changed files with 24 additions and 23 deletions.
diff --git a/...ition.Analyzers/ConfigurationGenerator.cs → ...spire.Analyzers/ConfigurationGenerator.cs b/...ition.Analyzers/ConfigurationGenerator.cs → ...spire.Analyzers/ConfigurationGenerator.cs
diff --git a/...mposition.Analyzers/Helpers/CodeWriter.cs → ...rc/Aspire.Analyzers/Helpers/CodeWriter.cs b/...mposition.Analyzers/Helpers/CodeWriter.cs → ...rc/Aspire.Analyzers/Helpers/CodeWriter.cs
diff --git a/...Analyzers/Helpers/CodeWriterExtensions.cs → ...Analyzers/Helpers/CodeWriterExtensions.cs b/...Analyzers/Helpers/CodeWriterExtensions.cs → ...Analyzers/Helpers/CodeWriterExtensions.cs
diff --git a/...on.Analyzers/Helpers/StringBuilderPool.cs → ...re.Analyzers/Helpers/StringBuilderPool.cs b/...on.Analyzers/Helpers/StringBuilderPool.cs → ...re.Analyzers/Helpers/StringBuilderPool.cs
diff --git a/...ion.Analyzers/Helpers/SymbolExtensions.cs → ...ire.Analyzers/Helpers/SymbolExtensions.cs b/...ion.Analyzers/Helpers/SymbolExtensions.cs → ...ire.Analyzers/Helpers/SymbolExtensions.cs
diff --git a/...olate.Fusion.Composition.Analyzers.csproj → ...tChocolate.Fusion.Aspire.Analyzers.csproj b/...olate.Fusion.Composition.Analyzers.csproj → ...tChocolate.Fusion.Aspire.Analyzers.csproj
@@ -11,9 +11,9 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <PackageId>HotChocolate.Fusion.Composition.Analyzers</PackageId>
-    <AssemblyName>HotChocolate.Fusion.Composition.Analyzers</AssemblyName>
-    <RootNamespace>HotChocolate.Fusion.Composition.Analyzers</RootNamespace>
+    <PackageId>HotChocolate.Fusion.Aspire.Analyzers</PackageId>
+    <AssemblyName>HotChocolate.Fusion.Aspire.Analyzers</AssemblyName>
+    <RootNamespace>HotChocolate.Fusion.Aspire.Analyzers</RootNamespace>
     <Description>This package provides source generators for HotChocolate Fusion.</Description>
   </PropertyGroup>
 
@@ -25,7 +25,7 @@
   <ItemGroup>
     <!-- Package the generator in the analyzer directory of the nuget package -->
     <None Include="$(OutputPath)\*.dll" Pack="true" PackagePath="analyzers/dotnet/cs" Visible="false" />
-    <None Include="$(MSBuildThisFileDirectory)HotChocolate.Fusion.Composition.Analyzers.targets" Pack="true" PackagePath="build/HotChocolate.Fusion.Composition.Analyzers.targets" Visible="false" />
+    <None Include="$(MSBuildThisFileDirectory)HotChocolate.Fusion.Aspire.Analyzers.targets" Pack="true" PackagePath="build/HotChocolate.Fusion.Aspire.Analyzers.targets" Visible="false" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/...late.Fusion.Composition.Analyzers.targets → ...Chocolate.Fusion.Aspire.Analyzers.targets b/...late.Fusion.Composition.Analyzers.targets → ...Chocolate.Fusion.Aspire.Analyzers.targets
diff --git a/...position.Analyzers/Models/GatewayClass.cs → ...c/Aspire.Analyzers/Models/GatewayClass.cs b/...position.Analyzers/Models/GatewayClass.cs → ...c/Aspire.Analyzers/Models/GatewayClass.cs
diff --git a/...mposition.Analyzers/Models/GatewayInfo.cs → ...rc/Aspire.Analyzers/Models/GatewayInfo.cs b/...mposition.Analyzers/Models/GatewayInfo.cs → ...rc/Aspire.Analyzers/Models/GatewayInfo.cs
diff --git a/...mposition.Analyzers/Models/ISyntaxInfo.cs → ...rc/Aspire.Analyzers/Models/ISyntaxInfo.cs b/...mposition.Analyzers/Models/ISyntaxInfo.cs → ...rc/Aspire.Analyzers/Models/ISyntaxInfo.cs
diff --git a/...osition.Analyzers/Models/SubgraphClass.cs → .../Aspire.Analyzers/Models/SubgraphClass.cs b/...osition.Analyzers/Models/SubgraphClass.cs → .../Aspire.Analyzers/Models/SubgraphClass.cs
diff --git a/...position.Analyzers/Models/SubgraphInfo.cs → ...c/Aspire.Analyzers/Models/SubgraphInfo.cs b/...position.Analyzers/Models/SubgraphInfo.cs → ...c/Aspire.Analyzers/Models/SubgraphInfo.cs
diff --git a/.../Properties/AnalyzerResources.Designer.cs → .../Properties/AnalyzerResources.Designer.cs b/.../Properties/AnalyzerResources.Designer.cs → .../Properties/AnalyzerResources.Designer.cs
diff --git a/...alyzers/Properties/AnalyzerResources.resx → ...alyzers/Properties/AnalyzerResources.resx b/...alyzers/Properties/AnalyzerResources.resx → ...alyzers/Properties/AnalyzerResources.resx
diff --git a/....Analyzers/Properties/launchSettings.json → ....Analyzers/Properties/launchSettings.json b/....Analyzers/Properties/launchSettings.json → ....Analyzers/Properties/launchSettings.json
diff --git a/...mposition.Analyzers/WellKnownTypeNames.cs → ...rc/Aspire.Analyzers/WellKnownTypeNames.cs b/...mposition.Analyzers/WellKnownTypeNames.cs → ...rc/Aspire.Analyzers/WellKnownTypeNames.cs
diff --git a/src/HotChocolate/Fusion/src/Aspire/HotChocolate.Fusion.Aspire.csproj b/src/HotChocolate/Fusion/src/Aspire/HotChocolate.Fusion.Aspire.csproj
@@ -8,6 +8,8 @@
     <RootNamespace>HotChocolate.Fusion</RootNamespace>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
+
+    <IsPackable>true</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/...Fusion.Composition.Analyzers.Tests.csproj → ...late.Fusion.Aspire.Analyzers.Tests.csproj b/...Fusion.Composition.Analyzers.Tests.csproj → ...late.Fusion.Aspire.Analyzers.Tests.csproj
@@ -21,8 +21,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\..\src\Aspire\HotChocolate.Fusion.Aspire.csproj" />
-    <ProjectReference Include="..\..\src\Composition.Analyzers\HotChocolate.Fusion.Composition.Analyzers.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
-    <ProjectReference Include="..\..\src\Composition\HotChocolate.Fusion.Composition.csproj" />
+    <ProjectReference Include="..\..\src\Aspire.Analyzers\HotChocolate.Fusion.Aspire.Analyzers.Tests.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
   </ItemGroup>
 
 </Project>
diff --git a/...st/Composition.Analyzers.Tests/Program.cs → ...on/test/Aspire.Analyzers.Tests/Program.cs b/...st/Composition.Analyzers.Tests/Program.cs → ...on/test/Aspire.Analyzers.Tests/Program.cs
diff --git a/...t/Composition.Analyzers.Tests/Projects.cs → ...n/test/Aspire.Analyzers.Tests/Projects.cs b/...t/Composition.Analyzers.Tests/Projects.cs → ...n/test/Aspire.Analyzers.Tests/Projects.cs
diff --git a/.../test/Composition.Analyzers.Tests/Test.cs → ...usion/test/Aspire.Analyzers.Tests/Test.cs b/.../test/Composition.Analyzers.Tests/Test.cs → ...usion/test/Aspire.Analyzers.Tests/Test.cs
diff --git a/templates/StarWars/content/StarWars.csproj b/templates/StarWars/content/StarWars.csproj
@@ -12,9 +12,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="HotChocolate.AspNetCore" Version="11.1.0" />
-    <PackageReference Include="HotChocolate.AspNetCore.Authorization" Version="11.1.0" />
-    <PackageReference Include="HotChocolate.Data" Version="11.1.0" />
+    <PackageReference Include="HotChocolate.AspNetCore" Version="14.0.0-preview.build.0" />
+    <PackageReference Include="HotChocolate.AspNetCore.Authorization" Version="14.0.0-preview.build.0" />
+    <PackageReference Include="HotChocolate.Data" Version="14.0.0-preview.build.0" />
   </ItemGroup>
 
 </Project>
diff --git a/templates/v12/function-isolated/HotChocolate.Template.AzureFunctions.Isolated.csproj b/templates/v12/function-isolated/HotChocolate.Template.AzureFunctions.Isolated.csproj
@@ -18,8 +18,8 @@
     <PackageReference Include="Microsoft.Azure.Functions.Worker" Version="1.6.0" />
     <PackageReference Include="Microsoft.Azure.Functions.Worker.Extensions.Http" Version="3.0.12" />
     <PackageReference Include="Microsoft.Azure.Functions.Worker.Sdk" Version="1.3.0" />
-    <PackageReference Include="HotChocolate.AzureFunctions.IsolatedProcess" Version="11.1.0" />
-    <PackageReference Include="HotChocolate.Types.Analyzers" Version="11.1.0">
+    <PackageReference Include="HotChocolate.AzureFunctions.IsolatedProcess" Version="14.0.0-preview.build.0" />
+    <PackageReference Include="HotChocolate.Types.Analyzers" Version="14.0.0-preview.build.0">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>

diff --git a/templates/v12/function/HotChocolate.Template.AzureFunctions.csproj b/templates/v12/function/HotChocolate.Template.AzureFunctions.csproj
@@ -16,8 +16,8 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Sdk.Functions" Version="4.0.1" />
     <PackageReference Include="Microsoft.Azure.Functions.Extensions" Version="1.1.0" />
-    <PackageReference Include="HotChocolate.AzureFunctions" Version="11.1.0" />
-    <PackageReference Include="HotChocolate.Types.Analyzers" Version="11.1.0">
+    <PackageReference Include="HotChocolate.AzureFunctions" Version="14.0.0-preview.build.0" />
+    <PackageReference Include="HotChocolate.Types.Analyzers" Version="14.0.0-preview.build.0">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>

diff --git a/templates/v12/gateway-bcp/HotChocolate.Template.Gateway.Managed.csproj b/templates/v12/gateway-bcp/HotChocolate.Template.Gateway.Managed.csproj
@@ -10,10 +10,10 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.HeaderPropagation" Version="7.0.9" />
     <PackageReference Include="BananaCakePop.Services" Version="1.2.0-preview.9" />
-    <PackageReference Include="HotChocolate.AspNetCore" Version="11.1.0" />
-    <PackageReference Include="HotChocolate.AspNetCore.CommandLine" Version="11.1.0" />
-    <PackageReference Include="HotChocolate.Diagnostics" Version="11.1.0" />
-    <PackageReference Include="HotChocolate.Fusion" Version="11.1.0" />
+    <PackageReference Include="HotChocolate.AspNetCore" Version="14.0.0-preview.build.0" />
+    <PackageReference Include="HotChocolate.AspNetCore.CommandLine" Version="14.0.0-preview.build.0" />
+    <PackageReference Include="HotChocolate.Diagnostics" Version="14.0.0-preview.build.0" />
+    <PackageReference Include="HotChocolate.Fusion" Version="14.0.0-preview.build.0" />
   </ItemGroup>
 
 </Project>
diff --git a/templates/v12/gateway/HotChocolate.Template.Gateway.csproj b/templates/v12/gateway/HotChocolate.Template.Gateway.csproj
@@ -8,9 +8,9 @@
 
   <ItemGroup>
     <PackageReference Include="BananaCakePop.Services" Version="1.0.0" />
-    <PackageReference Include="HotChocolate.AspNetCore" Version="11.1.0" />
-    <PackageReference Include="HotChocolate.AspNetCore.CommandLine" Version="11.1.0" />
-    <PackageReference Include="HotChocolate.Fusion" Version="11.1.0" />
+    <PackageReference Include="HotChocolate.AspNetCore" Version="14.0.0-preview.build.0" />
+    <PackageReference Include="HotChocolate.AspNetCore.CommandLine" Version="14.0.0-preview.build.0" />
+    <PackageReference Include="HotChocolate.Fusion" Version="14.0.0-preview.build.0" />
   </ItemGroup>
 
 </Project>
diff --git a/templates/v12/server/HotChocolate.Template.Server.csproj b/templates/v12/server/HotChocolate.Template.Server.csproj
@@ -12,9 +12,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="HotChocolate.AspNetCore" Version="11.1.0" />
-    <PackageReference Include="HotChocolate.AspNetCore.CommandLine" Version="11.1.0" />
-    <PackageReference Include="HotChocolate.Types.Analyzers" Version="11.1.0">
+    <PackageReference Include="HotChocolate.AspNetCore" Version="14.0.0-preview.build.0" />
+    <PackageReference Include="HotChocolate.AspNetCore.CommandLine" Version="14.0.0-preview.build.0" />
+    <PackageReference Include="HotChocolate.Types.Analyzers" Version="14.0.0-preview.build.0">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>