Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Prepare repo for .NET 8 #440

Merged
merged 3 commits into from
Sep 6, 2023
Merged

Prepare repo for .NET 8 #440

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b58eb92
Bump to core 9
andreasohlund Sep 4, 2023
ab82d8d
Cleanup
andreasohlund Sep 5, 2023
577e507
PR review tweaks
bording Sep 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ env:
jobs:
build:
name: Windows
runs-on: windows-2019
runs-on: windows-2022
steps:
- name: Checkout
uses: actions/[email protected]
Expand All @@ -20,9 +20,8 @@ jobs:
- name: Setup .NET SDK
uses: actions/[email protected]
with:
dotnet-version: |
7.0.x
6.0.x
dotnet-version: 8.0.x
dotnet-quality: 'preview'
- name: Build
run: dotnet build src --configuration Release
- name: Upload packages
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ env:
DOTNET_NOLOGO: true
jobs:
release:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- name: Checkout
uses: actions/[email protected]
Expand All @@ -17,7 +17,8 @@ jobs:
- name: Setup .NET SDK
uses: actions/[email protected]
with:
dotnet-version: 7.0.x
dotnet-version: 8.0.x
dotnet-quality: 'preview'
- name: Build
run: dotnet build src --configuration Release
- name: Sign NuGet packages
Expand Down
2 changes: 1 addition & 1 deletion src/Custom.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project>

<PropertyGroup>
<MinVerMinimumMajorMinor>5.1</MinVerMinimumMajorMinor>
<MinVerMinimumMajorMinor>6.0</MinVerMinimumMajorMinor>
<MinVerAutoIncrement>minor</MinVerAutoIncrement>
</PropertyGroup>

Expand Down
11 changes: 2 additions & 9 deletions src/NServiceBus.Metrics.PerformanceCounters.Tests/APIApprovals.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,8 @@ public void Approve()
"System.Reflection.AssemblyMetadataAttribute"
}
});
#if NET7_0
Approver.Verify(publicApi, scenario: "net7.0");
#elif NET6_0
Approver.Verify(publicApi, scenario: "net6.0");
#elif NET472
Approver.Verify(publicApi, scenario: "net472");
#else
throw new Exception("Unknown target framework in API Approval test");
#endif

Approver.Verify(publicApi);
}
}
}
2 changes: 1 addition & 1 deletion .../APIApprovals.Approve.net6.0.approved.txt → ...alFiles/APIApprovals.Approve.approved.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[assembly: System.Runtime.CompilerServices.InternalsVisibleTo(@"NServiceBus.Metrics.PerformanceCounters.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100D32BC524DCB1205998C155A4F36BF873587D3602822ECD7B49CD775B2E6A006EE6B9164AB2E3103A6A4D1310C6E5C26818A32FE86710141A2D1F02EB564381CD64C88131BCCA478CDB5072F06DB991DE33DAC1C82BAF40D9F61DD6B40300A4673B693B51CD10A8B9B7D8AB64450431FA422514D6DABCAF70DF785B1E4E6E8AAF")]
[assembly: System.Runtime.CompilerServices.InternalsVisibleTo(@"NServiceBus.Metrics.PerformanceCounters.Tests, PublicKey=00240000048000009400000006020000002400005253413100040000010001007f16e21368ff041183fab592d9e8ed37e7be355e93323147a1d29983d6e591b04282e4da0c9e18bd901e112c0033925eb7d7872c2f1706655891c5c9d57297994f707d16ee9a8f40d978f064ee1ffc73c0db3f4712691b23bf596f75130f4ec978cf78757ec034625a5f27e6bb50c618931ea49f6f628fd74271c32959efb1c5")]
[assembly: System.Runtime.Versioning.SupportedOSPlatform("Windows7.0")]
[assembly: System.Runtime.Versioning.TargetPlatform("Windows7.0")]
namespace NServiceBus
Expand Down
12 changes: 0 additions & 12 deletions ....Metrics.PerformanceCounters.Tests/ApprovalFiles/APIApprovals.Approve.net472.approved.txt
View file
Open in desktop

This file was deleted.

14 changes: 0 additions & 14 deletions ....Metrics.PerformanceCounters.Tests/ApprovalFiles/APIApprovals.Approve.net7.0.approved.txt
View file
Open in desktop

This file was deleted.

15 changes: 9 additions & 6 deletions ...us.Metrics.PerformanceCounters.Tests/NServiceBus.Metrics.PerformanceCounters.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,23 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net472;net6.0-windows;net7.0-windows</TargetFrameworks>
<TargetFramework>net8.0-windows</TargetFramework>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
<AssemblyOriginatorKeyFile>$(SolutionDir)NServiceBusTests.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\NServiceBus.Metrics.PerformanceCounters\NServiceBus.Metrics.PerformanceCounters.csproj" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="GitHubActionsTestLogger" Version="2.0.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
<PackageReference Include="NServiceBus" Version="8.1.1" />
<PackageReference Include="NServiceBus.Metrics" Version="4.0.0" />
<PackageReference Include="GitHubActionsTestLogger" Version="2.3.3">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0-preview-23424-02" />
<PackageReference Include="NServiceBus" Version="9.0.0-alpha.1" />
<PackageReference Include="NServiceBus.Metrics" Version="5.0.0-alpha.1" />
<PackageReference Include="NUnit" Version="3.13.3" />
<PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
</ItemGroup>
Expand Down
Binary file removed src/NServiceBus.Metrics.PerformanceCounters.Tests/key.snk
View file
Open in desktop
Binary file not shown.
2 changes: 2 additions & 0 deletions src/NServiceBus.Metrics.PerformanceCounters.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NServiceBus.Metrics.Perform
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{1B573EC5-07D6-4E25-9687-FB5A536B4FD9}"
ProjectSection(SolutionItems) = preProject
..\.github\workflows\ci.yml = ..\.github\workflows\ci.yml
Custom.Build.props = Custom.Build.props
..\.github\workflows\release.yml = ..\.github\workflows\release.yml
EndProjectSection
EndProject
Global
Expand Down
3 changes: 0 additions & 3 deletions src/NServiceBus.Metrics.PerformanceCounters/InternalsVisibleTo.cs
View file
Open in desktop

This file was deleted.

12 changes: 7 additions & 5 deletions src/NServiceBus.Metrics.PerformanceCounters/NServiceBus.Metrics.PerformanceCounters.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,17 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net472;net6.0-windows</TargetFrameworks>
<TargetFramework>net8.0-windows</TargetFramework>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>$(SolutionDir)NServiceBus.snk</AssemblyOriginatorKeyFile>
<Description>Enables access to performance counters</Description>
<!-- Disable NU5111 and NU5110 as CreateNSBPerfCounters.ps1 scripts are intentionally not put into the tools folder. -->
<NoWarn>$(NoWarn);NU5110;NU5111</NoWarn>
<LangVersion>10.0</LangVersion>
</PropertyGroup>

<ItemGroup Label="Public dependencies">
<PackageReference Include="NServiceBus.Metrics" Version="[4.0.0, 5.0.0)" />
<PackageReference Include="System.Diagnostics.PerformanceCounter" Version="7.0.0" />
<PackageReference Include="NServiceBus.Metrics" Version="5.0.0-alpha.1" />
<PackageReference Include="System.Diagnostics.PerformanceCounter" Version="8.0.0-preview.7.23375.6" />
</ItemGroup>

<ItemGroup Label="Private dependencies">
Expand All @@ -23,5 +22,8 @@
<None Remove="Scripts\*" />
<Content Include="Scripts\*" Pack="true" PackagePath="build" />
</ItemGroup>
<ItemGroup>
<InternalsVisibleTo Include="NServiceBus.Metrics.PerformanceCounters.Tests" Key="$(NServiceBusTestsKey)" />
bording marked this conversation as resolved.
Show resolved Hide resolved
</ItemGroup>

</Project>