Skip to content

Commit 7e3a4e7

Browse files
internalautomation[bot]tamarariverabording
authored
GitHubSync update - release-4.2 (#577)
* GitHubSync update - release-4.2 * Bump GitHubActionsTestLogger to 2.4.1 * Consolidate NServiceBus to 8.2.4 * Bump Microsoft.NET.Test.Sdk to 17.12.0 * Bump NUnit3TestAdapter to 4.6.0 * Bump Particular.Approvals to 2.0.0 * Bump Particular.Packaging to 4.2.0 * Bump PublicApiGenerator to 11.3.0 * Consolidate Microsoft.Azure.Functions.Worker.Extensions.ServiceBus to 5.16 * Consolidate Microsoft.Azure.Functions.Worker to 1.8.0 * Consolidate NServiceBus.Transport.AzureServiceBus to 3.2.6 * Consolidate NServiceBus.Newtonsoft.Json to 3.0.0 * Replace net7.0 for net8.0 * Bump Microsoft.Azure.Functions.Worker.Extensions.ServiceBus to 5.22.0 * PublicApiGenerator to 11.2.0 * Clean up project files * Unify version between analyzer projects * Add Fody reference --------- Co-authored-by: internalautomation[bot] <85681268+internalautomation[bot]@users.noreply.github.com> Co-authored-by: Tamara Rivera <[email protected]> Co-authored-by: Brandon Ording <[email protected]>
1 parent ffdd95a commit 7e3a4e7

File tree

11 files changed

+138
-41
lines changed

11 files changed

+138
-41
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/ManualTests.HostV4/ManualTests.HostV4.csproj‎

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

33
<PropertyGroup>
4-
<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
4+
<TargetFrameworks>net6.0;net8.0</TargetFrameworks>
55
<AzureFunctionsVersion>v4</AzureFunctionsVersion>
66
<OutputType>Exe</OutputType>
77
<EmitCompilerGeneratedFiles>true</EmitCompilerGeneratedFiles>
@@ -15,9 +15,7 @@
1515

1616
<ItemGroup>
1717
<PackageReference Include="Microsoft.Azure.Functions.Worker.Extensions.Http" Version="3.1.0" />
18-
<PackageReference Include="Microsoft.Azure.Functions.Worker.Sdk" Version="1.14.1" OutputItemType="Analyzer" />
19-
<PackageReference Include="Microsoft.Azure.Functions.Worker" Version="1.14.1" />
20-
<PackageReference Include="NServiceBus.Transport.AzureServiceBus" Version="3.2.1" />
18+
<PackageReference Include="Microsoft.Azure.Functions.Worker.Sdk" Version="1.14.1" />
2119
</ItemGroup>
2220

2321
<ItemGroup>

‎src/NServiceBus.AzureFunctions.Analyzer.Tests/NServiceBus.AzureFunctions.Analyzer.Tests.csproj‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,19 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="GitHubActionsTestLogger" Version="2.3.3" />
11-
<!-- this package can only be upgraded when we drop support for older versions of Visual Studio -->
12-
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="3.11.0" />
13-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
10+
<PackageReference Include="GitHubActionsTestLogger" Version="2.4.1" />
11+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
1412
<PackageReference Include="NUnit" Version="3.14.0" />
15-
<PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
13+
<PackageReference Include="NUnit3TestAdapter" Version="4.6.0" />
14+
</ItemGroup>
15+
16+
<ItemGroup>
17+
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="3.11.0" />
1618
</ItemGroup>
1719

1820
<ItemGroup>
1921
<ProjectReference Include="..\NServiceBus.AzureFunctions.Analyzer\NServiceBus.AzureFunctions.Analyzer.csproj" />
2022
<ProjectReference Include="..\NServiceBus.AzureFunctions.Worker.ServiceBus\NServiceBus.AzureFunctions.Worker.ServiceBus.csproj" />
2123
</ItemGroup>
22-
24+
2325
</Project>

‎src/NServiceBus.AzureFunctions.Analyzer/NServiceBus.AzureFunctions.Analyzer.csproj‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,15 @@
1010
</PropertyGroup>
1111

1212
<ItemGroup>
13-
<PackageReference Include="Particular.Packaging" Version="2.3.0" PrivateAssets="All" />
1413
<!-- this package can only be upgraded when we drop support for older versions of Visual Studio -->
1514
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="3.11.0" />
15+
<PackageReference Include="Particular.Packaging" Version="4.2.0" PrivateAssets="All" />
1616
</ItemGroup>
1717

1818
<Target Name="UseMajorMinorPatchForAssemblyVersion" AfterTargets="MinVer">
1919
<PropertyGroup>
2020
<AssemblyVersion>$(MinVerMajor).$(MinVerMinor).$(MinVerPatch).0</AssemblyVersion>
2121
</PropertyGroup>
2222
</Target>
23+
2324
</Project>

‎src/NServiceBus.AzureFunctions.Worker.ServiceBus.Tests/NServiceBus.AzureFunctions.Worker.ServiceBus.Tests.csproj‎

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,21 +11,16 @@
1111
</ItemGroup>
1212

1313
<ItemGroup>
14-
<PackageReference Include="GitHubActionsTestLogger" Version="2.3.3" />
15-
<!-- DO NOT REMOVE Microsoft.Azure.Functions.Worker, it is added so that dependabot knows about version changes-->
16-
<PackageReference Include="Microsoft.Azure.Functions.Worker" Version="1.14.1" />
17-
<!-- DO NOT REMOVE Microsoft.Azure.Functions.Worker.Extensions.ServiceBus, it is added so that dependabot knows about version changes-->
18-
<PackageReference Include="Microsoft.Azure.Functions.Worker.Extensions.ServiceBus" Version="5.16.0" />
19-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
14+
<PackageReference Include="GitHubActionsTestLogger" Version="2.4.1" />
15+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
2016
<PackageReference Include="NUnit" Version="3.14.0" />
21-
<PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
22-
<PackageReference Include="NServiceBus.Transport.AzureServiceBus" Version="3.2.1" />
17+
<PackageReference Include="NUnit3TestAdapter" Version="4.6.0" />
2318
</ItemGroup>
2419

2520
<ItemGroup>
26-
<PackageReference Include="NServiceBus.AcceptanceTesting" Version="8.1.3" />
27-
<PackageReference Include="Particular.Approvals" Version="0.5.0" />
28-
<PackageReference Include="PublicApiGenerator" Version="11.0.0" />
21+
<PackageReference Include="NServiceBus.AcceptanceTesting" Version="8.2.4" />
22+
<PackageReference Include="Particular.Approvals" Version="2.0.0" />
23+
<PackageReference Include="PublicApiGenerator" Version="11.2.0" />
2924
</ItemGroup>
30-
25+
3126
</Project>

‎src/NServiceBus.AzureFunctions.Worker.ServiceBus/NServiceBus.AzureFunctions.Worker.ServiceBus.csproj‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,17 @@
1717
</ItemGroup>
1818

1919
<ItemGroup>
20-
<PackageReference Include="Microsoft.Azure.Functions.Worker.Extensions.ServiceBus" Version="[5.16.0, 6.0.0)" />
21-
<PackageReference Include="Microsoft.Azure.Functions.Worker" Version="[1.8.0, 2.0.0)" />
22-
<PackageReference Include="NServiceBus" Version="8.1.3" />
23-
<PackageReference Include="NServiceBus.Transport.AzureServiceBus" Version="[3.0.0, 4.0.0)" />
24-
<PackageReference Include="NServiceBus.Newtonsoft.Json" Version="[3.0.0, 4.0.0)" />
25-
<PackageReference Include="Particular.Packaging" Version="3.0.0" PrivateAssets="All" />
20+
<PackageReference Include="Microsoft.Azure.Functions.Worker" Version="1.8.0" />
21+
<PackageReference Include="Microsoft.Azure.Functions.Worker.Extensions.ServiceBus" Version="5.22.0" />
22+
<PackageReference Include="NServiceBus" Version="8.2.4" />
23+
<PackageReference Include="NServiceBus.Newtonsoft.Json" Version="3.0.0" />
24+
<PackageReference Include="NServiceBus.Transport.AzureServiceBus" Version="3.2.6" />
25+
</ItemGroup>
26+
27+
<ItemGroup>
28+
<PackageReference Include="Fody" Version="6.9.1" PrivateAssets="All" />
2629
<PackageReference Include="Obsolete.Fody" Version="5.3.0" PrivateAssets="All" />
30+
<PackageReference Include="Particular.Packaging" Version="4.2.0" PrivateAssets="All" />
2731
</ItemGroup>
2832

2933
<Target Name="AddSourceGeneratorToPackage" BeforeTargets="_GetPackageFiles">

‎src/NServiceBus.AzureFunctions.Worker.SourceGenerator.Tests/NServiceBus.AzureFunctions.Worker.SourceGenerator.Tests.csproj‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,15 @@
1212
</ItemGroup>
1313

1414
<ItemGroup>
15-
<PackageReference Include="GitHubActionsTestLogger" Version="2.3.3" />
16-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
15+
<PackageReference Include="GitHubActionsTestLogger" Version="2.4.1" />
16+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
1717
<PackageReference Include="NUnit" Version="3.14.0" />
18-
<PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
18+
<PackageReference Include="NUnit3TestAdapter" Version="4.6.0" />
1919
</ItemGroup>
2020

2121
<ItemGroup>
22-
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.10.0" />
23-
<PackageReference Include="Particular.Approvals" Version="0.5.0" />
22+
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.11.0" />
23+
<PackageReference Include="Particular.Approvals" Version="2.0.0" />
2424
</ItemGroup>
2525

2626
</Project>

‎src/NServiceBus.AzureFunctions.Worker.SourceGenerator/NServiceBus.AzureFunctions.Worker.SourceGenerator.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111

1212
<ItemGroup>
1313
<!-- Avoid updating this packages as this might cause the code generator to fail to load on projects using older .NET SDKs / Visual Studio -->
14-
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.10.0" PrivateAssets="All" />
15-
<PackageReference Include="Particular.Packaging" Version="3.0.0" PrivateAssets="All" />
14+
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.11.0" PrivateAssets="All" />
15+
<PackageReference Include="Particular.Packaging" Version="4.2.0" PrivateAssets="All" />
1616
</ItemGroup>
1717

1818
<Target Name="UseMajorMinorPatchForAssemblyVersion" AfterTargets="MinVer">

‎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>

0 commit comments

Comments
 (0)