diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml deleted file mode 100644 index 0c43592..0000000 --- a/.github/workflows/codeql-analysis.yml +++ /dev/null @@ -1,70 +0,0 @@ -# For most projects, this workflow file will not need changing; you simply need -# to commit it to your repository. -# -# You may wish to alter this file to override the set of languages analyzed, -# or to provide custom queries or build logic. -# -# ******** NOTE ******** -# We have attempted to detect the languages in your repository. Please check -# the `language` matrix defined below to confirm you have the correct set of -# supported CodeQL languages. -# -name: "CodeQL" - -on: - push: - branches: [ main, develop ] - pull_request: - # The branches below must be a subset of the branches above - branches: [ main, develop ] - schedule: - - cron: '45 17 * * 6' - -jobs: - analyze: - name: Analyze - runs-on: ubuntu-latest - permissions: - actions: read - contents: read - security-events: write - - strategy: - fail-fast: false - matrix: - language: [ 'csharp' ] - # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ] - # Learn more about CodeQL language support at https://git.io/codeql-language-support - - steps: - - name: Checkout repository - uses: actions/checkout@v2 - - # Initializes the CodeQL tools for scanning. - - name: Initialize CodeQL - uses: github/codeql-action/init@v1 - with: - languages: ${{ matrix.language }} - # If you wish to specify custom queries, you can do so here or in a config file. - # By default, queries listed here will override any specified in a config file. - # Prefix the list here with "+" to use these queries and those in the config file. - # queries: ./path/to/local/query, your-org/your-repo/queries@main - - # 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@v1 - - # ℹ️ Command-line programs to run using the OS shell. - # 📚 https://git.io/JvXDl - - # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines - # and modify them (or add more) to build your code if your project - # uses a compiled language - - #- run: | - # make bootstrap - # make release - - - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v1 diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index f539e3e..6e67db6 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -8,19 +8,21 @@ on: jobs: build: + strategy: + matrix: + os: [ubuntu-latest, macos-latest, windows-latest] - runs-on: ubuntu-latest + runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v2 - - name: Setup .NET 6 - uses: actions/setup-dotnet@v1 + - name: Setup .NET SDKs + uses: actions/setup-dotnet@v5 with: - dotnet-version: 6.0.x - - name: Setup .NET 8 - uses: actions/setup-dotnet@v1 - with: - dotnet-version: 8.0.x + dotnet-version: | + 10.0.x + 9.0.x + 8.0.x - name: Restore dependencies run: dotnet restore - name: Build diff --git a/Directory.Build.props b/Directory.Build.props new file mode 100644 index 0000000..232afa3 --- /dev/null +++ b/Directory.Build.props @@ -0,0 +1,6 @@ + + + $(SolutionDir)StringSimilarity.NET.snk + true + + diff --git a/F23.StringSimilarity.sln b/F23.StringSimilarity.sln index c9a10d0..148038f 100644 --- a/F23.StringSimilarity.sln +++ b/F23.StringSimilarity.sln @@ -7,7 +7,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "F23.StringSimilarity", "src EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "F23.StringSimilarity.Tests", "test\F23.StringSimilarity.Tests\F23.StringSimilarity.Tests.csproj", "{68F339E6-278F-4B04-A6ED-422AAD30591F}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "F23.StringSimilarity.Benchmarks", "F23.StringSimilarity.Benchmarks\F23.StringSimilarity.Benchmarks.csproj", "{3A9605B1-820C-43C2-8F9B-72BCA5F5543B}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "F23.StringSimilarity.Benchmarks", "test\F23.StringSimilarity.Benchmarks\F23.StringSimilarity.Benchmarks.csproj", "{3A9605B1-820C-43C2-8F9B-72BCA5F5543B}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/StringSimilarity.NET.snk b/StringSimilarity.NET.snk new file mode 100644 index 0000000..7c475c1 Binary files /dev/null and b/StringSimilarity.NET.snk differ diff --git a/src/Directory.Build.props b/src/Directory.Build.props new file mode 100644 index 0000000..3ff68bc --- /dev/null +++ b/src/Directory.Build.props @@ -0,0 +1,4 @@ + + + + diff --git a/src/F23.StringSimilarity/F23.StringSimilarity.csproj b/src/F23.StringSimilarity/F23.StringSimilarity.csproj index b77acfb..79fb442 100644 --- a/src/F23.StringSimilarity/F23.StringSimilarity.csproj +++ b/src/F23.StringSimilarity/F23.StringSimilarity.csproj @@ -20,7 +20,7 @@ - + @@ -28,4 +28,4 @@ bin\Release\netstandard2.0\F23.StringSimilarity.xml - \ No newline at end of file + diff --git a/src/F23.StringSimilarity/Properties/AssemblyInfo.cs b/src/F23.StringSimilarity/Properties/AssemblyInfo.cs index e8a022e..be0fd35 100644 --- a/src/F23.StringSimilarity/Properties/AssemblyInfo.cs +++ b/src/F23.StringSimilarity/Properties/AssemblyInfo.cs @@ -1,3 +1,3 @@ using System.Runtime.CompilerServices; -[assembly: InternalsVisibleTo("F23.StringSimilarity.Tests")] +[assembly: InternalsVisibleTo("F23.StringSimilarity.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b9a3cf7cbdb26a91b8a50d70ec052fe9f1edd3d1989e1079d0b0c1930e2030273a82629e18c7f2932a1e7957d48ec36b2703cda7bab46f3a0684cc86637e02dac24c857a43ef9a63a6459b147d11ec43b75b181de0aa326931ae13ba31c06977b309424c730d895144feab54da5ad84a604f90b2d672406177782027c8413caa")] diff --git a/test/Directory.Build.props b/test/Directory.Build.props new file mode 100644 index 0000000..3ff68bc --- /dev/null +++ b/test/Directory.Build.props @@ -0,0 +1,4 @@ + + + + diff --git a/F23.StringSimilarity.Benchmarks/Benchmarks.cs b/test/F23.StringSimilarity.Benchmarks/Benchmarks.cs similarity index 100% rename from F23.StringSimilarity.Benchmarks/Benchmarks.cs rename to test/F23.StringSimilarity.Benchmarks/Benchmarks.cs diff --git a/F23.StringSimilarity.Benchmarks/F23.StringSimilarity.Benchmarks.csproj b/test/F23.StringSimilarity.Benchmarks/F23.StringSimilarity.Benchmarks.csproj similarity index 80% rename from F23.StringSimilarity.Benchmarks/F23.StringSimilarity.Benchmarks.csproj rename to test/F23.StringSimilarity.Benchmarks/F23.StringSimilarity.Benchmarks.csproj index 9d869a8..f4dda15 100644 --- a/F23.StringSimilarity.Benchmarks/F23.StringSimilarity.Benchmarks.csproj +++ b/test/F23.StringSimilarity.Benchmarks/F23.StringSimilarity.Benchmarks.csproj @@ -12,7 +12,7 @@ - + diff --git a/F23.StringSimilarity.Benchmarks/Program.cs b/test/F23.StringSimilarity.Benchmarks/Program.cs similarity index 100% rename from F23.StringSimilarity.Benchmarks/Program.cs rename to test/F23.StringSimilarity.Benchmarks/Program.cs diff --git a/test/F23.StringSimilarity.Tests/F23.StringSimilarity.Tests.csproj b/test/F23.StringSimilarity.Tests/F23.StringSimilarity.Tests.csproj index b74e697..bc23f6a 100644 --- a/test/F23.StringSimilarity.Tests/F23.StringSimilarity.Tests.csproj +++ b/test/F23.StringSimilarity.Tests/F23.StringSimilarity.Tests.csproj @@ -1,7 +1,7 @@  - net6.0;net8.0 + net8.0;net9.0;net10.0 $(TargetFrameworks);net481 latest enable @@ -18,9 +18,9 @@ - - - + + + all runtime; build; native; contentfiles; analyzers