From 35344f092835b93a22ceee7656eb4990b9ba3bb9 Mon Sep 17 00:00:00 2001 From: Alex Peck Date: Thu, 13 Feb 2025 12:49:10 -0800 Subject: [PATCH 1/9] build --- .github/workflows/gate.yml | 3 +++ .../BitFaster.Caching.Benchmarks.csproj | 2 +- BitFaster.Caching.UnitTests/BitFaster.Caching.UnitTests.csproj | 2 +- BitFaster.Caching/BitFaster.Caching.csproj | 2 +- 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/gate.yml b/.github/workflows/gate.yml index 7d8d3082..2cac34d6 100644 --- a/.github/workflows/gate.yml +++ b/.github/workflows/gate.yml @@ -24,6 +24,7 @@ jobs: 3.1.x 6.0.x 8.0.x + 9.0.x - name: Install dependencies run: dotnet restore - name: Build @@ -98,6 +99,7 @@ jobs: dotnet-version: | 6.0.x 8.0.x + 9.0.x - name: Install dependencies run: dotnet restore - name: Build @@ -139,6 +141,7 @@ jobs: dotnet-version: | 6.0.x 8.0.x + 9.0.x - name: Install dependencies run: dotnet restore - name: Build diff --git a/BitFaster.Caching.Benchmarks/BitFaster.Caching.Benchmarks.csproj b/BitFaster.Caching.Benchmarks/BitFaster.Caching.Benchmarks.csproj index aa79c2b9..9debb71e 100644 --- a/BitFaster.Caching.Benchmarks/BitFaster.Caching.Benchmarks.csproj +++ b/BitFaster.Caching.Benchmarks/BitFaster.Caching.Benchmarks.csproj @@ -3,7 +3,7 @@ Exe latest - net6.0;net8.0 + net6.0;net8.0;net9.0 True true diff --git a/BitFaster.Caching.UnitTests/BitFaster.Caching.UnitTests.csproj b/BitFaster.Caching.UnitTests/BitFaster.Caching.UnitTests.csproj index 93a5a179..d7761c9a 100644 --- a/BitFaster.Caching.UnitTests/BitFaster.Caching.UnitTests.csproj +++ b/BitFaster.Caching.UnitTests/BitFaster.Caching.UnitTests.csproj @@ -1,7 +1,7 @@ - net48;netcoreapp3.1;net6.0 + net48;netcoreapp3.1;net6.0;net9.0 9.0 diff --git a/BitFaster.Caching/BitFaster.Caching.csproj b/BitFaster.Caching/BitFaster.Caching.csproj index 55f0e8dc..4c1e1950 100644 --- a/BitFaster.Caching/BitFaster.Caching.csproj +++ b/BitFaster.Caching/BitFaster.Caching.csproj @@ -1,7 +1,7 @@ - netstandard2.0;netcoreapp3.1;net6.0 + netstandard2.0;netcoreapp3.1;net6.0;net9.0 11.0 Alex Peck From 7e8e143c3e2af1b6f442254ac258fd20603df0bf Mon Sep 17 00:00:00 2001 From: Alex Peck Date: Thu, 13 Feb 2025 12:56:41 -0800 Subject: [PATCH 2/9] intrinsics --- BitFaster.Caching/Intrinsics.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BitFaster.Caching/Intrinsics.cs b/BitFaster.Caching/Intrinsics.cs index 45908a01..a9104823 100644 --- a/BitFaster.Caching/Intrinsics.cs +++ b/BitFaster.Caching/Intrinsics.cs @@ -2,7 +2,7 @@ using System.Runtime.Intrinsics.X86; #endif -#if NET6_0 +#if NET6_0_OR_GREATER using System.Runtime.Intrinsics.Arm; #endif From 63e62fbdfb590b09e259127d2239f12a3d1dc057 Mon Sep 17 00:00:00 2001 From: Alex Peck Date: Thu, 13 Feb 2025 12:58:32 -0800 Subject: [PATCH 3/9] infer --- .github/workflows/infer.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/infer.yml b/.github/workflows/infer.yml index 5782bdc2..8b139041 100644 --- a/.github/workflows/infer.yml +++ b/.github/workflows/infer.yml @@ -18,7 +18,7 @@ jobs: - name: Setup .NET Core uses: actions/setup-dotnet@v2 with: - dotnet-version: 8.0.x + dotnet-version: 9.0.x - name: Install dependencies run: dotnet restore - name: Build From af1004381ae0c3c69a43de728b5cb3914d9e8b8c Mon Sep 17 00:00:00 2001 From: Alex Peck Date: Thu, 13 Feb 2025 13:07:14 -0800 Subject: [PATCH 4/9] codeql --- .github/workflows/codeql-analysis.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index b076dc1a..09c92e58 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -38,11 +38,11 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@v2 + uses: github/codeql-action/init@v3 with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. @@ -53,7 +53,7 @@ jobs: # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). # If this step fails, then you should remove it and run the build manually (see below) - name: Autobuild - uses: github/codeql-action/autobuild@v2 + uses: github/codeql-action/autobuild@v3 # ℹī¸ Command-line programs to run using the OS shell. # 📚 https://git.io/JvXDl @@ -67,4 +67,4 @@ jobs: # make release - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v2 + uses: github/codeql-action/analyze@v3 From e198c8128202ddc3a7073c7e6ca55ac5893c9373 Mon Sep 17 00:00:00 2001 From: Alex Peck Date: Thu, 13 Feb 2025 13:13:37 -0800 Subject: [PATCH 5/9] try4 --- .github/workflows/codeql-analysis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 09c92e58..cd88dacb 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -42,7 +42,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@v3 + uses: github/codeql-action/init@v4 with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. @@ -53,7 +53,7 @@ jobs: # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). # If this step fails, then you should remove it and run the build manually (see below) - name: Autobuild - uses: github/codeql-action/autobuild@v3 + uses: github/codeql-action/autobuild@v4 # ℹī¸ Command-line programs to run using the OS shell. # 📚 https://git.io/JvXDl @@ -67,4 +67,4 @@ jobs: # make release - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v3 + uses: github/codeql-action/analyze@v4 From a4870cba74cdce87297b01d8eaf3d222b7561360 Mon Sep 17 00:00:00 2001 From: Alex Peck Date: Thu, 13 Feb 2025 13:13:37 -0800 Subject: [PATCH 6/9] try4 --- .github/workflows/codeql-analysis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 09c92e58..cd88dacb 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -42,7 +42,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@v3 + uses: github/codeql-action/init@v4 with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. @@ -53,7 +53,7 @@ jobs: # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). # If this step fails, then you should remove it and run the build manually (see below) - name: Autobuild - uses: github/codeql-action/autobuild@v3 + uses: github/codeql-action/autobuild@v4 # ℹī¸ Command-line programs to run using the OS shell. # 📚 https://git.io/JvXDl @@ -67,4 +67,4 @@ jobs: # make release - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v3 + uses: github/codeql-action/analyze@v4 From 62b498a715d1d7254b46dd59715c903fc72c2b23 Mon Sep 17 00:00:00 2001 From: Alex Peck Date: Thu, 13 Feb 2025 17:26:30 -0800 Subject: [PATCH 7/9] 3 --- .github/workflows/codeql-analysis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index cd88dacb..09c92e58 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -42,7 +42,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@v4 + uses: github/codeql-action/init@v3 with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. @@ -53,7 +53,7 @@ jobs: # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). # If this step fails, then you should remove it and run the build manually (see below) - name: Autobuild - uses: github/codeql-action/autobuild@v4 + uses: github/codeql-action/autobuild@v3 # ℹī¸ Command-line programs to run using the OS shell. # 📚 https://git.io/JvXDl @@ -67,4 +67,4 @@ jobs: # make release - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v4 + uses: github/codeql-action/analyze@v3 From c5ca7b5e0b1c099ec470d9f20ea6ee7ab8d1dc59 Mon Sep 17 00:00:00 2001 From: Alex Peck Date: Thu, 13 Feb 2025 17:29:12 -0800 Subject: [PATCH 8/9] fix codeql --- .github/workflows/codeql-analysis.yml | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 09c92e58..c2fd46b1 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -52,8 +52,8 @@ jobs: # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). # If this step fails, then you should remove it and run the build manually (see below) - - name: Autobuild - uses: github/codeql-action/autobuild@v3 + #- name: Autobuild + # uses: github/codeql-action/autobuild@v3 # ℹī¸ Command-line programs to run using the OS shell. # 📚 https://git.io/JvXDl @@ -65,6 +65,16 @@ jobs: #- run: | # make bootstrap # make release + - name: Setup .NET SDK + uses: actions/setup-dotnet@v4 + with: + dotnet-version: '9.0.x' + + - name: Restore dependencies + run: dotnet restore + + - name: Build + run: dotnet build --configuration Debug --no-restore - name: Perform CodeQL Analysis uses: github/codeql-action/analyze@v3 From d39fdabd3cd449b83f4b86e984ead45c0a6b4166 Mon Sep 17 00:00:00 2001 From: Alex Peck Date: Fri, 14 Feb 2025 14:31:53 -0800 Subject: [PATCH 9/9] revert proj --- .../BitFaster.Caching.Benchmarks.csproj | 2 +- BitFaster.Caching.UnitTests/BitFaster.Caching.UnitTests.csproj | 2 +- BitFaster.Caching/BitFaster.Caching.csproj | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/BitFaster.Caching.Benchmarks/BitFaster.Caching.Benchmarks.csproj b/BitFaster.Caching.Benchmarks/BitFaster.Caching.Benchmarks.csproj index 9debb71e..aa79c2b9 100644 --- a/BitFaster.Caching.Benchmarks/BitFaster.Caching.Benchmarks.csproj +++ b/BitFaster.Caching.Benchmarks/BitFaster.Caching.Benchmarks.csproj @@ -3,7 +3,7 @@ Exe latest - net6.0;net8.0;net9.0 + net6.0;net8.0 True true diff --git a/BitFaster.Caching.UnitTests/BitFaster.Caching.UnitTests.csproj b/BitFaster.Caching.UnitTests/BitFaster.Caching.UnitTests.csproj index d7761c9a..93a5a179 100644 --- a/BitFaster.Caching.UnitTests/BitFaster.Caching.UnitTests.csproj +++ b/BitFaster.Caching.UnitTests/BitFaster.Caching.UnitTests.csproj @@ -1,7 +1,7 @@ - net48;netcoreapp3.1;net6.0;net9.0 + net48;netcoreapp3.1;net6.0 9.0 diff --git a/BitFaster.Caching/BitFaster.Caching.csproj b/BitFaster.Caching/BitFaster.Caching.csproj index 4c1e1950..55f0e8dc 100644 --- a/BitFaster.Caching/BitFaster.Caching.csproj +++ b/BitFaster.Caching/BitFaster.Caching.csproj @@ -1,7 +1,7 @@ - netstandard2.0;netcoreapp3.1;net6.0;net9.0 + netstandard2.0;netcoreapp3.1;net6.0 11.0 Alex Peck