repair project file and hide some things that were not meant to be pu…

…blic
rebus-org · Feb 3, 2017 · 673f1d5 · 673f1d5
1 parent 5c009b8
commit 673f1d5
Show file tree

Hide file tree

Showing 10 changed files with 153 additions and 170 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1140,6 +1140,10 @@
 
 * Provide `FakeSyncBus` implementation of `ISyncBus`, which can be used to record events for testing
 
+## 4.0.0
+
+* Hide some internal types that were never meant to be part of the API
+
 ---
 
 [AndreaCuneo]: https://github.com/AndreaCuneo

diff --git a/Rebus.Forklift.Common/Rebus.Forklift.Common.csproj b/Rebus.Forklift.Common/Rebus.Forklift.Common.csproj
@@ -48,18 +48,18 @@
     <None Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Text.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Rebus\Rebus.csproj">
-      <Project>{7D7B7B36-6298-4E85-9A0E-1B415C5B9D12}</Project>
-      <Name>Rebus</Name>
-    </ProjectReference>
-  </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />
     <None Include="Rebus.Forklift.Common.nuspec">
       <SubType>Designer</SubType>
     </None>
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Rebus\Rebus.csproj">
+      <Project>{319215F6-B626-4271-8EDA-E31B876F65C0}</Project>
+      <Name>Rebus</Name>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
     <PreBuildEvent>$(ProjectDir)\..\scripts\patch_assemblyinfo.cmd $(ProjectDir)</PreBuildEvent>

diff --git a/Rebus.NewtonsoftJson/Rebus.NewtonsoftJson.csproj b/Rebus.NewtonsoftJson/Rebus.NewtonsoftJson.csproj
@@ -48,16 +48,16 @@
     <Compile Include="NewtonsoftJsonConfigurationExtensions.cs" />
     <None Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+    <None Include="Rebus.NewtonsoftJson.nuspec" />
+  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Rebus\Rebus.csproj">
-      <Project>{7D7B7B36-6298-4E85-9A0E-1B415C5B9D12}</Project>
+      <Project>{319215F6-B626-4271-8EDA-E31B876F65C0}</Project>
       <Name>Rebus</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-    <None Include="Rebus.NewtonsoftJson.nuspec" />
-  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
     <PreBuildEvent>$(ProjectDir)\..\scripts\patch_assemblyinfo.cmd $(ProjectDir)</PreBuildEvent>

diff --git a/Rebus.Tests.Contracts/Rebus.Tests.Contracts.csproj b/Rebus.Tests.Contracts/Rebus.Tests.Contracts.csproj
@@ -104,11 +104,10 @@
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Rebus\Rebus.csproj">
-      <Project>{7D7B7B36-6298-4E85-9A0E-1B415C5B9D12}</Project>
+      <Project>{319215F6-B626-4271-8EDA-E31B876F65C0}</Project>
       <Name>Rebus</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
     <PreBuildEvent>$(ProjectDir)\..\scripts\patch_assemblyinfo.cmd $(ProjectDir)</PreBuildEvent>

diff --git a/Rebus.Tests/Rebus.Tests.csproj b/Rebus.Tests/Rebus.Tests.csproj
@@ -49,10 +49,8 @@
     <Reference Include="System" />
     <Reference Include="System.Configuration" />
     <Reference Include="System.Core" />
-    <Reference Include="System.Messaging" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
@@ -200,7 +198,7 @@
       <Name>Rebus.Tests.Contracts</Name>
     </ProjectReference>
     <ProjectReference Include="..\Rebus\Rebus.csproj">
-      <Project>{7D7B7B36-6298-4E85-9A0E-1B415C5B9D12}</Project>
+      <Project>{319215F6-B626-4271-8EDA-E31B876F65C0}</Project>
       <Name>Rebus</Name>
     </ProjectReference>
   </ItemGroup>

diff --git a/Rebus/Rebus.csproj b/Rebus/Rebus.csproj
diff --git a/Rebus/Sagas/CorrelationProperty.cs b/Rebus/Sagas/CorrelationProperty.cs
@@ -6,7 +6,7 @@ namespace Rebus.Sagas
     /// <summary>
     /// Represents a mapping from a field of an incoming message of a specific type to a specific property on a specific type of saga data
     /// </summary>
-    public class CorrelationProperty : ISagaCorrelationProperty
+    class CorrelationProperty : ISagaCorrelationProperty
     {
         /// <summary>
         /// Defines the types that are allowed to use with saga data properties that are intended for correlation

diff --git a/Rebus/Sagas/SagaDataCorrelationProperties.cs b/Rebus/Sagas/SagaDataCorrelationProperties.cs
@@ -9,7 +9,7 @@ namespace Rebus.Sagas
     /// <summary>
     /// Contains a set of correlation properties relevant for one particular saga data
     /// </summary>
-    public class SagaDataCorrelationProperties : IEnumerable<CorrelationProperty>
+    class SagaDataCorrelationProperties : IEnumerable<CorrelationProperty>
     {
         readonly Dictionary<Type, CorrelationProperty[]> _correlationProperties;
         readonly Type _sagaDataType;
@@ -35,8 +35,6 @@ public IEnumerable<CorrelationProperty> ForMessage(object body)
 
             var messageType = body.GetType();
 
-            //var potentialCorrelationProperties = new List<CorrelationProperty>();
-
             var potentialCorrelationProperties = new [] {messageType}.Concat(messageType.GetBaseTypes())
                 .SelectMany(type =>
                 {
@@ -47,18 +45,6 @@ public IEnumerable<CorrelationProperty> ForMessage(object body)
                         : new CorrelationProperty[0];
                 })
                 .ToList();
-            //var messageTypeToCheck = messageType;
-            //while (messageTypeToCheck != null)
-            //{
-            //    CorrelationProperty[] potentialCorrelationproperties;
-
-            //    if (_correlationProperties.TryGetValue(messageTypeToCheck, out potentialCorrelationproperties))
-            //    {
-            //        potentialCorrelationProperties.AddRange(potentialCorrelationproperties);
-            //    }
-
-            //    messageTypeToCheck = messageTypeToCheck.BaseType;
-            //}
 
             if (!potentialCorrelationProperties.Any())
             {

diff --git a/Rebus/Sagas/SagaHelper.cs b/Rebus/Sagas/SagaHelper.cs
@@ -8,7 +8,7 @@ namespace Rebus.Sagas
     /// <summary>
     /// Helper class that can cache configured sets of correlation properties for various saga types
     /// </summary>
-    public class SagaHelper
+    class SagaHelper
     {
         readonly ConcurrentDictionary<string, Dictionary<Type, CorrelationProperty[]>> _cachedCorrelationProperties
                 = new ConcurrentDictionary<string, Dictionary<Type, CorrelationProperty[]>>();

diff --git a/Rebus2.sln b/Rebus2.sln
@@ -1,13 +1,11 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
-VisualStudioVersion = 15.0.26014.0
+VisualStudioVersion = 15.0.26127.3
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "packages", "packages", "{63AB64A3-A453-4663-BDB6-530F2136609D}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Rebus.Tests", "Rebus.Tests\Rebus.Tests.csproj", "{959C65AB-D21A-4582-BC4F-06D1425FF274}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Rebus", "Rebus\Rebus.csproj", "{7D7B7B36-6298-4E85-9A0E-1B415C5B9D12}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".build", ".build", "{1692C59F-82DB-43D3-9982-C883B99E38B2}"
 	ProjectSection(SolutionItems) = preProject
 		scripts\build.cmd = scripts\build.cmd
@@ -29,6 +27,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Rebus.Tests.Contracts", "Re
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{EAB8CED5-4383-48F3-AB54-E57278CDD93B}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Rebus", "Rebus\Rebus.csproj", "{319215F6-B626-4271-8EDA-E31B876F65C0}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -39,10 +39,6 @@ Global
 		{959C65AB-D21A-4582-BC4F-06D1425FF274}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{959C65AB-D21A-4582-BC4F-06D1425FF274}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{959C65AB-D21A-4582-BC4F-06D1425FF274}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7D7B7B36-6298-4E85-9A0E-1B415C5B9D12}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7D7B7B36-6298-4E85-9A0E-1B415C5B9D12}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7D7B7B36-6298-4E85-9A0E-1B415C5B9D12}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7D7B7B36-6298-4E85-9A0E-1B415C5B9D12}.Release|Any CPU.Build.0 = Release|Any CPU
 		{9D2E0972-0006-4CBA-8DC9-3B5A0D3571ED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{9D2E0972-0006-4CBA-8DC9-3B5A0D3571ED}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{9D2E0972-0006-4CBA-8DC9-3B5A0D3571ED}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -55,15 +51,19 @@ Global
 		{F1CFF884-8176-48C2-9D51-E9DAAC8E11FB}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{F1CFF884-8176-48C2-9D51-E9DAAC8E11FB}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F1CFF884-8176-48C2-9D51-E9DAAC8E11FB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{319215F6-B626-4271-8EDA-E31B876F65C0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{319215F6-B626-4271-8EDA-E31B876F65C0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{319215F6-B626-4271-8EDA-E31B876F65C0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{319215F6-B626-4271-8EDA-E31B876F65C0}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{959C65AB-D21A-4582-BC4F-06D1425FF274} = {EAB8CED5-4383-48F3-AB54-E57278CDD93B}
-		{7D7B7B36-6298-4E85-9A0E-1B415C5B9D12} = {63AB64A3-A453-4663-BDB6-530F2136609D}
 		{9D2E0972-0006-4CBA-8DC9-3B5A0D3571ED} = {63AB64A3-A453-4663-BDB6-530F2136609D}
 		{EE1EF14E-78B6-4F9C-B3C2-FAFF43A7DF1B} = {63AB64A3-A453-4663-BDB6-530F2136609D}
 		{F1CFF884-8176-48C2-9D51-E9DAAC8E11FB} = {63AB64A3-A453-4663-BDB6-530F2136609D}
+		{319215F6-B626-4271-8EDA-E31B876F65C0} = {63AB64A3-A453-4663-BDB6-530F2136609D}
 	EndGlobalSection
 EndGlobal