Merge pull request julielerman#1 from danielmarbach/master

Open work PR
bcnu · Nov 4, 2014 · 9d977d5 · 9d977d5
2 parents f7736ed + c17fc91
commit 9d977d5
Show file tree

Hide file tree

Showing 17 changed files with 1 addition and 227 deletions.
diff --git a/.nuget/NuGet.Config b/.nuget/NuGet.Config
diff --git a/.nuget/NuGet.exe b/.nuget/NuGet.exe
diff --git a/.nuget/NuGet.targets b/.nuget/NuGet.targets
diff --git a/...anagementBC/ContactManagement.Infrastructure/ContactManagement.Data.Infrastructure.csproj b/...anagementBC/ContactManagement.Infrastructure/ContactManagement.Data.Infrastructure.csproj
@@ -95,13 +95,6 @@
  </EmbeddedResource>
  </ItemGroup>
  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
- <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
- <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
- <PropertyGroup>
- <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http:https://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
- </PropertyGroup>
- <Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
- </Target>
  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
  Other similar extension points exist, see Microsoft.Common.targets.
  <Target Name="BeforeBuild">

diff --git a/ContactManagementBC/ContactManagement.Models/Model/Contact.cs b/ContactManagementBC/ContactManagement.Models/Model/Contact.cs
@@ -14,7 +14,6 @@ public class Contact : WritableEntity {
 
  Source = source;
  PrimaryAddress = Address.DefaultAddress();
- Events = new List<IDomainEvent>();
  }
 
  //Entity Framework concession, also for JSON.Net
@@ -26,8 +25,6 @@ public class Contact : WritableEntity {
  public String Source { get; private set; }
  public Address PrimaryAddress { get; private set; }
 
- public ICollection<IDomainEvent> Events { get; set; }
-
  public static Contact Create(Name name, string source) {
  return new Contact(name, source);
  }

diff --git a/ContactManagementBC/ContactManagementServicesAPI/ContactManagementServicesAPI.csproj b/ContactManagementBC/ContactManagementServicesAPI/ContactManagementServicesAPI.csproj
@@ -161,13 +161,6 @@
  </FlavorProperties>
  </VisualStudio>
  </ProjectExtensions>
- <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
- <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
- <PropertyGroup>
- <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http:https://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
- </PropertyGroup>
- <Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
- </Target>
  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
  Other similar extension points exist, see Microsoft.Common.targets.
  <Target Name="BeforeBuild">

diff --git a/ContactManagementBC/ContactManagementTests/ContactManagementTests.csproj b/ContactManagementBC/ContactManagementTests/ContactManagementTests.csproj
@@ -112,13 +112,6 @@
  </Choose>
  <Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
- <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
- <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
- <PropertyGroup>
- <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http:https://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
- </PropertyGroup>
- <Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
- </Target>
  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
  Other similar extension points exist, see Microsoft.Common.targets.
  <Target Name="BeforeBuild">

diff --git a/ContactManagementBC/ContactManagementTests/PublishToRabbitMqTests.cs b/ContactManagementBC/ContactManagementTests/PublishToRabbitMqTests.cs
@@ -57,7 +57,7 @@ public class PublishToRabbitMqTests {
  try {
  repo.PersistChangeToContact(contact);
  }
- catch (DbUpdateConcurrencyException ex) {
+ catch (DbUpdateConcurrencyException) {
  //swallow this exception so we can be sure that when it happens, the message won't get pushed into the queue
  }
 

diff --git a/MultipleBoundedContextSolution.sln b/MultipleBoundedContextSolution.sln
@@ -3,13 +3,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 2013
 VisualStudioVersion = 12.0.30723.0
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{36B1FEC1-859E-4124-9BCD-E002C5D46E4D}"
- ProjectSection(SolutionItems) = preProject
- .nuget\NuGet.Config = .nuget\NuGet.Config
- .nuget\NuGet.exe = .nuget\NuGet.exe
- .nuget\NuGet.targets = .nuget\NuGet.targets
- EndProjectSection
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Contact Management Bounded Context Plus Data", "Contact Management Bounded Context Plus Data", "{8B5323A2-3ED1-4963-9FE3-6FBF16A11E05}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Sales Order Bounded Context Plus Data", "Sales Order Bounded Context Plus Data", "{5018AD60-C9F3-448B-9695-2C7EAD4A064C}"

diff --git a/OrderManagementBC/ContactRetrieval Service/SalesOrder.Data.ContactRetrievalService.csproj b/OrderManagementBC/ContactRetrieval Service/SalesOrder.Data.ContactRetrievalService.csproj
@@ -111,13 +111,6 @@
  </EmbeddedResource>
  </ItemGroup>
  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
- <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
- <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
- <PropertyGroup>
- <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http:https://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
- </PropertyGroup>
- <Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
- </Target>
  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
  Other similar extension points exist, see Microsoft.Common.targets.
  <Target Name="BeforeBuild">

diff --git a/OrderManagementBC/SalesDomainModel/Customer.cs b/OrderManagementBC/SalesDomainModel/Customer.cs
@@ -18,7 +18,6 @@ public class Customer : WritableEntity {
 
  }
 
- public ICollection<IDomainEvent> Events { get; private set; }
  public Guid ContactId { get; private set; }
  //don't map contact property in EF
  public Contact Contact { get; private set; }

diff --git a/OrderManagementBC/SalesDomainModel/Product.cs b/OrderManagementBC/SalesDomainModel/Product.cs
@@ -8,7 +8,6 @@ namespace SalesDomain {
  //populated from service
  //reference context in EF
  public class Product : ReadOnlyEntity {
- public Guid Id { get; private set; }
  public string Name { get; private set; }
  public string ProductNumber { get; private set; }
  public ProductColor Color { get; private set; }

diff --git a/OrderManagementBC/SalesOrder.Model.Tests/SalesOrder.Model.Tests.csproj b/OrderManagementBC/SalesOrder.Model.Tests/SalesOrder.Model.Tests.csproj
@@ -90,13 +90,6 @@
  </Choose>
  <Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
- <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
- <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
- <PropertyGroup>
- <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http:https://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
- </PropertyGroup>
- <Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
- </Target>
  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
  Other similar extension points exist, see Microsoft.Common.targets.
  <Target Name="BeforeBuild">

diff --git a/OrderManagementBC/SalesOrder.Persistence.Tests/SalesOrder.Persistence.Tests.csproj b/OrderManagementBC/SalesOrder.Persistence.Tests/SalesOrder.Persistence.Tests.csproj
@@ -100,13 +100,6 @@
  </Choose>
  <Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
- <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
- <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
- <PropertyGroup>
- <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http:https://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
- </PropertyGroup>
- <Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
- </Target>
  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
  Other similar extension points exist, see Microsoft.Common.targets.
  <Target Name="BeforeBuild">

diff --git a/OrderManagementBC/SalesOrder.Persistence/SalesOrder.Persistence.csproj b/OrderManagementBC/SalesOrder.Persistence/SalesOrder.Persistence.csproj
@@ -90,13 +90,6 @@
  </EmbeddedResource>
  </ItemGroup>
  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
- <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
- <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
- <PropertyGroup>
- <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http:https://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
- </PropertyGroup>
- <Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
- </Target>
  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
  Other similar extension points exist, see Microsoft.Common.targets.
  <Target Name="BeforeBuild">

diff --git a/Shared Kernel/SharedKernel.csproj b/Shared Kernel/SharedKernel.csproj
@@ -78,13 +78,6 @@
  <None Include="packages.config" />
  </ItemGroup>
  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
- <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
- <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
- <PropertyGroup>
- <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http:https://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
- </PropertyGroup>
- <Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
- </Target>
  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
  Other similar extension points exist, see Microsoft.Common.targets.
  <Target Name="BeforeBuild">

diff --git a/StructureMapContainer/StructureMapContainer.csproj b/StructureMapContainer/StructureMapContainer.csproj
@@ -64,13 +64,6 @@
  <None Include="packages.config" />
  </ItemGroup>
  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
- <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
- <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
- <PropertyGroup>
- <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http:https://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
- </PropertyGroup>
- <Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
- </Target>
  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
  Other similar extension points exist, see Microsoft.Common.targets.
  <Target Name="BeforeBuild">