Misc. cleanup (#229)

bording · web-flow · commit da2e6388f5bd · 2025-03-25T16:15:50.000-04:00
* Add global.json

* Clean up project files

* Add Custom.Build.props to Solution Items

* Don't specify default publish configuration
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -72,6 +72,6 @@ jobs:
       - name: Run tests
         uses: Particular/run-tests-action@v1.7.0
       - name: Test publish arm64
-        run: dotnet publish --arch arm64 src/ServiceControl.Connector.MassTransit.Host/ServiceControl.Connector.MassTransit.Host.csproj --configuration Release
+        run: dotnet publish src/ServiceControl.Connector.MassTransit.Host/ServiceControl.Connector.MassTransit.Host.csproj --arch arm64
       - name: Test publish amd64
-        run: dotnet publish --arch amd64 src/ServiceControl.Connector.MassTransit.Host/ServiceControl.Connector.MassTransit.Host.csproj --configuration Release
+        run: dotnet publish src/ServiceControl.Connector.MassTransit.Host/ServiceControl.Connector.MassTransit.Host.csproj --arch amd64
diff --git a/global.json b/global.json
@@ -0,0 +1,6 @@
+{
+  "sdk": {
+    "version": "8.0.400",
+    "rollForward": "latestFeature"
+  }
+}
diff --git a/src/ServiceControl.Connector.MassTransit.AcceptanceTests.AmazonSQS/ServiceControl.Connector.MassTransit.AcceptanceTests.AmazonSQS.csproj b/src/ServiceControl.Connector.MassTransit.AcceptanceTests.AmazonSQS/ServiceControl.Connector.MassTransit.AcceptanceTests.AmazonSQS.csproj
@@ -11,10 +11,6 @@
     <ProjectReference Include="..\ServiceControl.Connector.MassTransit.AmazonSQS\ServiceControl.Connector.MassTransit.AmazonSQS.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <PackageReference Include="MassTransit.AmazonSQS" Version="8.3.6" />
-  </ItemGroup>
-
   <ItemGroup>
     <PackageReference Include="GitHubActionsTestLogger" Version="2.4.1" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
@@ -23,6 +19,10 @@
     <PackageReference Include="NUnit3TestAdapter" Version="5.0.0" />
   </ItemGroup>
 
+  <ItemGroup>
+    <PackageReference Include="MassTransit.AmazonSQS" Version="8.3.6" />
+  </ItemGroup>
+
   <ItemGroup>
     <Compile Include="..\ServiceControl.Connector.MassTransit.AcceptanceTests\Shared\**\*.cs" LinkBase="Shared" />
   </ItemGroup>
diff --git a/src/ServiceControl.Connector.MassTransit.AcceptanceTests.AzureServiceBus/ServiceControl.Connector.MassTransit.AcceptanceTests.AzureServiceBus.csproj b/src/ServiceControl.Connector.MassTransit.AcceptanceTests.AzureServiceBus/ServiceControl.Connector.MassTransit.AcceptanceTests.AzureServiceBus.csproj
@@ -11,10 +11,6 @@
     <ProjectReference Include="..\ServiceControl.Connector.MassTransit.AzureServiceBus\ServiceControl.Connector.MassTransit.AzureServiceBus.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <PackageReference Include="MassTransit.Azure.ServiceBus.Core" Version="8.3.6" />
-  </ItemGroup>
-
   <ItemGroup>
     <PackageReference Include="GitHubActionsTestLogger" Version="2.4.1" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
@@ -23,6 +19,10 @@
     <PackageReference Include="NUnit3TestAdapter" Version="5.0.0" />
   </ItemGroup>
 
+  <ItemGroup>
+    <PackageReference Include="MassTransit.Azure.ServiceBus.Core" Version="8.3.6" />
+  </ItemGroup>
+
   <ItemGroup>
     <Compile Include="..\ServiceControl.Connector.MassTransit.AcceptanceTests\Shared\**\*.cs" LinkBase="Shared" />
   </ItemGroup>
diff --git a/src/ServiceControl.Connector.MassTransit.AcceptanceTests.AzureServiceBusDeadLetter/ServiceControl.Connector.MassTransit.AcceptanceTests.AzureServiceBusDeadLetter.csproj b/src/ServiceControl.Connector.MassTransit.AcceptanceTests.AzureServiceBusDeadLetter/ServiceControl.Connector.MassTransit.AcceptanceTests.AzureServiceBusDeadLetter.csproj
@@ -11,10 +11,6 @@
     <ProjectReference Include="..\ServiceControl.Connector.MassTransit.AzureServiceBus\ServiceControl.Connector.MassTransit.AzureServiceBus.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <PackageReference Include="MassTransit.Azure.ServiceBus.Core" Version="8.3.6" />
-  </ItemGroup>
-
   <ItemGroup>
     <PackageReference Include="GitHubActionsTestLogger" Version="2.4.1" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
@@ -23,6 +19,10 @@
     <PackageReference Include="NUnit3TestAdapter" Version="5.0.0" />
   </ItemGroup>
 
+  <ItemGroup>
+    <PackageReference Include="MassTransit.Azure.ServiceBus.Core" Version="8.3.6" />
+  </ItemGroup>
+
   <ItemGroup>
     <Compile Include="..\ServiceControl.Connector.MassTransit.AcceptanceTests\Shared\**\*.cs" LinkBase="Shared" />
   </ItemGroup>
diff --git a/src/ServiceControl.Connector.MassTransit.AcceptanceTests.RabbitMQ/ServiceControl.Connector.MassTransit.AcceptanceTests.RabbitMQ.csproj b/src/ServiceControl.Connector.MassTransit.AcceptanceTests.RabbitMQ/ServiceControl.Connector.MassTransit.AcceptanceTests.RabbitMQ.csproj
@@ -11,10 +11,6 @@
     <ProjectReference Include="..\ServiceControl.Connector.MassTransit.RabbitMQ\ServiceControl.Connector.MassTransit.RabbitMQ.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <PackageReference Include="MassTransit.RabbitMQ" Version="8.3.1" />
-  </ItemGroup>
-
   <ItemGroup>
     <PackageReference Include="GitHubActionsTestLogger" Version="2.4.1" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
@@ -23,6 +19,10 @@
     <PackageReference Include="NUnit3TestAdapter" Version="5.0.0" />
   </ItemGroup>
 
+  <ItemGroup>
+    <PackageReference Include="MassTransit.RabbitMQ" Version="8.3.1" />
+  </ItemGroup>
+
   <ItemGroup>
     <Compile Include="..\ServiceControl.Connector.MassTransit.AcceptanceTests\Shared\**\*.cs" LinkBase="Shared" />
   </ItemGroup>
diff --git a/src/ServiceControl.Connector.MassTransit.AcceptanceTests/ServiceControl.Connector.MassTransit.AcceptanceTests.csproj b/src/ServiceControl.Connector.MassTransit.AcceptanceTests/ServiceControl.Connector.MassTransit.AcceptanceTests.csproj
@@ -11,10 +11,4 @@
     <ProjectReference Include="..\ServiceControl.Connector.MassTransit\ServiceControl.Connector.MassTransit.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <PackageReference Include="MassTransit" Version="8.3.6" />
-    <PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.1" />
-    <PackageReference Include="NServiceBus.AcceptanceTesting" Version="9.2.6" />
-  </ItemGroup>
-
 </Project>
diff --git a/src/ServiceControl.Connector.MassTransit.AmazonSQS/ServiceControl.Connector.MassTransit.AmazonSQS.csproj b/src/ServiceControl.Connector.MassTransit.AmazonSQS/ServiceControl.Connector.MassTransit.AmazonSQS.csproj
@@ -4,16 +4,13 @@
     <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
-    <RootNamespace>ServiceControl.Connector.MassTransit.AmazonSQS</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\ServiceControl.Connector.MassTransit\ServiceControl.Connector.MassTransit.csproj" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="AWSSDK.SQS" Version="3.7.400.100" />
-    <PackageReference Include="MassTransit" Version="8.3.6" />
     <PackageReference Include="NServiceBus.AmazonSQS" Version="7.2.0" />
   </ItemGroup>
 
diff --git a/src/ServiceControl.Connector.MassTransit.AzureServiceBus/ServiceControl.Connector.MassTransit.AzureServiceBus.csproj b/src/ServiceControl.Connector.MassTransit.AzureServiceBus/ServiceControl.Connector.MassTransit.AzureServiceBus.csproj
@@ -4,16 +4,13 @@
     <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
-    <RootNamespace>ServiceControl.Connector.MassTransit.AzureServiceBus</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\ServiceControl.Connector.MassTransit\ServiceControl.Connector.MassTransit.csproj" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="MassTransit" Version="8.3.6" />
-    <PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.2" />
     <PackageReference Include="NServiceBus.Transport.AzureServiceBus" Version="4.3.0-alpha.1" />
   </ItemGroup>
 
diff --git a/src/ServiceControl.Connector.MassTransit.Host/Dockerfile b/src/ServiceControl.Connector.MassTransit.Host/Dockerfile
@@ -5,7 +5,7 @@ COPY . /import
 WORKDIR /import
 ENV CI=true
 
-RUN dotnet publish src/ServiceControl.Connector.MassTransit.Host/ServiceControl.Connector.MassTransit.Host.csproj --configuration Release --arch $TARGETARCH --output /build
+RUN dotnet publish src/ServiceControl.Connector.MassTransit.Host/ServiceControl.Connector.MassTransit.Host.csproj --arch $TARGETARCH --output /build
 
 # Runtime image
 FROM mcr.microsoft.com/dotnet/runtime:8.0-noble-chiseled
diff --git a/src/ServiceControl.Connector.MassTransit.Host/ServiceControl.Connector.MassTransit.Host.csproj b/src/ServiceControl.Connector.MassTransit.Host/ServiceControl.Connector.MassTransit.Host.csproj
@@ -1,29 +1,26 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
-    <PropertyGroup>
-      <OutputType>Exe</OutputType>
-      <TargetFramework>net8.0</TargetFramework>
-      <ImplicitUsings>enable</ImplicitUsings>
-      <Nullable>enable</Nullable>
-      <IsPublishable>true</IsPublishable>
-      <ServerGarbageCollection>true</ServerGarbageCollection>
-    </PropertyGroup>
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net8.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
 
-    <ItemGroup>
-      <ProjectReference Include="..\ServiceControl.Connector.MassTransit.AmazonSQS\ServiceControl.Connector.MassTransit.AmazonSQS.csproj" />
-      <ProjectReference Include="..\ServiceControl.Connector.MassTransit.AzureServiceBus\ServiceControl.Connector.MassTransit.AzureServiceBus.csproj" />
-      <ProjectReference Include="..\ServiceControl.Connector.MassTransit.RabbitMQ\ServiceControl.Connector.MassTransit.RabbitMQ.csproj" />
-      <ProjectReference Include="..\ServiceControl.Connector.MassTransit\ServiceControl.Connector.MassTransit.csproj" />
-    </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\ServiceControl.Connector.MassTransit.AmazonSQS\ServiceControl.Connector.MassTransit.AmazonSQS.csproj" />
+    <ProjectReference Include="..\ServiceControl.Connector.MassTransit.AzureServiceBus\ServiceControl.Connector.MassTransit.AzureServiceBus.csproj" />
+    <ProjectReference Include="..\ServiceControl.Connector.MassTransit.RabbitMQ\ServiceControl.Connector.MassTransit.RabbitMQ.csproj" />
+  </ItemGroup>
 
-    <ItemGroup>
-      <PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.1" />
-      <PackageReference Include="NServiceBus.Extensions.Logging" Version="3.0.1" />
-      <PackageReference Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
-    </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.1" />
+    <PackageReference Include="NServiceBus.Extensions.Logging" Version="3.0.1" />
+    <PackageReference Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
+  </ItemGroup>
 
-    <ItemGroup>
-      <None Update="queues.txt" CopyToOutputDirectory="PreserveNewest" />
-    </ItemGroup>
+  <ItemGroup>
+    <None Update="queues.txt" CopyToOutputDirectory="PreserveNewest" />
+  </ItemGroup>
 
 </Project>
diff --git a/src/ServiceControl.Connector.MassTransit.RabbitMQ/ServiceControl.Connector.MassTransit.RabbitMQ.csproj b/src/ServiceControl.Connector.MassTransit.RabbitMQ/ServiceControl.Connector.MassTransit.RabbitMQ.csproj
@@ -4,7 +4,6 @@
     <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
-    <RootNamespace>ServiceControl.Connector.MassTransit.RabbitMQ</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/ServiceControl.Connector.MassTransit.Tests/ServiceControl.Connector.MassTransit.Tests.csproj b/src/ServiceControl.Connector.MassTransit.Tests/ServiceControl.Connector.MassTransit.Tests.csproj
@@ -1,10 +1,10 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
-    <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
-        <ImplicitUsings>enable</ImplicitUsings>
-        <Nullable>enable</Nullable>
-    </PropertyGroup>
+  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\ServiceControl.Connector.MassTransit\ServiceControl.Connector.MassTransit.csproj" />
diff --git a/src/ServiceControl.Connector.MassTransit.sln b/src/ServiceControl.Connector.MassTransit.sln
@@ -36,6 +36,7 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{E2E469A5-FDD8-47A5-913F-352C7D3073BF}"
 	ProjectSection(SolutionItems) = preProject
 		..\Container-README.md = ..\Container-README.md
+		Custom.Build.props = Custom.Build.props
 	EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ServiceControl.Connector.MassTransit.AcceptanceTests.AzureServiceBusDeadLetter", "ServiceControl.Connector.MassTransit.AcceptanceTests.AzureServiceBusDeadLetter\ServiceControl.Connector.MassTransit.AcceptanceTests.AzureServiceBusDeadLetter.csproj", "{B76A74EB-2FA7-4052-8CB9-96AAFDAD5AC9}"
@@ -102,11 +103,11 @@ Global
 		{6AF9778E-01F8-46A7-A5A3-461DB0364927} = {5C638B78-B67B-4E06-8C19-B721ADB63F0E}
 		{F54EBF0E-AED4-4F07-AC87-3DA58A763F62} = {0BAC58A0-FD2D-41D6-B800-5BFD4CD8F3D5}
 		{56857E95-4898-4030-B6A1-835C4AD995DA} = {DEE3E467-1759-4C43-B551-1CBC94E09BFF}
-		{AD00DB16-6C71-4E38-B93D-2850D68A79C5} = {F5A3D35F-95A6-41F6-857F-866CA96E06FD}
 		{5739A403-B999-4F0B-B581-41747EA248F1} = {F5A3D35F-95A6-41F6-857F-866CA96E06FD}
-		{93E5D84C-5CC7-4628-804C-A29B62C0C7E1} = {F5A3D35F-95A6-41F6-857F-866CA96E06FD}
-		{9FD1F088-00D2-4FE7-9424-72BF6D38E98A} = {F5A3D35F-95A6-41F6-857F-866CA96E06FD}
 		{2A84EF27-9F36-4EF3-BCC6-6213C725FC9D} = {F5A3D35F-95A6-41F6-857F-866CA96E06FD}
+		{AD00DB16-6C71-4E38-B93D-2850D68A79C5} = {F5A3D35F-95A6-41F6-857F-866CA96E06FD}
+		{9FD1F088-00D2-4FE7-9424-72BF6D38E98A} = {F5A3D35F-95A6-41F6-857F-866CA96E06FD}
+		{93E5D84C-5CC7-4628-804C-A29B62C0C7E1} = {F5A3D35F-95A6-41F6-857F-866CA96E06FD}
 		{D1335BCA-C2A5-415D-8877-61FA146391AC} = {F5A3D35F-95A6-41F6-857F-866CA96E06FD}
 		{B76A74EB-2FA7-4052-8CB9-96AAFDAD5AC9} = {F5A3D35F-95A6-41F6-857F-866CA96E06FD}
 	EndGlobalSection
diff --git a/src/ServiceControl.Connector.MassTransit/ServiceControl.Connector.MassTransit.csproj b/src/ServiceControl.Connector.MassTransit/ServiceControl.Connector.MassTransit.csproj
@@ -1,16 +1,13 @@
-<Project Sdk="Microsoft.NET.Sdk">
+﻿<Project Sdk="Microsoft.NET.Sdk">
 
-    <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
-        <ImplicitUsings>enable</ImplicitUsings>
-        <Nullable>enable</Nullable>
-        <RootNamespace>ServiceControl.Connector.MassTransit</RootNamespace>
-    </PropertyGroup>
+  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="MassTransit" Version="8.3.6" />
-    <PackageReference Include="MassTransit.Abstractions" Version="8.3.6" />
-    <PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.1" />
     <PackageReference Include="NServiceBus" Version="9.2.6" />
     <PackageReference Include="NServiceBus.CustomChecks" Version="5.0.1" />
   </ItemGroup>
