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

Commit 3b832f0

Browse files
timbussmanntimbussmann
authored
Update Release Candidate (#31)
* update dependencies * update to new distributionstrategy API * update test project package dependencies * use particular.packaging * remove unnecessary dependency * Clean up project files * Grammar tweak * Update testing packages * Add Directory.Build.props and GitVersion.yml to solution items * Simplify sample dependencies * Use learning transport instead of MSMQ * Add netstandard2.0 target * Remove unneeded RegisterPublisher calls * Add EnableInstallers call * Move sample into Sample folder * Replace shared project with Compile item * Fixed mixed spaces and tabs
1 parent 997aada commit 3b832f0

30 files changed

Lines changed: 124 additions & 185 deletions

‎src/Directory.Build.props‎

Lines changed: 1 addition & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,8 @@
11
<Project>
22

33
<PropertyGroup>
4+
<LangVersion>latest</LangVersion>
45
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
5-
<LangVersion>7.1</LangVersion>
66
</PropertyGroup>
77

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-
368
</Project>

‎src/Directory.Build.targets‎

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

‎src/EndpointA/EndpointA.csproj‎

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

‎src/EndpointB/EndpointB.projitems‎

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

‎src/EndpointB/EndpointB.shproj‎

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

‎src/EndpointB_1/EndpointB_1.csproj‎

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

‎src/EndpointB_2/EndpointB_2.csproj‎

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

‎src/NServiceBus.FileBasedRouting.sln‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,32 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio 15
4-
VisualStudioVersion = 15.0.26730.12
4+
VisualStudioVersion = 15.0.27130.2020
55
MinimumVisualStudioVersion = 15.0.26430.12
66
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NServiceBus.FileBasedRouting", "NServiceBus.FileBasedRouting\NServiceBus.FileBasedRouting.csproj", "{B6417CA5-3892-4C53-8356-31018692AE35}"
77
EndProject
88
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Sample", "Sample", "{5C4D228C-9FF6-4F63-B413-68CC922EB652}"
99
EndProject
10-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Contracts", "Contracts\Contracts.csproj", "{FB64C215-540A-4ED1-901F-1E0A242D0908}"
10+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Contracts", "Sample\Contracts\Contracts.csproj", "{FB64C215-540A-4ED1-901F-1E0A242D0908}"
1111
EndProject
12-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EndpointA", "EndpointA\EndpointA.csproj", "{8B25A222-B70F-490C-8EF4-E8B788563176}"
12+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EndpointA", "Sample\EndpointA\EndpointA.csproj", "{8B25A222-B70F-490C-8EF4-E8B788563176}"
1313
EndProject
14-
Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "EndpointB", "EndpointB\EndpointB.shproj", "{54093E78-EB7C-46E5-B495-3D6198EAFA5C}"
14+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EndpointB_1", "Sample\EndpointB_1\EndpointB_1.csproj", "{EB4B2281-8C83-4BAB-B35B-A30C94B939FE}"
1515
EndProject
16-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EndpointB_1", "EndpointB_1\EndpointB_1.csproj", "{EB4B2281-8C83-4BAB-B35B-A30C94B939FE}"
17-
EndProject
18-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EndpointB_2", "EndpointB_2\EndpointB_2.csproj", "{9B21E30F-61C0-4404-BB18-88CEBC69122C}"
16+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EndpointB_2", "Sample\EndpointB_2\EndpointB_2.csproj", "{9B21E30F-61C0-4404-BB18-88CEBC69122C}"
1917
EndProject
2018
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tests", "Tests\Tests.csproj", "{01B5FB13-9952-4537-A340-42706EA66019}"
2119
EndProject
2220
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tests.Contracts", "Tests.Contracts\Tests.Contracts.csproj", "{88F2D59F-CE5D-4BD5-B9EB-494A2728AD98}"
2321
EndProject
22+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{4238E063-B249-4935-B50D-177CB083FCED}"
23+
ProjectSection(SolutionItems) = preProject
24+
Directory.Build.props = Directory.Build.props
25+
..\GitVersion.yml = ..\GitVersion.yml
26+
EndProjectSection
27+
EndProject
2428
Global
2529
GlobalSection(SharedMSBuildProjectFiles) = preSolution
26-
EndpointB\EndpointB.projitems*{54093e78-eb7c-46e5-b495-3d6198eafa5c}*SharedItemsImports = 13
2730
EndpointB\EndpointB.projitems*{9b21e30f-61c0-4404-bb18-88cebc69122c}*SharedItemsImports = 4
2831
EndpointB\EndpointB.projitems*{eb4b2281-8c83-4bab-b35b-a30c94b939fe}*SharedItemsImports = 4
2932
EndGlobalSection
@@ -67,7 +70,6 @@ Global
6770
GlobalSection(NestedProjects) = preSolution
6871
{FB64C215-540A-4ED1-901F-1E0A242D0908} = {5C4D228C-9FF6-4F63-B413-68CC922EB652}
6972
{8B25A222-B70F-490C-8EF4-E8B788563176} = {5C4D228C-9FF6-4F63-B413-68CC922EB652}
70-
{54093E78-EB7C-46E5-B495-3D6198EAFA5C} = {5C4D228C-9FF6-4F63-B413-68CC922EB652}
7173
{EB4B2281-8C83-4BAB-B35B-A30C94B939FE} = {5C4D228C-9FF6-4F63-B413-68CC922EB652}
7274
{9B21E30F-61C0-4404-BB18-88CEBC69122C} = {5C4D228C-9FF6-4F63-B413-68CC922EB652}
7375
EndGlobalSection

‎src/NServiceBus.FileBasedRouting/FileBasedRoutingFeature.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -111,13 +111,13 @@ static void UpdateRoutingTable(XmlRoutingFileParser routingFileParser, XmlRoutin
111111
class UpdateRoutingTask : FeatureStartupTask, IDisposable
112112
{
113113
Action updateRoutingCallback;
114-
TimeSpan routeFileUpdateInterval;
115-
Timer updateTimer;
114+
TimeSpan routeFileUpdateInterval;
115+
Timer updateTimer;
116116

117117
public UpdateRoutingTask(Action updateRoutingCallback, TimeSpan routeFileUpdateInterval)
118118
{
119-
this.updateRoutingCallback = updateRoutingCallback;
120-
this.routeFileUpdateInterval = routeFileUpdateInterval;
119+
this.updateRoutingCallback = updateRoutingCallback;
120+
this.routeFileUpdateInterval = routeFileUpdateInterval;
121121
}
122122

123123
protected override Task OnStart(IMessageSession session)

‎src/NServiceBus.FileBasedRouting/NServiceBus.FileBasedRouting.csproj‎

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,23 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
33
<PropertyGroup>
4-
<TargetFrameworks>net452</TargetFrameworks>
4+
<TargetFrameworks>net452;netstandard2.0</TargetFrameworks>
55
<SignAssembly>true</SignAssembly>
66
<AssemblyOriginatorKeyFile>$(SolutionDir)NServiceBus.snk</AssemblyOriginatorKeyFile>
7-
<GenerateDocumentationFile>true</GenerateDocumentationFile>
87
</PropertyGroup>
8+
99
<PropertyGroup>
10-
<Description>NServiceBus support for defining message routing via XML file</Description>
11-
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
10+
<Description>NServiceBus support for defining message routing via XML files</Description>
1211
</PropertyGroup>
12+
1313
<ItemGroup>
14-
<PackageReference Include="NServiceBus" Version="[7.0.0-*, 8.0.0)" />
14+
<PackageReference Include="NServiceBus" Version="[7.0.0-beta0012, 8.0.0)" />
15+
<PackageReference Include="Particular.CodeRules" Version="0.2.0" PrivateAssets="All" />
16+
<PackageReference Include="Particular.Packaging" Version="0.1.0" PrivateAssets="All" />
1517
</ItemGroup>
18+
1619
<ItemGroup>
1720
<EmbeddedResource Include="routing.xsd" />
1821
</ItemGroup>
22+
1923
</Project>

0 commit comments

Comments
 (0)