Skip to content

Commit d7a7e38

Browse files
internalautomation[bot]bording
internalautomation[bot]
and
bording
authored
GitHubSync update - release-4.4 (#861)
* GitHubSync update - release-4.4 * Update packages to prevent transitive CVE * Update testing packages * Update Microsoft.NET.Sdk.Functions * Update Particular.Approvals * Update Particular.Packaging * Clean up project files * Clean up workflow files * Fix permissions on Linux tool --------- Co-authored-by: internalautomation[bot] <85681268+internalautomation[bot]@users.noreply.github.com> Co-authored-by: Brandon Ording <bording@gmail.com>
1 parent 04c23d7 commit d7a7e38

15 files changed

Lines changed: 152 additions & 59 deletions

File tree

‎.github/workflows/ci.yml‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,19 +35,21 @@ jobs:
3535
- name: Setup .NET SDK
3636
uses: actions/setup-dotnet@v4.0.0
3737
with:
38-
dotnet-version: |
39-
6.0.x
40-
- name: Setup Azure Core tools - Windows
38+
dotnet-version: 8.0.x
39+
- name: Setup Azure Functions Core Tools - Windows
4140
if: runner.os == 'Windows'
4241
run: |
4342
choco install azure-functions-core-tools
4443
echo "PathToFuncExe=C:\ProgramData\chocolatey\lib\azure-functions-core-tools\tools\func.exe" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf-8 -Append
45-
- name: Setup Azure Core tools - Linux
44+
- name: Setup Azure Functions Core Tools - Linux
4645
if: runner.os == 'Linux'
4746
run: |
4847
sudo apt-get install azure-functions-core-tools -y
4948
echo "PathToFuncExe=func" >> $GITHUB_ENV
5049
shell: bash
50+
- name: Fix Azure Functions Core Tools permissions - Linux
51+
if: runner.os == 'Linux'
52+
run: sudo chmod +x /usr/lib/azure-functions-core-tools/in-proc6/func
5153
- name: Build
5254
run: dotnet build src --configuration Release
5355
- name: Upload packages

‎.github/workflows/release.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
- name: Setup .NET SDK
2121
uses: actions/setup-dotnet@v4.0.0
2222
with:
23-
dotnet-version: 7.0.x
23+
dotnet-version: 8.0.x
2424
- name: Build
2525
run: dotnet build src --configuration Release
2626
- name: Sign NuGet packages

‎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/IntegrationTests.HostV4/IntegrationTests.HostV4.csproj‎

Lines changed: 6 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>net6.0</TargetFramework>
@@ -13,16 +13,14 @@
1313
</ItemGroup>
1414

1515
<ItemGroup>
16-
<PackageReference Include="Microsoft.NET.Sdk.Functions" Version="4.4.0" />
17-
<PackageReference Include="NServiceBus" Version="8.2.1" />
18-
<PackageReference Include="NServiceBus.Transport.AzureServiceBus" Version="3.2.3" />
16+
<PackageReference Include="GitHubActionsTestLogger" Version="2.4.1" />
17+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
18+
<PackageReference Include="NUnit" Version="3.14.0" />
19+
<PackageReference Include="NUnit3TestAdapter" Version="4.6.0" />
1920
</ItemGroup>
2021

2122
<ItemGroup>
22-
<PackageReference Include="GitHubActionsTestLogger" Version="2.3.3" />
23-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
24-
<PackageReference Include="NUnit" Version="3.14.0" />
25-
<PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
23+
<PackageReference Include="Microsoft.NET.Sdk.Functions" Version="4.6.0" />
2624
</ItemGroup>
2725

2826
<ItemGroup>

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

Lines changed: 5 additions & 7 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>net6.0</TargetFramework>
@@ -7,17 +7,15 @@
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.10.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" />
1614
</ItemGroup>
1715

1816
<ItemGroup>
1917
<ProjectReference Include="..\NServiceBus.AzureFunctions.Analyzer\NServiceBus.AzureFunctions.Analyzer.csproj" />
2018
<ProjectReference Include="..\NServiceBus.AzureFunctions.InProcess.ServiceBus\NServiceBus.AzureFunctions.InProcess.ServiceBus.csproj" />
2119
</ItemGroup>
22-
20+
2321
</Project>

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

Lines changed: 3 additions & 3 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>$(AnalyzerTargetFramework)</TargetFramework>
@@ -10,15 +10,15 @@
1010
</PropertyGroup>
1111

1212
<ItemGroup>
13-
<PackageReference Include="Particular.Packaging" Version="3.0.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-
23+
2424
</Project>

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

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -10,30 +10,30 @@
1010
<ProjectReference Include="..\NServiceBus.AzureFunctions.SourceGenerator\NServiceBus.AzureFunctions.SourceGenerator.csproj" ReferenceOutputAssembly="false" />
1111
</ItemGroup>
1212

13+
<ItemGroup>
14+
<PackageReference Include="Microsoft.Azure.Functions.Extensions" Version="1.1.0" />
15+
<PackageReference Include="Microsoft.Azure.WebJobs.Extensions.ServiceBus" Version="5.16.4" />
16+
<PackageReference Include="NServiceBus.Newtonsoft.Json" Version="3.0.0" />
17+
<PackageReference Include="NServiceBus" Version="8.2.4" />
18+
<PackageReference Include="NServiceBus.Transport.AzureServiceBus" Version="3.2.5" />
19+
<PackageReference Include="Obsolete.Fody" Version="5.3.0" PrivateAssets="All" />
20+
<PackageReference Include="Particular.Packaging" Version="4.2.0" PrivateAssets="All" />
21+
</ItemGroup>
22+
1323
<ItemGroup>
1424
<None Include="..\NServiceBus.AzureFunctions.Analyzer\bin\$(Configuration)\$(AnalyzerTargetFramework)\NServiceBus.AzureFunctions.Analyzer.dll" Pack="true" PackagePath="analyzers/dotnet/cs/NServiceBus.AzureFunctions.Analyzer.dll" Link="NServiceBus.AzureFunctions.Analyzer.dll" Visible="false" />
1525
</ItemGroup>
16-
26+
1727
<ItemGroup>
18-
<PackageReference Include="Microsoft.Azure.Functions.Extensions" Version="1.1.0" />
19-
<PackageReference Include="Microsoft.Azure.WebJobs.Extensions.ServiceBus" Version="5.16.0" />
20-
<PackageReference Include="NServiceBus.Newtonsoft.Json" Version="[3.0.0, 4.0.0)" />
21-
<PackageReference Include="NServiceBus" Version="[8.2.1, 9.0.0)" />
22-
<PackageReference Include="NServiceBus.Transport.AzureServiceBus" Version="[3.2.3, 4.0.0)" />
23-
<PackageReference Include="Obsolete.Fody" Version="5.3.0" PrivateAssets="All" />
24-
<PackageReference Include="Particular.Packaging" Version="3.0.0" PrivateAssets="All" />
28+
<None Remove="build*\*" />
29+
<Content Include="build\*" PackagePath="build" />
2530
</ItemGroup>
2631

2732
<Target Name="AddSourceGeneratorToPackage" BeforeTargets="_GetPackageFiles">
2833
<ItemGroup>
2934
<None Include="..\NServiceBus.AzureFunctions.SourceGenerator\bin\$(Configuration)\**\NServiceBus.AzureFunctions.SourceGenerator.dll" Pack="true" PackagePath="analyzers/dotnet/cs/NServiceBus.AzureFunctions.SourceGenerator.dll" />
3035
</ItemGroup>
3136
</Target>
32-
33-
<ItemGroup>
34-
<None Remove="build*\*" />
35-
<Content Include="build\*" PackagePath="build" />
36-
</ItemGroup>
3737

3838
<ItemGroup>
3939
<InternalsVisibleTo Include="ServiceBus.Tests" Key="$(NServiceBusTestsKey)" />

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

Lines changed: 4 additions & 4 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.10.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>
2222
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.10.0" />
23-
<PackageReference Include="Particular.Approvals" Version="1.0.0" />
23+
<PackageReference Include="Particular.Approvals" Version="1.1.1" />
2424
</ItemGroup>
2525

2626
</Project>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
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 -->
1414
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.10.0" PrivateAssets="All" />
15-
<PackageReference Include="Particular.Packaging" Version="3.0.0" PrivateAssets="All" />
15+
<PackageReference Include="Particular.Packaging" Version="4.2.0" PrivateAssets="All" />
1616
</ItemGroup>
1717

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

0 commit comments

Comments
 (0)