Skip to content

Commit 69854a5

Browse files
internalautomation[bot]tamarariverabording
authored
GitHubSync update - release-4.0 (#632)
* GitHubSync update - release-4.0 * Bump GitHubActionsTestLogger to 2.4.1 * Bump Microsoft.NET.Test.Sdk to 17.12.0 * Consolidate NServiceBus to 9.1.2 * Consolidate NServiceBus.Gateway to 5.0.0 * Bump NUnit3TestAdapter to 4.6.0 * Bump Particular.Approvals to 2.0.0 * Consolidate RavenDB.Client to 5.4.116 * Bump Particular.Packaging to 4.2.0 * Bump PublicApiGenerator to 11.3.0 * Bump setup-ravendb-action to 1.8.0 * Update to supported Gateway package --------- Co-authored-by: internalautomation[bot] <85681268+internalautomation[bot]@users.noreply.github.com> Co-authored-by: Tamara Rivera <tamita.rivera@gmail.com> Co-authored-by: Brandon Ording <bording@gmail.com>
1 parent aa1e0af commit 69854a5

File tree

8 files changed

+130
-35
lines changed

8 files changed

+130
-35
lines changed

‎src/Directory.Build.props‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77
<EnableNETAnalyzers>true</EnableNETAnalyzers>
88
<AnalysisLevel Condition="'$(AnalysisLevel)' == ''">5.0</AnalysisLevel>
99
<EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
10-
<!-- NuGetAuditMode set to 'all' for tool projects in Directory.Build.targets, other project types default to 'direct' -->
1110
<NuGetAuditLevel>low</NuGetAuditLevel>
11+
<NuGetAuditMode Condition="'$(NuGetAuditMode)' == ''">all</NuGetAuditMode>
1212
<!-- To lock the version of Particular.Analyzers, for example, in a release branch, set this property in Custom.Build.props -->
13-
<ParticularAnalyzersVersion Condition="'$(ParticularAnalyzersVersion)' == ''">2.1.2</ParticularAnalyzersVersion>
13+
<ParticularAnalyzersVersion Condition="'$(ParticularAnalyzersVersion)' == ''">2.1.3</ParticularAnalyzersVersion>
1414
<NServiceBusKey>0024000004800000940000000602000000240000525341310004000001000100dde965e6172e019ac82c2639ffe494dd2e7dd16347c34762a05732b492e110f2e4e2e1b5ef2d85c848ccfb671ee20a47c8d1376276708dc30a90ff1121b647ba3b7259a6bc383b2034938ef0e275b58b920375ac605076178123693c6c4f1331661a62eba28c249386855637780e3ff5f23a6d854700eaa6803ef48907513b92</NServiceBusKey>
1515
<NServiceBusTestsKey>00240000048000009400000006020000002400005253413100040000010001007f16e21368ff041183fab592d9e8ed37e7be355e93323147a1d29983d6e591b04282e4da0c9e18bd901e112c0033925eb7d7872c2f1706655891c5c9d57297994f707d16ee9a8f40d978f064ee1ffc73c0db3f4712691b23bf596f75130f4ec978cf78757ec034625a5f27e6bb50c618931ea49f6f628fd74271c32959efb1c5</NServiceBusTestsKey>
1616
</PropertyGroup>

‎src/Directory.Build.targets‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
<Project>
22

3-
<PropertyGroup>
4-
<NuGetAuditMode Condition="'$(PackAsTool)' == 'true'">all</NuGetAuditMode>
5-
</PropertyGroup>
3+
<Import Project="msbuild\AutomaticVersionRanges.targets" Condition="Exists('msbuild\AutomaticVersionRanges.targets')" />
64

75
</Project>

‎src/NServiceBus.Gateway.RavenDB.AcceptanceTests/NServiceBus.Gateway.RavenDB.AcceptanceTests.csproj‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
44
<TargetFramework>net8.0</TargetFramework>
@@ -9,16 +9,16 @@
99
</ItemGroup>
1010

1111
<ItemGroup>
12-
<PackageReference Include="NServiceBus.AcceptanceTesting" Version="9.0.0" />
13-
<PackageReference Include="NServiceBus.Gateway.AcceptanceTests.Sources" Version="5.0.0" />
14-
<PackageReference Include="RavenDB.Client" Version="5.4.116" />
12+
<PackageReference Include="NServiceBus.AcceptanceTesting" Version="9.2.3" />
13+
<PackageReference Include="NServiceBus.Gateway.AcceptanceTests.Sources" Version="5.1.0" />
1514
</ItemGroup>
1615

1716
<ItemGroup>
18-
<PackageReference Include="GitHubActionsTestLogger" Version="2.3.3" />
19-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
20-
<PackageReference Include="NUnit" Version="3.14.0" />
21-
<PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
17+
<PackageReference Include="GitHubActionsTestLogger" Version="2.4.1" />
18+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
19+
<PackageReference Include="NUnit" Version="4.3.2" />
20+
<PackageReference Include="NUnit.Analyzers" Version="4.6.0" />
21+
<PackageReference Include="NUnit3TestAdapter" Version="4.6.0" />
2222
</ItemGroup>
2323

2424
</Project>

‎src/NServiceBus.Gateway.RavenDB.ClusterWideTx.AcceptanceTests/NServiceBus.Gateway.RavenDB.ClusterWideTx.AcceptanceTests.csproj‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
44
<TargetFramework>net8.0</TargetFramework>
@@ -9,16 +9,16 @@
99
</ItemGroup>
1010

1111
<ItemGroup>
12-
<PackageReference Include="NServiceBus.AcceptanceTesting" Version="9.0.0" />
13-
<PackageReference Include="NServiceBus.Gateway.AcceptanceTests.Sources" Version="5.0.0" />
14-
<PackageReference Include="RavenDB.Client" Version="5.4.116" />
12+
<PackageReference Include="NServiceBus.AcceptanceTesting" Version="9.2.3" />
13+
<PackageReference Include="NServiceBus.Gateway.AcceptanceTests.Sources" Version="5.1.0" />
1514
</ItemGroup>
1615

1716
<ItemGroup>
18-
<PackageReference Include="GitHubActionsTestLogger" Version="2.3.3" />
19-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
20-
<PackageReference Include="NUnit" Version="3.14.0" />
21-
<PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
17+
<PackageReference Include="GitHubActionsTestLogger" Version="2.4.1" />
18+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
19+
<PackageReference Include="NUnit" Version="4.3.2" />
20+
<PackageReference Include="NUnit.Analyzers" Version="4.6.0" />
21+
<PackageReference Include="NUnit3TestAdapter" Version="4.6.0" />
2222
</ItemGroup>
2323

2424
</Project>

‎src/NServiceBus.Gateway.RavenDB.Tests/NServiceBus.Gateway.RavenDB.Tests.csproj‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,16 @@
99
</ItemGroup>
1010

1111
<ItemGroup>
12-
<PackageReference Include="NServiceBus" Version="9.0.0" />
13-
<PackageReference Include="NServiceBus.Gateway" Version="5.0.0" />
14-
<PackageReference Include="Particular.Approvals" Version="1.0.0" />
15-
<PackageReference Include="PublicApiGenerator" Version="11.1.0" />
16-
<PackageReference Include="RavenDB.Client" Version="5.4.116" />
12+
<PackageReference Include="Particular.Approvals" Version="2.0.0" />
13+
<PackageReference Include="PublicApiGenerator" Version="11.3.0" />
1714
</ItemGroup>
1815

1916
<ItemGroup>
20-
<PackageReference Include="GitHubActionsTestLogger" Version="2.3.3" />
21-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
22-
<PackageReference Include="NUnit" Version="3.14.0" />
23-
<PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
17+
<PackageReference Include="GitHubActionsTestLogger" Version="2.4.1" />
18+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
19+
<PackageReference Include="NUnit" Version="4.3.2" />
20+
<PackageReference Include="NUnit.Analyzers" Version="4.6.0" />
21+
<PackageReference Include="NUnit3TestAdapter" Version="4.6.0" />
2422
</ItemGroup>
2523

2624
</Project>

‎src/NServiceBus.Gateway.RavenDB/NServiceBus.Gateway.RavenDB.csproj‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
44
<TargetFramework>net8.0</TargetFramework>
@@ -7,13 +7,13 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="NServiceBus" Version="[9.0.0, 10.0.0)" />
11-
<PackageReference Include="NServiceBus.Gateway" Version="[5.0.0, 6.0.0)" />
12-
<PackageReference Include="RavenDB.Client" Version="[5.4.116, 6.0.0)" />
10+
<PackageReference Include="NServiceBus" Version="9.2.3" />
11+
<PackageReference Include="NServiceBus.Gateway" Version="5.1.0" />
12+
<PackageReference Include="RavenDB.Client" Version="5.4.116" />
1313
</ItemGroup>
1414

1515
<ItemGroup>
16-
<PackageReference Include="Particular.Packaging" Version="4.1.0" PrivateAssets="All" />
16+
<PackageReference Include="Particular.Packaging" Version="4.2.0" PrivateAssets="All" />
1717
</ItemGroup>
1818

1919
</Project>

‎src/msbuild/AutomaticVersionRanges.targets‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
<Project>
2+
3+
<PropertyGroup>
4+
<AutomaticVersionRangesEnabled Condition="'$(AutomaticVersionRangesEnabled)' == '' And '$(Configuration)' == 'Debug'">false</AutomaticVersionRangesEnabled>
5+
<AutomaticVersionRangesEnabled Condition="'$(AutomaticVersionRangesEnabled)' == '' And '$(IsPackable)' == 'false'">false</AutomaticVersionRangesEnabled>
6+
<AutomaticVersionRangesEnabled Condition="'$(AutomaticVersionRangesEnabled)' == '' And '$(ManagePackageVersionsCentrally)' == 'true'">false</AutomaticVersionRangesEnabled>
7+
<AutomaticVersionRangesEnabled Condition="'$(AutomaticVersionRangesEnabled)' == ''">true</AutomaticVersionRangesEnabled>
8+
</PropertyGroup>
9+
10+
<UsingTask TaskName="ConvertToVersionRange" TaskFactory="RoslynCodeTaskFactory" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.Core.dll">
11+
<Task>
12+
<Code Source="$(MSBuildThisFileDirectory)ConvertToVersionRange.cs" />
13+
</Task>
14+
</UsingTask>
15+
16+
<Target Name="ConvertProjectReferenceVersionsToVersionRanges" AfterTargets="_GetProjectReferenceVersions" Condition="'$(AutomaticVersionRangesEnabled)' == 'true'">
17+
<PropertyGroup>
18+
<NumberOfProjectReferences>@(_ProjectReferencesWithVersions->Count())</NumberOfProjectReferences>
19+
</PropertyGroup>
20+
<ConvertToVersionRange Condition="$(NumberOfProjectReferences) &gt; 0" References="@(_ProjectReferencesWithVersions)" VersionProperty="ProjectVersion">
21+
<Output TaskParameter="ReferencesWithVersionRanges" ItemName="_ProjectReferencesWithVersionRanges" />
22+
</ConvertToVersionRange>
23+
<ItemGroup Condition="$(NumberOfProjectReferences) &gt; 0">
24+
<_ProjectReferencesWithVersions Remove="@(_ProjectReferencesWithVersions)" />
25+
<_ProjectReferencesWithVersions Include="@(_ProjectReferencesWithVersionRanges)" />
26+
</ItemGroup>
27+
</Target>
28+
29+
<Target Name="ConvertPackageReferenceVersionsToVersionRanges" BeforeTargets="CollectPackageReferences" Condition="'$(AutomaticVersionRangesEnabled)' == 'true'">
30+
<PropertyGroup>
31+
<NumberOfPackageReferences>@(PackageReference->Count())</NumberOfPackageReferences>
32+
</PropertyGroup>
33+
<ConvertToVersionRange Condition="$(NumberOfPackageReferences) &gt; 0" References="@(PackageReference)" VersionProperty="Version">
34+
<Output TaskParameter="ReferencesWithVersionRanges" ItemName="_PackageReferencesWithVersionRanges" />
35+
</ConvertToVersionRange>
36+
<ItemGroup Condition="$(NumberOfPackageReferences) &gt; 0">
37+
<PackageReference Remove="@(PackageReference)" />
38+
<PackageReference Include="@(_PackageReferencesWithVersionRanges)" />
39+
</ItemGroup>
40+
</Target>
41+
42+
</Project>

‎src/msbuild/ConvertToVersionRange.cs‎

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
using System;
2+
using System.Text.RegularExpressions;
3+
using Microsoft.Build.Framework;
4+
using Microsoft.Build.Utilities;
5+
6+
public class ConvertToVersionRange : Task
7+
{
8+
[Required]
9+
public ITaskItem[] References { get; set; } = [];
10+
11+
[Required]
12+
public string VersionProperty { get; set; } = string.Empty;
13+
14+
[Output]
15+
public ITaskItem[] ReferencesWithVersionRanges { get; private set; } = [];
16+
17+
public override bool Execute()
18+
{
19+
var success = true;
20+
21+
foreach (var reference in References)
22+
{
23+
var automaticVersionRange = reference.GetMetadata("AutomaticVersionRange");
24+
25+
if (automaticVersionRange.Equals("false", StringComparison.OrdinalIgnoreCase))
26+
{
27+
continue;
28+
}
29+
30+
var privateAssets = reference.GetMetadata("PrivateAssets");
31+
32+
if (privateAssets.Equals("All", StringComparison.OrdinalIgnoreCase))
33+
{
34+
continue;
35+
}
36+
37+
var version = reference.GetMetadata(VersionProperty);
38+
var match = Regex.Match(version, @"^\d+");
39+
40+
if (match.Value.Equals(string.Empty, StringComparison.Ordinal))
41+
{
42+
Log.LogError("Reference '{0}' with version '{1}' is not valid for automatic version range conversion. Fix the version or exclude the reference from conversion by setting 'AutomaticVersionRange=\"false\"' on the reference.", reference.ItemSpec, version);
43+
success = false;
44+
continue;
45+
}
46+
47+
var nextMajor = Convert.ToInt32(match.Value) + 1;
48+
49+
var versionRange = $"[{version}, {nextMajor}.0.0)";
50+
reference.SetMetadata(VersionProperty, versionRange);
51+
}
52+
53+
ReferencesWithVersionRanges = References;
54+
55+
return success;
56+
}
57+
}

0 commit comments

Comments
 (0)