Skip to content
This repository was archived by the owner on Sep 2, 2021. It is now read-only.

Commit 997aada

Browse files
SzymonPobiegaSzymonPobiega
committed
Merge branch 'stuff' into release-2.0
2 parents 462a63a + 31d4795 commit 997aada

53 files changed

Lines changed: 603 additions & 1049 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎GitVersion.yml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
assembly-versioning-scheme: Major
2+
next-version: 2.0
3+
branches:
4+
develop:
5+
tag: beta
6+
release:
7+
tag: rc

‎packaging/nuget/nservicebus.filebasedrouting.nuspec‎

Lines changed: 0 additions & 28 deletions
This file was deleted.

‎src/Contracts/Contracts.csproj‎

Lines changed: 3 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -1,65 +1,9 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
2+
<Project Sdk="Microsoft.NET.Sdk">
43
<PropertyGroup>
5-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
6-
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
7-
<ProjectGuid>{FB64C215-540A-4ED1-901F-1E0A242D0908}</ProjectGuid>
8-
<OutputType>Library</OutputType>
9-
<AppDesignerFolder>Properties</AppDesignerFolder>
10-
<RootNamespace>Contracts</RootNamespace>
11-
<AssemblyName>Contracts</AssemblyName>
12-
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
13-
<FileAlignment>512</FileAlignment>
4+
<TargetFrameworks>net452</TargetFrameworks>
145
</PropertyGroup>
15-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
16-
<DebugSymbols>true</DebugSymbols>
17-
<DebugType>full</DebugType>
18-
<Optimize>false</Optimize>
19-
<OutputPath>bin\Debug\</OutputPath>
20-
<DefineConstants>DEBUG;TRACE</DefineConstants>
21-
<ErrorReport>prompt</ErrorReport>
22-
<WarningLevel>4</WarningLevel>
23-
</PropertyGroup>
24-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
25-
<DebugType>pdbonly</DebugType>
26-
<Optimize>true</Optimize>
27-
<OutputPath>bin\Release\</OutputPath>
28-
<DefineConstants>TRACE</DefineConstants>
29-
<ErrorReport>prompt</ErrorReport>
30-
<WarningLevel>4</WarningLevel>
31-
</PropertyGroup>
32-
<ItemGroup>
33-
<Reference Include="NServiceBus.Core, Version=6.0.0.0, Culture=neutral, PublicKeyToken=9fc386479f8a226c, processorArchitecture=MSIL">
34-
<HintPath>..\packages\NServiceBus.6.1.0\lib\net452\NServiceBus.Core.dll</HintPath>
35-
<Private>True</Private>
36-
</Reference>
37-
<Reference Include="System" />
38-
<Reference Include="System.Core" />
39-
<Reference Include="System.Xml.Linq" />
40-
<Reference Include="System.Data.DataSetExtensions" />
41-
<Reference Include="Microsoft.CSharp" />
42-
<Reference Include="System.Data" />
43-
<Reference Include="System.Net.Http" />
44-
<Reference Include="System.Xml" />
45-
</ItemGroup>
46-
<ItemGroup>
47-
<Compile Include="Commands\DemoCommand.cs" />
48-
<Compile Include="Events\DemoCommandReceived.cs" />
49-
<Compile Include="Events\DemoEvent.cs" />
50-
</ItemGroup>
51-
<ItemGroup>
52-
<Folder Include="Properties\" />
53-
</ItemGroup>
546
<ItemGroup>
55-
<None Include="packages.config" />
7+
<PackageReference Include="NServiceBus" Version="7.0.0-*" />
568
</ItemGroup>
57-
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
58-
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
59-
Other similar extension points exist, see Microsoft.Common.targets.
60-
<Target Name="BeforeBuild">
61-
</Target>
62-
<Target Name="AfterBuild">
63-
</Target>
64-
-->
659
</Project>

‎src/Contracts/packages.config‎

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎src/Directory.Build.props‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
<Project>
2+
3+
<PropertyGroup>
4+
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
5+
<LangVersion>7.1</LangVersion>
6+
</PropertyGroup>
7+
8+
<!-- Workaround for GitVersion 4.0 not creating GitVersionInformation by default -->
9+
<PropertyGroup>
10+
<UpdateAssemblyInfo>true</UpdateAssemblyInfo>
11+
<GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
12+
<GenerateAssemblyInformationalVersionAttribute>false</GenerateAssemblyInformationalVersionAttribute>
13+
<GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
14+
</PropertyGroup>
15+
16+
<!-- Versioning workaround because of https://github.com/NuGet/Home/issues/4790 -->
17+
<PropertyGroup>
18+
<GitVersionTaskVersion>4.0.0-*</GitVersionTaskVersion>
19+
</PropertyGroup>
20+
21+
<ItemGroup>
22+
<PackageReference Include="GitVersionTask" Version="$(GitVersionTaskVersion)" PrivateAssets="All" />
23+
</ItemGroup>
24+
25+
<ImportGroup Condition="'$(ExcludeRestorePackageImports)' == 'true' And '$(MSBuildRuntimeType)' != 'Core'">
26+
<Import
27+
Project="$(UserProfile)\.nuget\packages\gitversiontask\$(GitVersionTaskVersion)\buildMultiTargeting\GitVersionTask.targets"
28+
Condition="Exists('$(UserProfile)\.nuget\packages\gitversiontask\$(GitVersionTaskVersion)\buildMultiTargeting\GitVersionTask.targets')" />
29+
</ImportGroup>
30+
<Target
31+
Name="FixUpVersion"
32+
BeforeTargets="_GenerateRestoreProjectSpec"
33+
DependsOnTargets="GetVersion"
34+
Condition="'$(GitVersion_Task_targets_Imported)' == 'True'" />
35+
36+
</Project>

‎src/Directory.Build.targets‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
<Project>
2+
3+
<PropertyGroup>
4+
<Authors>NServiceBus Ltd</Authors>
5+
<Company>NServiceBus Ltd</Company>
6+
<PackageLicenseUrl>http://particular.net/LicenseAgreement</PackageLicenseUrl>
7+
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
8+
<Copyright>Copyright 2010-$([System.DateTime]::UtcNow.ToString(yyyy)) NServiceBus. All rights reserved</Copyright>
9+
<PackageTags>nservicebus servicebus msmq cqrs publish subscribe</PackageTags>
10+
<PackageIconUrl>http://s3.amazonaws.com/nuget.images/NServiceBus_32.png</PackageIconUrl>
11+
<PackageProjectUrl>https://docs.particular.net/nuget/$(PackageId)</PackageProjectUrl>
12+
<PackageOutputPath>..\..\nugets</PackageOutputPath>
13+
<TargetsForTfmSpecificContentInPackage>$(TargetsForTfmSpecificContentInPackage);IncludePDBsInPackage</TargetsForTfmSpecificContentInPackage>
14+
</PropertyGroup>
15+
16+
<Target Name="IncludePDBsInPackage" Condition="'$(IncludeBuildOutput)' != 'false'">
17+
<ItemGroup>
18+
<TfmSpecificPackageFile Include="$(OutputPath)\$(AssemblyName).pdb" PackagePath="lib/$(TargetFramework)" />
19+
</ItemGroup>
20+
</Target>
21+
22+
</Project>

‎src/EndpointA/App.config‎

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎src/EndpointA/DemoCommandReceivedHandler.cs‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,11 @@
33
using Contracts.Events;
44
using NServiceBus;
55

6-
namespace EndpointA
6+
public class DemoCommandReceivedHandler : IHandleMessages<DemoCommandReceived>
77
{
8-
public class DemoCommandReceivedHandler : IHandleMessages<DemoCommandReceived>
8+
public Task Handle(DemoCommandReceived message, IMessageHandlerContext context)
99
{
10-
public Task Handle(DemoCommandReceived message, IMessageHandlerContext context)
11-
{
12-
Console.WriteLine($"Received {nameof(DemoCommandReceived)} for command {message.ReceivedCommandId}");
13-
return Task.CompletedTask;
14-
}
10+
Console.WriteLine($"Received {nameof(DemoCommandReceived)} for command {message.ReceivedCommandId}");
11+
return Task.FromResult(0);
1512
}
1613
}

‎src/EndpointA/EndpointA.csproj‎

Lines changed: 12 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -1,86 +1,21 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
2+
<Project Sdk="Microsoft.NET.Sdk">
43
<PropertyGroup>
5-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
6-
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
7-
<ProjectGuid>{8B25A222-B70F-490C-8EF4-E8B788563176}</ProjectGuid>
4+
<TargetFrameworks>net452</TargetFrameworks>
85
<OutputType>Exe</OutputType>
9-
<AppDesignerFolder>Properties</AppDesignerFolder>
10-
<RootNamespace>EndpointA</RootNamespace>
11-
<AssemblyName>EndpointA</AssemblyName>
12-
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
13-
<FileAlignment>512</FileAlignment>
14-
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
156
</PropertyGroup>
16-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
17-
<PlatformTarget>AnyCPU</PlatformTarget>
18-
<DebugSymbols>true</DebugSymbols>
19-
<DebugType>full</DebugType>
20-
<Optimize>false</Optimize>
21-
<OutputPath>bin\Debug\</OutputPath>
22-
<DefineConstants>DEBUG;TRACE</DefineConstants>
23-
<ErrorReport>prompt</ErrorReport>
24-
<WarningLevel>4</WarningLevel>
25-
</PropertyGroup>
26-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
27-
<PlatformTarget>AnyCPU</PlatformTarget>
28-
<DebugType>pdbonly</DebugType>
29-
<Optimize>true</Optimize>
30-
<OutputPath>bin\Release\</OutputPath>
31-
<DefineConstants>TRACE</DefineConstants>
32-
<ErrorReport>prompt</ErrorReport>
33-
<WarningLevel>4</WarningLevel>
34-
</PropertyGroup>
35-
<ItemGroup>
36-
<Reference Include="NServiceBus.Core, Version=6.0.0.0, Culture=neutral, PublicKeyToken=9fc386479f8a226c, processorArchitecture=MSIL">
37-
<HintPath>..\packages\NServiceBus.6.1.0\lib\net452\NServiceBus.Core.dll</HintPath>
38-
<Private>True</Private>
39-
</Reference>
40-
<Reference Include="System" />
41-
<Reference Include="System.Core" />
42-
<Reference Include="System.Xml.Linq" />
43-
<Reference Include="System.Data.DataSetExtensions" />
44-
<Reference Include="Microsoft.CSharp" />
45-
<Reference Include="System.Data" />
46-
<Reference Include="System.Net.Http" />
47-
<Reference Include="System.Xml" />
48-
</ItemGroup>
49-
<ItemGroup>
50-
<Compile Include="DemoCommandReceivedHandler.cs" />
51-
<Compile Include="Program.cs" />
52-
</ItemGroup>
53-
<ItemGroup>
54-
<None Include="App.config" />
55-
<None Include="packages.config" />
56-
</ItemGroup>
57-
<ItemGroup>
58-
<ProjectReference Include="..\Contracts\Contracts.csproj">
59-
<Project>{fb64c215-540a-4ed1-901f-1e0a242d0908}</Project>
60-
<Name>Contracts</Name>
61-
</ProjectReference>
62-
<ProjectReference Include="..\NServiceBus.FileBasedRouting\NServiceBus.FileBasedRouting.csproj">
63-
<Project>{b6417ca5-3892-4c53-8356-31018692ae35}</Project>
64-
<Name>NServiceBus.FileBasedRouting</Name>
65-
</ProjectReference>
66-
</ItemGroup>
677
<ItemGroup>
68-
<Content Include="endpoints.xml">
69-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
70-
</Content>
71-
<Content Include="instance-mapping.xml">
72-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
73-
</Content>
8+
<PackageReference Include="NServiceBus" Version="7.0.0-*" />
9+
<PackageReference Include="NServiceBus.Transport.Msmq" Version="1.0.0-*" />
10+
<ProjectReference Include="..\Contracts\Contracts.csproj" />
11+
<ProjectReference Include="..\NServiceBus.FileBasedRouting\NServiceBus.FileBasedRouting.csproj" />
7412
</ItemGroup>
7513
<ItemGroup>
76-
<Folder Include="Properties\" />
14+
<None Update="endpoints.xml">
15+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
16+
</None>
17+
<None Update="instance-mapping.xml">
18+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
19+
</None>
7720
</ItemGroup>
78-
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
79-
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
80-
Other similar extension points exist, see Microsoft.Common.targets.
81-
<Target Name="BeforeBuild">
82-
</Target>
83-
<Target Name="AfterBuild">
84-
</Target>
85-
-->
8621
</Project>

0 commit comments

Comments
 (0)