Skip to content

Commit 84dff64

Browse files
ChrisMcKeeChrisMcKee
committed
Split targeting
1 parent 6b3e5f1 commit 84dff64

13 files changed

Lines changed: 45 additions & 24 deletions

File tree

‎.github/workflows/infersharp.yml‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,13 +44,18 @@ jobs:
4444
- name: Setup .NET SDK
4545
uses: actions/setup-dotnet@baa11fbfe1d6520db94683bd5c7a3818018e4309 # v5.1.0
4646
with:
47-
dotnet-version: 10.0.x
47+
dotnet-version: 8.x
48+
49+
- name: Setup .NET SDK
50+
uses: actions/setup-dotnet@baa11fbfe1d6520db94683bd5c7a3818018e4309 # v5.1.0
51+
with:
52+
dotnet-version: 10.x
4853

4954
- name: Build
5055
run: dotnet build src/BCrypt.Net/BCrypt.Net.csproj --configuration Release --framework net8.0
5156

5257
- name: Run Infer#
53-
uses: microsoft/infersharpaction@v1.5
58+
uses: microsoft/infersharpaction@b749060de518f410f92c87d37d2366e5e9d7c5fc #v1.5
5459
id: runinfersharp
5560
with:
5661
binary-path: src/BCrypt.Net/bin/Release/net8.0

‎BCrypt.Net.sln‎

Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ Global
5454
All|Any CPU = All|Any CPU
5555
Debug|Any CPU = Debug|Any CPU
5656
Release|Any CPU = Release|Any CPU
57+
Benchmarks|Any CPU = Benchmarks|Any CPU
5758
EndGlobalSection
5859
GlobalSection(ProjectConfigurationPlatforms) = postSolution
5960
{CD69F016-5940-4FCA-BCA1-9D1D87C6F873}.All|Any CPU.ActiveCfg = All|Any CPU
@@ -62,56 +63,65 @@ Global
6263
{CD69F016-5940-4FCA-BCA1-9D1D87C6F873}.Debug|Any CPU.Build.0 = Debug|Any CPU
6364
{CD69F016-5940-4FCA-BCA1-9D1D87C6F873}.Release|Any CPU.ActiveCfg = Release|Any CPU
6465
{CD69F016-5940-4FCA-BCA1-9D1D87C6F873}.Release|Any CPU.Build.0 = Release|Any CPU
66+
{CD69F016-5940-4FCA-BCA1-9D1D87C6F873}.Benchmarks|Any CPU.ActiveCfg = Benchmarks|Any CPU
67+
{CD69F016-5940-4FCA-BCA1-9D1D87C6F873}.Benchmarks|Any CPU.Build.0 = Benchmarks|Any CPU
6568
{2078EB7B-7EDF-4B65-80F7-DB4D92E08CCD}.All|Any CPU.ActiveCfg = All|Any CPU
6669
{2078EB7B-7EDF-4B65-80F7-DB4D92E08CCD}.All|Any CPU.Build.0 = All|Any CPU
6770
{2078EB7B-7EDF-4B65-80F7-DB4D92E08CCD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
6871
{2078EB7B-7EDF-4B65-80F7-DB4D92E08CCD}.Debug|Any CPU.Build.0 = Debug|Any CPU
6972
{2078EB7B-7EDF-4B65-80F7-DB4D92E08CCD}.Release|Any CPU.ActiveCfg = Release|Any CPU
7073
{2078EB7B-7EDF-4B65-80F7-DB4D92E08CCD}.Release|Any CPU.Build.0 = Release|Any CPU
74+
{2078EB7B-7EDF-4B65-80F7-DB4D92E08CCD}.Benchmarks|Any CPU.ActiveCfg = Benchmarks|Any CPU
75+
{2078EB7B-7EDF-4B65-80F7-DB4D92E08CCD}.Benchmarks|Any CPU.Build.0 = Benchmarks|Any CPU
7176
{A24DEBF7-6ED9-4774-B67F-7A0EE18125C5}.All|Any CPU.ActiveCfg = All|Any CPU
7277
{A24DEBF7-6ED9-4774-B67F-7A0EE18125C5}.All|Any CPU.Build.0 = All|Any CPU
7378
{A24DEBF7-6ED9-4774-B67F-7A0EE18125C5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
7479
{A24DEBF7-6ED9-4774-B67F-7A0EE18125C5}.Release|Any CPU.ActiveCfg = Release|Any CPU
80+
{A24DEBF7-6ED9-4774-B67F-7A0EE18125C5}.Benchmarks|Any CPU.ActiveCfg = Benchmarks|Any CPU
7581
{CE412A71-A08D-4263-8960-664827DA526B}.All|Any CPU.ActiveCfg = All|Any CPU
7682
{CE412A71-A08D-4263-8960-664827DA526B}.All|Any CPU.Build.0 = All|Any CPU
7783
{CE412A71-A08D-4263-8960-664827DA526B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
7884
{CE412A71-A08D-4263-8960-664827DA526B}.Release|Any CPU.ActiveCfg = Release|Any CPU
85+
{CE412A71-A08D-4263-8960-664827DA526B}.Benchmarks|Any CPU.ActiveCfg = Benchmarks|Any CPU
7986
{70440057-8D4E-41B0-8DF7-8A67B4C0EE28}.All|Any CPU.ActiveCfg = All|Any CPU
8087
{70440057-8D4E-41B0-8DF7-8A67B4C0EE28}.All|Any CPU.Build.0 = All|Any CPU
8188
{70440057-8D4E-41B0-8DF7-8A67B4C0EE28}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
8289
{70440057-8D4E-41B0-8DF7-8A67B4C0EE28}.Debug|Any CPU.Build.0 = Debug|Any CPU
8390
{70440057-8D4E-41B0-8DF7-8A67B4C0EE28}.Release|Any CPU.ActiveCfg = Release|Any CPU
8491
{70440057-8D4E-41B0-8DF7-8A67B4C0EE28}.Release|Any CPU.Build.0 = Release|Any CPU
92+
{70440057-8D4E-41B0-8DF7-8A67B4C0EE28}.Benchmarks|Any CPU.ActiveCfg = Benchmarks|Any CPU
93+
{70440057-8D4E-41B0-8DF7-8A67B4C0EE28}.Benchmarks|Any CPU.Build.0 = Benchmarks|Any CPU
8594
{AEA6712D-0FAE-4031-8FA7-FDD2A026855A}.All|Any CPU.ActiveCfg = All|Any CPU
8695
{AEA6712D-0FAE-4031-8FA7-FDD2A026855A}.All|Any CPU.Build.0 = All|Any CPU
8796
{AEA6712D-0FAE-4031-8FA7-FDD2A026855A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
88-
{AEA6712D-0FAE-4031-8FA7-FDD2A026855A}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
8997
{AEA6712D-0FAE-4031-8FA7-FDD2A026855A}.Release|Any CPU.ActiveCfg = Release|Any CPU
90-
{AEA6712D-0FAE-4031-8FA7-FDD2A026855A}.Release|Any CPU.Deploy.0 = Release|Any CPU
98+
{AEA6712D-0FAE-4031-8FA7-FDD2A026855A}.Benchmarks|Any CPU.ActiveCfg = Benchmarks|Any CPU
9199
{03E4D4A1-36B4-4538-A030-3C9141C6A3CF}.All|Any CPU.ActiveCfg = Debug|Any CPU
92100
{03E4D4A1-36B4-4538-A030-3C9141C6A3CF}.All|Any CPU.Build.0 = Debug|Any CPU
93101
{03E4D4A1-36B4-4538-A030-3C9141C6A3CF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
94102
{03E4D4A1-36B4-4538-A030-3C9141C6A3CF}.Debug|Any CPU.Build.0 = Debug|Any CPU
95103
{03E4D4A1-36B4-4538-A030-3C9141C6A3CF}.Release|Any CPU.ActiveCfg = Release|Any CPU
96104
{03E4D4A1-36B4-4538-A030-3C9141C6A3CF}.Release|Any CPU.Build.0 = Release|Any CPU
105+
{03E4D4A1-36B4-4538-A030-3C9141C6A3CF}.Benchmarks|Any CPU.ActiveCfg = Benchmarks|Any CPU
106+
{03E4D4A1-36B4-4538-A030-3C9141C6A3CF}.Benchmarks|Any CPU.Build.0 = Benchmarks|Any CPU
97107
{0BFE3C36-05D3-4A96-8694-1179FD705162}.All|Any CPU.ActiveCfg = All|Any CPU
98108
{0BFE3C36-05D3-4A96-8694-1179FD705162}.All|Any CPU.Build.0 = All|Any CPU
99109
{0BFE3C36-05D3-4A96-8694-1179FD705162}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
100-
{0BFE3C36-05D3-4A96-8694-1179FD705162}.Debug|Any CPU.Build.0 = Debug|Any CPU
101110
{0BFE3C36-05D3-4A96-8694-1179FD705162}.Release|Any CPU.ActiveCfg = Release|Any CPU
102-
{0BFE3C36-05D3-4A96-8694-1179FD705162}.Release|Any CPU.Build.0 = Release|Any CPU
111+
{0BFE3C36-05D3-4A96-8694-1179FD705162}.Benchmarks|Any CPU.ActiveCfg = Benchmarks|Any CPU
112+
{0BFE3C36-05D3-4A96-8694-1179FD705162}.Benchmarks|Any CPU.Build.0 = Benchmarks|Any CPU
103113
{DC455EE9-99A8-4900-AFBA-661E5EFCE50F}.All|Any CPU.ActiveCfg = All|Any CPU
104114
{DC455EE9-99A8-4900-AFBA-661E5EFCE50F}.All|Any CPU.Build.0 = All|Any CPU
105115
{DC455EE9-99A8-4900-AFBA-661E5EFCE50F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
106-
{DC455EE9-99A8-4900-AFBA-661E5EFCE50F}.Debug|Any CPU.Build.0 = Debug|Any CPU
107116
{DC455EE9-99A8-4900-AFBA-661E5EFCE50F}.Release|Any CPU.ActiveCfg = Release|Any CPU
108-
{DC455EE9-99A8-4900-AFBA-661E5EFCE50F}.Release|Any CPU.Build.0 = Release|Any CPU
117+
{DC455EE9-99A8-4900-AFBA-661E5EFCE50F}.Benchmarks|Any CPU.ActiveCfg = Benchmarks|Any CPU
118+
{DC455EE9-99A8-4900-AFBA-661E5EFCE50F}.Benchmarks|Any CPU.Build.0 = Benchmarks|Any CPU
109119
{799531B7-02FD-4ED9-BE76-6BFCB083D780}.All|Any CPU.ActiveCfg = All|Any CPU
110120
{799531B7-02FD-4ED9-BE76-6BFCB083D780}.All|Any CPU.Build.0 = All|Any CPU
111121
{799531B7-02FD-4ED9-BE76-6BFCB083D780}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
112-
{799531B7-02FD-4ED9-BE76-6BFCB083D780}.Debug|Any CPU.Build.0 = Debug|Any CPU
113122
{799531B7-02FD-4ED9-BE76-6BFCB083D780}.Release|Any CPU.ActiveCfg = Release|Any CPU
114-
{799531B7-02FD-4ED9-BE76-6BFCB083D780}.Release|Any CPU.Build.0 = Release|Any CPU
123+
{799531B7-02FD-4ED9-BE76-6BFCB083D780}.Benchmarks|Any CPU.ActiveCfg = Benchmarks|Any CPU
124+
{799531B7-02FD-4ED9-BE76-6BFCB083D780}.Benchmarks|Any CPU.Build.0 = Benchmarks|Any CPU
115125
EndGlobalSection
116126
GlobalSection(SolutionProperties) = preSolution
117127
HideSolutionNode = FALSE

‎benchmarks/Diagnostic-Benchmarks/Diagnostic-Benchmarks.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<OutputType>Exe</OutputType>
66
<TargetFramework>net10.0</TargetFramework>
77
<ServerGarbageCollection>true</ServerGarbageCollection>
8-
<Configurations>Release;Debug;All</Configurations>
8+
<Configurations>Release;Debug;All;Benchmarks</Configurations>
99
<Platforms>AnyCPU</Platforms>
1010
<!--Disable Debug Symbols https://github.com/dotnet/BenchmarkDotNet/pull/2029/-->
1111
<DebugSymbols>false</DebugSymbols>

‎benchmarks/Makefile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@ all:
1212

1313
.PHONY: run-release-benchmark
1414
run-release-benchmark: # compares nuget releases of this package
15-
@dotnet run --configuration Release --project benchmarks/Release-Benchmarks/Release-Benchmarks.csproj
15+
@dotnet run --configuration Benchmarks --project benchmarks/Release-Benchmarks/Release-Benchmarks.csproj
1616

1717
.PHONY: run-method-benchmarks
1818
run-method-benchmarks: # compares methods against older versions of this package
19-
@dotnet run --configuration Release --project benchmarks/Method-Benchmarks/Method-Benchmarks.csproj
19+
@dotnet run --configuration Benchmarks --project benchmarks/Method-Benchmarks/Method-Benchmarks.csproj
2020

2121
.PHONY: run-diagnostic-benchmarks
2222
run-diagnostic-benchmarks: # benchmarks the main entry point with vs diagnostics enabled
23-
@dotnet run --configuration Release --project benchmarks/Diagnostic-Benchmarks/Diagnostic-Benchmarks.csproj
23+
@dotnet run --configuration Benchmarks --project benchmarks/Diagnostic-Benchmarks/Diagnostic-Benchmarks.csproj

‎benchmarks/Method-Benchmarks/Method-Benchmarks.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<OutputType>Exe</OutputType>
66
<TargetFrameworks>net8.0;net10.0;net48</TargetFrameworks>
77
<ServerGarbageCollection>true</ServerGarbageCollection>
8-
<Configurations>Release;Debug;All</Configurations>
8+
<Configurations>Release;Debug;All;Benchmarks</Configurations>
99
<Platforms>AnyCPU</Platforms>
1010
<!--Disable Debug Symbols https://github.com/dotnet/BenchmarkDotNet/pull/2029/-->
1111
<DebugSymbols>false</DebugSymbols>

‎benchmarks/Release-Benchmarks/Release-Benchmarks.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<OutputType>Exe</OutputType>
66
<TargetFrameworks>net8.0;net10.0;net481;net462</TargetFrameworks>
77
<ServerGarbageCollection>true</ServerGarbageCollection>
8-
<Configurations>Release;Debug;All</Configurations>
8+
<Configurations>Release;Debug;All;Benchmarks</Configurations>
99
<Platforms>AnyCPU</Platforms>
1010
<PlatformTarget>AnyCPU</PlatformTarget>
1111
<!--Disable Debug Symbols https://github.com/dotnet/BenchmarkDotNet/pull/2029/-->

‎examples/AndroidTest/AndroidTest.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</SupportedOSPlatformVersion>
3737
<TargetPlatformMinVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</TargetPlatformMinVersion>
3838
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'tizen'">6.5</SupportedOSPlatformVersion>
39-
<Configurations>Debug;Release;All</Configurations>
39+
<Configurations>Debug;Release;All;Benchmarks</Configurations>
4040
<Platforms>AnyCPU</Platforms>
4141
</PropertyGroup>
4242

‎examples/Api/WebApi/WebApi.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<CompileUsingReferenceAssemblies>false</CompileUsingReferenceAssemblies>
99
<ManagePackageVersionsCentrally>false</ManagePackageVersionsCentrally>
1010
<LangVersion>default</LangVersion>
11-
<Configurations>Debug;Release;All</Configurations>
11+
<Configurations>Debug;Release;All;Benchmarks</Configurations>
1212
<Platforms>AnyCPU</Platforms>
1313
</PropertyGroup>
1414

‎examples/ConsoleApp/ExampleConsoleApp/ExampleConsoleApp.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
77
<OutputType>Exe</OutputType>
8-
<Configurations>Debug;Release;All</Configurations>
8+
<Configurations>Debug;Release;All;Benchmarks</Configurations>
99
<Platforms>AnyCPU</Platforms>
1010

1111
</PropertyGroup>

‎src/BCrypt.Net.IdentityExtensions/BCrypt.Net.IdentityExtensions.csproj‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,15 @@
99
<DebugSymbols>false</DebugSymbols>
1010

1111
<ImplicitUsings>true</ImplicitUsings>
12-
<Configurations>Debug;Release;All</Configurations>
12+
<Configurations>Debug;Release;All;Benchmarks</Configurations>
1313
<Platforms>AnyCPU</Platforms>
1414
</PropertyGroup>
1515

16+
<PropertyGroup Condition="'$(Configuration)' == 'Release' or '$(Configuration)' == 'Benchmarks'">
17+
<Optimize>true</Optimize>
18+
<DebugType>pdbonly</DebugType>
19+
</PropertyGroup>
20+
1621
<ItemGroup Condition="'$(TargetFramework)' != 'netstandard2.0'">
1722
<FrameworkReference Include="Microsoft.AspNetCore.App" />
1823
</ItemGroup>

0 commit comments

Comments
 (0)