Reshuffle around stuff in preparation for github actions from @maldworth

drusellers · May 19, 2020 · 7fe6ace · 7fe6ace
1 parent e714ee1
commit 7fe6ace
Show file tree

Hide file tree

Showing 1,567 changed files with 216 additions and 2,572 deletions.
diff --git a/.gitignore b/.gitignore
@@ -34,10 +34,8 @@ packages
 # Tests
 TestResult.xml
 submit.xml
-tests/*
 SolutionVersion.cs
 src/SolutionVersion.cs
-tests
 doc/build/*
 *.[lm]df
 *.runsettings

diff --git a/src/Directory.Build.props → Directory.Build.props b/src/Directory.Build.props → Directory.Build.props
diff --git a/src/MassTransit.sln → MassTransit.sln b/src/MassTransit.sln → MassTransit.sln
diff --git a/src/MassTransit.sln.DotSettings → MassTransit.sln.DotSettings b/src/MassTransit.sln.DotSettings → MassTransit.sln.DotSettings
diff --git a/src/MassTransit.snk → MassTransit.snk b/src/MassTransit.snk → MassTransit.snk
diff --git a/build/paths.cake b/build/paths.cake
@@ -13,7 +13,7 @@ public class BuildPaths
 
 
         var rootDir = context.MakeAbsolute(context.Directory("./"));
-        var solutionDir = rootDir.Combine("src");
+        var solutionDir = rootDir;
         var artifactsDir = rootDir.Combine("artifacts");
 
         // Directories

diff --git a/src/Containers/mt-logo-small.png → mt-logo-small.png b/src/Containers/mt-logo-small.png → mt-logo-small.png
diff --git a/src/signing.props → signing.props b/src/signing.props → signing.props
diff --git a/src/Containers/MassTransit.AspNetCoreIntegration/MassTransit.AspNetCoreIntegration.csproj b/src/Containers/MassTransit.AspNetCoreIntegration/MassTransit.AspNetCoreIntegration.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="../../netfx.props" />
-  <Import Project="../../signing.props" />
+  <Import Project="../../../signing.props" />
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>

diff --git a/src/Containers/MassTransit.AutofacIntegration/MassTransit.AutofacIntegration.csproj b/src/Containers/MassTransit.AutofacIntegration/MassTransit.AutofacIntegration.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="../../netfx.props" />
-  <Import Project="../../signing.props" />
+  <Import Project="../../../signing.props" />
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>

diff --git a/src/Containers/MassTransit.Containers.Tests/MassTransit.Containers.Tests.csproj b/src/Containers/MassTransit.Containers.Tests/MassTransit.Containers.Tests.csproj
diff --git a/...ependencyInjectionIntegration/MassTransit.ExtensionsDependencyInjectionIntegration.csproj b/...ependencyInjectionIntegration/MassTransit.ExtensionsDependencyInjectionIntegration.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="../../netfx.props" />
-  <Import Project="../../signing.props" />
+  <Import Project="../../../signing.props" />
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>

diff --git a/src/Containers/MassTransit.LamarIntegration/MassTransit.LamarIntegration.csproj b/src/Containers/MassTransit.LamarIntegration/MassTransit.LamarIntegration.csproj
@@ -1,5 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="../../netfx.props" />
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>

diff --git a/...ainers/MassTransit.SimpleInjectorIntegration/MassTransit.SimpleInjectorIntegration.csproj b/...ainers/MassTransit.SimpleInjectorIntegration/MassTransit.SimpleInjectorIntegration.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="../../netfx.props" />
-  <Import Project="../../signing.props" />
+  <Import Project="../../../signing.props" />
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>

diff --git a/...Containers/MassTransit.StructureMapIntegration/MassTransit.StructureMapIntegration.csproj b/...Containers/MassTransit.StructureMapIntegration/MassTransit.StructureMapIntegration.csproj
@@ -1,5 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="../../netfx.props" />
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>

diff --git a/src/Containers/MassTransit.WindsorIntegration/MassTransit.WindsorIntegration.csproj b/src/Containers/MassTransit.WindsorIntegration/MassTransit.WindsorIntegration.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="../../netfx.props" />
-  <Import Project="../../signing.props" />
+  <Import Project="../../../signing.props" />
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>

diff --git a/src/Interoperability/mt-logo-small.png b/src/Interoperability/mt-logo-small.png
diff --git a/src/MassTransit.AmazonSqsTransport/MassTransit.AmazonSqsTransport.csproj.DotSettings b/src/MassTransit.AmazonSqsTransport/MassTransit.AmazonSqsTransport.csproj.DotSettings
diff --git a/src/MassTransit.Analyzers/AnalyzerReleases.Shipped.md b/src/MassTransit.Analyzers/AnalyzerReleases.Shipped.md
@@ -0,0 +1,9 @@
+## Release 1.0
+
+### New Rules
+Rule ID | Category | Severity | Notes
+--------|----------|----------|--------------------
+MTA0001 | Usage    | Warning  | MTA0001_AnalyzerName
+MCA0001 | Usage    | Error    | MCA0001_AnalyzerName
+MCA0002 | Usage    | Error    | MCA0002_AnalyzerName
+MCA0003 | Usage    | Info     | MCA0003_AnalyzerName
diff --git a/src/MassTransit.Analyzers/AnalyzerReleases.Unshipped.md b/src/MassTransit.Analyzers/AnalyzerReleases.Unshipped.md
@@ -0,0 +1 @@
+
diff --git a/src/MassTransit.Analyzers/MassTransit.Analyzers.csproj b/src/MassTransit.Analyzers/MassTransit.Analyzers.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="../netfx.props" />
-  <Import Project="../signing.props" />
+  <Import Project="../../signing.props" />
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>

diff --git a/src/MassTransit.Azure.ServiceBus.Core.Tests/MassTransit.Azure.ServiceBus.Core.Tests.csproj b/src/MassTransit.Azure.ServiceBus.Core.Tests/MassTransit.Azure.ServiceBus.Core.Tests.csproj
diff --git a/src/MassTransit.Azure.ServiceBus.Core/MassTransit.Azure.ServiceBus.Core.csproj.DotSettings b/src/MassTransit.Azure.ServiceBus.Core/MassTransit.Azure.ServiceBus.Core.csproj.DotSettings
diff --git a/...Bus/Contexts/NServiceBusConsumeContext.cs → ...Bus/Contexts/NServiceBusConsumeContext.cs b/...Bus/Contexts/NServiceBusConsumeContext.cs → ...Bus/Contexts/NServiceBusConsumeContext.cs
diff --git a/...us/MassTransit.Interop.NServiceBus.csproj → ...us/MassTransit.Interop.NServiceBus.csproj b/...us/MassTransit.Interop.NServiceBus.csproj → ...us/MassTransit.Interop.NServiceBus.csproj
@@ -1,6 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="../../signing.props"/>
-  <Import Project="../../netfx.props"/>
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
@@ -18,6 +16,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\MassTransit\MassTransit.csproj"/>
+    <ProjectReference Include="..\MassTransit\MassTransit.csproj"/>
   </ItemGroup>
 </Project>
diff --git a/...Metadata/INServiceBusTypeMetadataCache.cs → ...Metadata/INServiceBusTypeMetadataCache.cs b/...Metadata/INServiceBusTypeMetadataCache.cs → ...Metadata/INServiceBusTypeMetadataCache.cs
diff --git a/...rviceBus/Metadata/NServiceBusTypeCache.cs → ...rviceBus/Metadata/NServiceBusTypeCache.cs b/...rviceBus/Metadata/NServiceBusTypeCache.cs → ...rviceBus/Metadata/NServiceBusTypeCache.cs
diff --git a/...ceBusSerializerConfigurationExtensions.cs → ...ceBusSerializerConfigurationExtensions.cs b/...ceBusSerializerConfigurationExtensions.cs → ...ceBusSerializerConfigurationExtensions.cs
diff --git a/...Serialization/NServiceBusHeaderAdapter.cs → ...Serialization/NServiceBusHeaderAdapter.cs b/...Serialization/NServiceBusHeaderAdapter.cs → ...Serialization/NServiceBusHeaderAdapter.cs
diff --git a/...ion/NServiceBusJsonMessageDeserializer.cs → ...ion/NServiceBusJsonMessageDeserializer.cs b/...ion/NServiceBusJsonMessageDeserializer.cs → ...ion/NServiceBusJsonMessageDeserializer.cs
diff --git a/...ation/NServiceBusJsonMessageSerializer.cs → ...ation/NServiceBusJsonMessageSerializer.cs b/...ation/NServiceBusJsonMessageSerializer.cs → ...ation/NServiceBusJsonMessageSerializer.cs
diff --git a/...erialization/NServiceBusMessageHeaders.cs → ...erialization/NServiceBusMessageHeaders.cs b/...erialization/NServiceBusMessageHeaders.cs → ...erialization/NServiceBusMessageHeaders.cs
diff --git a/...NServiceBusSendContextHeaderExtensions.cs → ...NServiceBusSendContextHeaderExtensions.cs b/...NServiceBusSendContextHeaderExtensions.cs → ...NServiceBusSendContextHeaderExtensions.cs
diff --git a/...tion/NServiceBusXmlMessageDeserializer.cs → ...tion/NServiceBusXmlMessageDeserializer.cs b/...tion/NServiceBusXmlMessageDeserializer.cs → ...tion/NServiceBusXmlMessageDeserializer.cs
diff --git a/...zation/NServiceBusXmlMessageSerializer.cs → ...zation/NServiceBusXmlMessageSerializer.cs b/...zation/NServiceBusXmlMessageSerializer.cs → ...zation/NServiceBusXmlMessageSerializer.cs
diff --git a/src/MassTransit.PrometheusIntegration/MassTransit.PrometheusIntegration.csproj b/src/MassTransit.PrometheusIntegration/MassTransit.PrometheusIntegration.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="../netfx.props" />
-  <Import Project="../signing.props" />
+  <Import Project="../../signing.props" />
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>

diff --git a/src/MassTransit.SignalR/MassTransit.SignalR.csproj b/src/MassTransit.SignalR/MassTransit.SignalR.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="../netfx.props" />
-  <Import Project="../signing.props" />
+  <Import Project="../../signing.props" />
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
@@ -17,8 +16,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Containers\MassTransit.ExtensionsDependencyInjectionIntegration\MassTransit.ExtensionsDependencyInjectionIntegration.csproj" />
-    <ProjectReference Include="..\MassTransit\MassTransit.csproj" />
+    <ProjectReference Include="..\..\src\Containers\MassTransit.ExtensionsDependencyInjectionIntegration\MassTransit.ExtensionsDependencyInjectionIntegration.csproj" />
+    <ProjectReference Include="..\..\src\MassTransit\MassTransit.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/src/MassTransit.TestFramework/MassTransit.TestFramework.csproj b/src/MassTransit.TestFramework/MassTransit.TestFramework.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="../netfx.props" />
-  <Import Project="../signing.props" />
+  <Import Project="../../signing.props" />
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>

diff --git a/src/MassTransit/MassTransit.csproj b/src/MassTransit/MassTransit.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="../netfx.props" />
-  <Import Project="../signing.props" />
+  <Import Project="../../signing.props" />
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>

diff --git a/src/Persistence/MassTransit.Azure.Storage/MassTransit.Azure.Storage.csproj b/src/Persistence/MassTransit.Azure.Storage/MassTransit.Azure.Storage.csproj
@@ -1,7 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
-  <Import Project="../../netfx.props" />
-  <Import Project="../../signing.props" />
+  <Import Project="../../../signing.props" />
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>

diff --git a/src/Persistence/MassTransit.DapperIntegration/MassTransit.DapperIntegration.csproj b/src/Persistence/MassTransit.DapperIntegration/MassTransit.DapperIntegration.csproj
@@ -1,5 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="../../netfx.props" />
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>

diff --git a/...ce/MassTransit.DocumentDbIntegration.Tests/MassTransit.DocumentDbIntegration.Tests.csproj b/...ce/MassTransit.DocumentDbIntegration.Tests/MassTransit.DocumentDbIntegration.Tests.csproj
diff --git a/src/Persistence/MassTransit.DocumentDbIntegration/MassTransit.DocumentDbIntegration.csproj b/src/Persistence/MassTransit.DocumentDbIntegration/MassTransit.DocumentDbIntegration.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="../../netfx.props" />
-  <Import Project="../../signing.props" />
+  <Import Project="../../../signing.props" />
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>

diff --git a/...sTransit.EntityFrameworkCoreIntegration/MassTransit.EntityFrameworkCoreIntegration.csproj b/...sTransit.EntityFrameworkCoreIntegration/MassTransit.EntityFrameworkCoreIntegration.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="../../netfx.props" />
-  <Import Project="../../signing.props" />
+  <Import Project="../../../signing.props" />
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>

diff --git a/...ence/MassTransit.EntityFrameworkIntegration/MassTransit.EntityFrameworkIntegration.csproj b/...ence/MassTransit.EntityFrameworkIntegration/MassTransit.EntityFrameworkIntegration.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="../../netfx.props" />
-  <Import Project="../../signing.props" />
+  <Import Project="../../../signing.props" />
 
   <PropertyGroup>
     <TargetFramework>netstandard2.1</TargetFramework>
@@ -19,13 +18,4 @@
     <ProjectReference Include="..\..\MassTransit\MassTransit.csproj" />
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">
-    <Reference Include="System" />
-    <Reference Include="System.ComponentModel.DataAnnotations" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-
 </Project>
diff --git a/src/Persistence/MassTransit.MartenIntegration/MassTransit.MartenIntegration.csproj b/src/Persistence/MassTransit.MartenIntegration/MassTransit.MartenIntegration.csproj
@@ -1,5 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="../../netfx.props" />
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>

diff --git a/src/Persistence/MassTransit.MongoDbIntegration/MassTransit.MongoDbIntegration.csproj b/src/Persistence/MassTransit.MongoDbIntegration/MassTransit.MongoDbIntegration.csproj
@@ -1,5 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="../../netfx.props" />
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>

diff --git a/src/Persistence/MassTransit.NHibernateIntegration/MassTransit.NHibernateIntegration.csproj b/src/Persistence/MassTransit.NHibernateIntegration/MassTransit.NHibernateIntegration.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="../../netfx.props" />
-  <Import Project="../../signing.props" />
+  <Import Project="../../../signing.props" />
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
@@ -20,11 +19,4 @@
         <ProjectReference Include="..\..\MassTransit\MassTransit.csproj" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)'=='net461'">
-        <Reference Include="System" />
-        <Reference Include="System.Core" />
-        <Reference Include="System.Data" />
-        <Reference Include="System.Xml" />
-        <Reference Include="System.Transactions" />
-  </ItemGroup>
 </Project>
diff --git a/src/Persistence/MassTransit.RedisIntegration/MassTransit.RedisIntegration.csproj b/src/Persistence/MassTransit.RedisIntegration/MassTransit.RedisIntegration.csproj
@@ -1,5 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="../../netfx.props" />
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
@@ -13,15 +12,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="StackExchange.Redis" Version="1.2.6" Condition="'$(TargetFramework)' == 'net461'" />
-    <PackageReference Include="StackExchange.Redis" Version="2.0.601" Condition="'$(TargetFramework)' != 'net461'" />
+    <PackageReference Include="StackExchange.Redis" Version="2.0.601" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
     <ProjectReference Include="..\..\MassTransit\MassTransit.csproj" />
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Data" />
-  </ItemGroup>
 </Project>
diff --git a/src/Persistence/mt-logo-small.png b/src/Persistence/mt-logo-small.png
diff --git a/src/Samples/MassTransit.Host.Quartz/App.config b/src/Samples/MassTransit.Host.Quartz/App.config