diff --git a/.github/workflows/benchmarks-ormlite.yml b/.github/workflows/benchmarks-ormlite.yml index 4b80758039e..6231fe9ab85 100644 --- a/.github/workflows/benchmarks-ormlite.yml +++ b/.github/workflows/benchmarks-ormlite.yml @@ -43,11 +43,11 @@ jobs: mysql -h 127.0.0.1 --password=p@55wOrd --user root -e "CREATE DATABASE IF NOT EXISTS test" sqlcmd -U sa -P p@55wOrd -Q "CREATE DATABASE test" - - uses: actions/checkout@v4 + - uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd #v5 - name: Setup dotnet - uses: actions/setup-dotnet@v4 + uses: actions/setup-dotnet@v5 with: - dotnet-version: '8.0.100' + dotnet-version: 10.0.x - name: Build diff --git a/.github/workflows/build-aws.yml b/.github/workflows/build-aws.yml index ddfe0a839f1..a23a988efb2 100644 --- a/.github/workflows/build-aws.yml +++ b/.github/workflows/build-aws.yml @@ -10,11 +10,11 @@ jobs: build-aws: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd #v5 - name: Setup dotnet - uses: actions/setup-dotnet@v4 + uses: actions/setup-dotnet@v5 with: - dotnet-version: '8.0.100' + dotnet-version: 10.0.x - name: Build @@ -28,7 +28,7 @@ jobs: echo "AWS_SECRET_KEY=${{ secrets.AWS_SECRET_KEY }}" >> $GITHUB_ENV - name: Aws Tests - run: dotnet test --framework net8.0 ./ServiceStack.Aws/tests/ServiceStack.Aws.Tests/ServiceStack.Aws.Tests.csproj --logger 'trx;LogFileName=results.trx' + run: dotnet test --framework net10.0 ./ServiceStack.Aws/tests/ServiceStack.Aws.Tests/ServiceStack.Aws.Tests.csproj --logger 'trx;LogFileName=results.trx' - name: Test Report uses: dorny/test-reporter@v1 diff --git a/.github/workflows/build-azure.yml b/.github/workflows/build-azure.yml index 8e610596717..c80784d657a 100644 --- a/.github/workflows/build-azure.yml +++ b/.github/workflows/build-azure.yml @@ -13,11 +13,11 @@ jobs: build-azure: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd #v5 - name: Setup dotnet - uses: actions/setup-dotnet@v4 + uses: actions/setup-dotnet@v5 with: - dotnet-version: '8.0.100' + dotnet-version: 10.0.x - name: Build @@ -30,7 +30,7 @@ jobs: # Azure tests need mocking. # - name: Azure Tests -# run: dotnet test --framework net8.0 ./ServiceStack.Azure/tests/ServiceStack.Azure.Tests/ServiceStack.Azure.Tests.csproj --logger 'trx;LogFileName=results.trx' +# run: dotnet test --framework net10.0 ./ServiceStack.Azure/tests/ServiceStack.Azure.Tests/ServiceStack.Azure.Tests.csproj --logger 'trx;LogFileName=results.trx' # # - name: Test Report # uses: dorny/test-reporter@v1 diff --git a/.github/workflows/build-blazor.yml b/.github/workflows/build-blazor.yml index 6e6f9ae9aed..8115f8a5f25 100644 --- a/.github/workflows/build-blazor.yml +++ b/.github/workflows/build-blazor.yml @@ -13,11 +13,11 @@ jobs: build-blazor: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd #v5 - name: Setup dotnet - uses: actions/setup-dotnet@v4 + uses: actions/setup-dotnet@v5 with: - dotnet-version: '8.0.100' + dotnet-version: 10.0.x - name: Build diff --git a/.github/workflows/build-core.yml b/.github/workflows/build-core.yml deleted file mode 100644 index 4f66ebb45d6..00000000000 --- a/.github/workflows/build-core.yml +++ /dev/null @@ -1,26 +0,0 @@ -name: Build Core - -on: - push: - paths: - - 'ServiceStack.Core/**' - - '.github/workflows/build-core.yml' - -permissions: - contents: read - -jobs: - build-servicestack-core: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - name: Setup dotnet - uses: actions/setup-dotnet@v4 - with: - dotnet-version: '8.0.100' - - - - name: Build - working-directory: ServiceStack.Core/build - run: dotnet build ./build.proj - \ No newline at end of file diff --git a/.github/workflows/build-logging.yml b/.github/workflows/build-logging.yml index b68cc10b83a..46b1f541784 100644 --- a/.github/workflows/build-logging.yml +++ b/.github/workflows/build-logging.yml @@ -13,11 +13,11 @@ jobs: build-logging: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd #v5 - name: Setup dotnet - uses: actions/setup-dotnet@v4 + uses: actions/setup-dotnet@v5 with: - dotnet-version: '8.0.100' + dotnet-version: 10.0.x - name: Build @@ -30,7 +30,7 @@ jobs: # net472 only package, need to upgrade if possible to run tests or use different runner. # - name: Logging Tests -# run: dotnet test --framework net8.0 ./ServiceStack.Logging/tests/ServiceStack.Logging.Tests/ServiceStack.Logging.Tests.csproj --logger 'trx;LogFileName=results.trx' +# run: dotnet test --framework net10.0 ./ServiceStack.Logging/tests/ServiceStack.Logging.Tests/ServiceStack.Logging.Tests.csproj --logger 'trx;LogFileName=results.trx' # - name: Test Report diff --git a/.github/workflows/build-ormlite.yml b/.github/workflows/build-ormlite.yml index 7664db1cd88..9016d4fea99 100644 --- a/.github/workflows/build-ormlite.yml +++ b/.github/workflows/build-ormlite.yml @@ -10,11 +10,11 @@ jobs: build-ormlite: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd #v5 - name: Setup dotnet - uses: actions/setup-dotnet@v4 + uses: actions/setup-dotnet@v5 with: - dotnet-version: '8.0.100' + dotnet-version: 10.0.x - name: Build @@ -27,13 +27,13 @@ jobs: - name: Tests Setup working-directory: ServiceStack.OrmLite/tests - run: dotnet test --framework net8.0 ./ServiceStack.OrmLite.Tests.Setup/ServiceStack.OrmLite.Tests.Setup.csproj + run: dotnet test --framework net10.0 ./ServiceStack.OrmLite.Tests.Setup/ServiceStack.OrmLite.Tests.Setup.csproj - name: Test Sqlite working-directory: ServiceStack.OrmLite/tests env: ORMLITE_DIALECT: Sqlite - run: dotnet test --framework net8.0 ./ServiceStack.OrmLite.SqliteTests/ServiceStack.OrmLite.SqliteTests.csproj --logger 'trx;LogFileName=test-results.trx' + run: dotnet test --framework net10.0 ./ServiceStack.OrmLite.SqliteTests/ServiceStack.OrmLite.SqliteTests.csproj --logger 'trx;LogFileName=test-results.trx' - name: Test Report uses: dorny/test-reporter@v1 diff --git a/.github/workflows/build-redis.yml b/.github/workflows/build-redis.yml index cb63883517c..f49bf351f0d 100644 --- a/.github/workflows/build-redis.yml +++ b/.github/workflows/build-redis.yml @@ -20,11 +20,11 @@ jobs: ports: - 6379:6379 steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd #v5 - name: Setup dotnet - uses: actions/setup-dotnet@v4 + uses: actions/setup-dotnet@v5 with: - dotnet-version: '8.0.100' + dotnet-version: 10.0.x - name: Build @@ -37,7 +37,7 @@ jobs: - name: Test Without Integration working-directory: ServiceStack.Redis/tests - run: dotnet test --framework net8.0 ./ServiceStack.Redis.Tests/ServiceStack.Redis.Tests.csproj --filter TestCategory\!=Integration --logger 'trx;LogFileName=non-integration-results.trx' + run: dotnet test --framework net10.0 ./ServiceStack.Redis.Tests/ServiceStack.Redis.Tests.csproj --filter TestCategory\!=Integration --logger 'trx;LogFileName=non-integration-results.trx' - name: Non-Integration Tests Report uses: dorny/test-reporter@v1 @@ -52,7 +52,7 @@ jobs: - name: Test With Integration id: test_integration working-directory: ServiceStack.Redis/tests - run: dotnet test --framework net8.0 ./ServiceStack.Redis.Tests/ServiceStack.Redis.Tests.csproj --filter TestCategory=Integration --logger 'trx;LogFileName=integration-results.trx' + run: dotnet test --framework net10.0 ./ServiceStack.Redis.Tests/ServiceStack.Redis.Tests.csproj --filter TestCategory=Integration --logger 'trx;LogFileName=integration-results.trx' - name: Integration Tests Report uses: dorny/test-reporter@v1 diff --git a/.github/workflows/build-servicestack.yml b/.github/workflows/build-servicestack.yml index 8781dfaa756..402cc21c048 100644 --- a/.github/workflows/build-servicestack.yml +++ b/.github/workflows/build-servicestack.yml @@ -39,11 +39,11 @@ jobs: ports: - 48303:5432 steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd #v5 - name: Setup dotnet - uses: actions/setup-dotnet@v4 + uses: actions/setup-dotnet@v5 with: - dotnet-version: '8.0.100' + dotnet-version: 10.0.x - name: Build @@ -60,7 +60,7 @@ jobs: echo "GOOGLE_FREE_API_KEY=${{ secrets.GOOGLE_FREE_API_KEY }}" >> $GITHUB_ENV - name: Test Extensions - run: dotnet test --framework net8.0 ./ServiceStack/tests/ServiceStack.Extensions.Tests/ServiceStack.Extensions.Tests.csproj --logger 'trx;LogFileName=results.trx' + run: dotnet test --framework net10.0 ./ServiceStack/tests/ServiceStack.Extensions.Tests/ServiceStack.Extensions.Tests.csproj --logger 'trx;LogFileName=results.trx' - name: Test Report uses: dorny/test-reporter@v1 @@ -72,7 +72,7 @@ jobs: reporter: dotnet-trx - name: Test Common - run: dotnet test --framework net8.0 ./ServiceStack/tests/ServiceStack.Common.Tests/ServiceStack.Common.Tests.csproj --logger 'trx;LogFileName=results.trx' + run: dotnet test --framework net10.0 ./ServiceStack/tests/ServiceStack.Common.Tests/ServiceStack.Common.Tests.csproj --logger 'trx;LogFileName=results.trx' - name: Test Report uses: dorny/test-reporter@v1 @@ -84,7 +84,7 @@ jobs: reporter: dotnet-trx - name: Test ServiceModels - run: dotnet test --framework net8.0 ./ServiceStack/tests/ServiceStack.ServiceModel.Tests/ServiceStack.ServiceModel.Tests.csproj --logger 'trx;LogFileName=results.trx' + run: dotnet test --framework net10.0 ./ServiceStack/tests/ServiceStack.ServiceModel.Tests/ServiceStack.ServiceModel.Tests.csproj --logger 'trx;LogFileName=results.trx' - name: Test Report uses: dorny/test-reporter@v1 @@ -99,7 +99,7 @@ jobs: env: PGSQL_CONNECTION: Server=localhost;Port=48303;User Id=postgres;Password=test;Database=test;Pooling=true;MinPoolSize=0;MaxPoolSize=200 MSSQL_CONNECTION: Server=localhost,48501;Database=master;User Id=sa;Password=Test!tesT;MultipleActiveResultSets=True; - run: dotnet test --framework net8.0 ./ServiceStack/tests/ServiceStack.WebHost.Endpoints.Tests/ServiceStack.WebHost.Endpoints.Tests.csproj --logger 'trx;LogFileName=results.trx' --logger 'console;verbosity=detailed' + run: dotnet test --framework net10.0 ./ServiceStack/tests/ServiceStack.WebHost.Endpoints.Tests/ServiceStack.WebHost.Endpoints.Tests.csproj --logger 'trx;LogFileName=results.trx' --logger 'console;verbosity=detailed' - name: Test Report uses: dorny/test-reporter@v1 diff --git a/.github/workflows/build-stripe.yml b/.github/workflows/build-stripe.yml index 3aa9019ea0f..2304a3b0873 100644 --- a/.github/workflows/build-stripe.yml +++ b/.github/workflows/build-stripe.yml @@ -10,11 +10,11 @@ jobs: build-stripe: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd #v5 - name: Setup dotnet - uses: actions/setup-dotnet@v4 + uses: actions/setup-dotnet@v5 with: - dotnet-version: '8.0.100' + dotnet-version: 10.0.x - name: Build @@ -26,7 +26,7 @@ jobs: echo "SERVICESTACK_LICENSE=${{ secrets.SERVICESTACK_LICENSE }}" >> $GITHUB_ENV - name: Stripe Tests - run: dotnet test --framework net8.0 ./ServiceStack.Stripe/tests/ServiceStack.Stripe.Tests/ServiceStack.Stripe.Tests.csproj --logger 'trx;LogFileName=results.trx' + run: dotnet test --framework net10.0 ./ServiceStack.Stripe/tests/ServiceStack.Stripe.Tests/ServiceStack.Stripe.Tests.csproj --logger 'trx;LogFileName=results.trx' - name: Test Report uses: dorny/test-reporter@v1 diff --git a/.github/workflows/build-text.yml b/.github/workflows/build-text.yml index 85ef7fba735..82738cb75f0 100644 --- a/.github/workflows/build-text.yml +++ b/.github/workflows/build-text.yml @@ -10,11 +10,11 @@ jobs: build-text: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd #v5 - name: Setup dotnet - uses: actions/setup-dotnet@v4 + uses: actions/setup-dotnet@v5 with: - dotnet-version: '8.0.100' + dotnet-version: 10.0.x - name: Build @@ -26,7 +26,7 @@ jobs: echo "SERVICESTACK_LICENSE=${{ secrets.SERVICESTACK_LICENSE }}" >> $GITHUB_ENV - name: Text tests - run: dotnet test --framework net8.0 ./ServiceStack.Text/tests/ServiceStack.Text.Tests/ServiceStack.Text.Tests.csproj --logger 'trx;LogFileName=test-results.trx' + run: dotnet test --framework net10.0 ./ServiceStack.Text/tests/ServiceStack.Text.Tests/ServiceStack.Text.Tests.csproj --logger 'trx;LogFileName=test-results.trx' - name: Text Tests Report uses: dorny/test-reporter@v1 diff --git a/.github/workflows/feedz-push.yml b/.github/workflows/feedz-push.yml index cee0295744b..bb479436693 100644 --- a/.github/workflows/feedz-push.yml +++ b/.github/workflows/feedz-push.yml @@ -9,16 +9,16 @@ jobs: runs-on: ubuntu-latest steps: # Checkout the repo - - uses: actions/checkout@v4 + - uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd #v5 # Setup .NET SDK - name: Setup .NET - uses: actions/setup-dotnet@v4 + uses: actions/setup-dotnet@v5 with: - dotnet-version: '8.*' + dotnet-version: 10.0.x - name: Download artifact - uses: dawidd6/action-download-artifact@v2 + uses: dawidd6/action-download-artifact@268677152d06ba59fcec7a7f0b5d961b6ccd7e1e #v2 with: workflow: pre-release-pack.yml # workflow_conclusion: success @@ -46,8 +46,8 @@ jobs: - name: Push to GitHub working-directory: ./build/staging run: | - # Check if more than 73 packages - if [[ ${number_of_packages} -gt 73 ]]; then + # Check if more than 48 packages + if [[ ${number_of_packages} -gt 48 ]]; then echo "Publishing to Azure Artifacts" dotnet nuget push '*.nupkg' --source ${{ env.FEED_URL }} --api-key ${{ secrets.FEEDZ_TOKEN }} --skip-duplicate else diff --git a/.github/workflows/github-push.yml b/.github/workflows/github-push.yml index 62c0a93750e..ea368b9c4ab 100644 --- a/.github/workflows/github-push.yml +++ b/.github/workflows/github-push.yml @@ -9,15 +9,15 @@ jobs: github-push: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd #v5 - name: Setup dotnet - uses: actions/setup-dotnet@v4 + uses: actions/setup-dotnet@v5 with: - dotnet-version: '8.0.100' + dotnet-version: 10.0.x - name: Download artifact - uses: dawidd6/action-download-artifact@v2 + uses: dawidd6/action-download-artifact@268677152d06ba59fcec7a7f0b5d961b6ccd7e1e #v2 with: workflow: pre-release-pack.yml # workflow_conclusion: success @@ -44,10 +44,10 @@ jobs: - name: Push to GitHub working-directory: ./build/staging run: | - # Check if more than 73 packages - if [[ ${number_of_packages} -gt 73 ]]; then + # Check if more than 48 packages + if [[ ${number_of_packages} -gt 48 ]]; then echo "Pushing to GitHub Packages" - dotnet nuget push '*.nupkg' --source https://nuget.pkg.github.com/ServiceStack/index.json --api-key ${{ secrets.GITHUB_TOKEN }} + dotnet nuget push '*.nupkg' --source https://nuget.pkg.github.com/ServiceStack/index.json --api-key ${{ secrets.GITHUB_TOKEN }} --skip-duplicate else echo 'Less files than expected, skipping push' exit 1 diff --git a/.github/workflows/integration-ormlite-community-providers.yml b/.github/workflows/integration-ormlite-community-providers.yml index 9eee1ccb413..72e9095b8c2 100644 --- a/.github/workflows/integration-ormlite-community-providers.yml +++ b/.github/workflows/integration-ormlite-community-providers.yml @@ -23,11 +23,11 @@ jobs: ports: - 48101:3050 steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd #v5 - name: Setup dotnet - uses: actions/setup-dotnet@v4 + uses: actions/setup-dotnet@v5 with: - dotnet-version: '8.0.100' + dotnet-version: 10.0.x - name: Build @@ -45,7 +45,7 @@ jobs: ORMLITE_DIALECT: Firebird FIREBIRD_CONNECTION: User=test;Password=Test!tesT;Database=/firebird/data/test.gdb;DataSource=localhost;Port=48101;Dialect=3;charset=ISO8859_1;MinPoolSize=0;MaxPoolSize=100; EnableLegacyClientAuth: true - run: dotnet test --framework net8.0 ./ServiceStack.OrmLite.Tests.Setup/ServiceStack.OrmLite.Tests.Setup.csproj + run: dotnet test --framework net10.0 ./ServiceStack.OrmLite.Tests.Setup/ServiceStack.OrmLite.Tests.Setup.csproj - name: Test Firebird OrmLite working-directory: ServiceStack.OrmLite/tests @@ -55,7 +55,7 @@ jobs: FIREBIRD_CONNECTION: User=test;Password=Test!tesT;Database=/firebird/data/test.gdb;DataSource=localhost;Port=48101;Dialect=3;charset=ISO8859_1;MinPoolSize=0;MaxPoolSize=100; EnableLegacyClientAuth: true run: | - dotnet test --framework net8.0 ./ServiceStack.OrmLite.Tests/ServiceStack.OrmLite.Tests.csproj --logger 'trx;LogFileName=results.trx' --filter "FullyQualifiedName=ServiceStack.OrmLite.Tests.OrderByTests" + dotnet test --framework net10.0 ./ServiceStack.OrmLite.Tests/ServiceStack.OrmLite.Tests.csproj --logger 'trx;LogFileName=results.trx' --filter "FullyQualifiedName=ServiceStack.OrmLite.Tests.OrderByTests" - name: Test Report uses: dorny/test-reporter@v1 diff --git a/.github/workflows/integration-ormlite.yml b/.github/workflows/integration-ormlite.yml index 7af620f764f..3868fe18541 100644 --- a/.github/workflows/integration-ormlite.yml +++ b/.github/workflows/integration-ormlite.yml @@ -44,11 +44,11 @@ jobs: ports: - 48205:3306 steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd #v5 - name: Setup dotnet - uses: actions/setup-dotnet@v4 + uses: actions/setup-dotnet@v5 with: - dotnet-version: '8.0.100' + dotnet-version: 10.0.x - name: Build @@ -63,7 +63,7 @@ jobs: working-directory: ServiceStack.OrmLite/tests env: ORMLITE_DIALECT: Sqlite - run: dotnet test --framework net8.0 ./ServiceStack.OrmLite.Tests/ServiceStack.OrmLite.Tests.csproj --logger 'trx;LogFileName=results.trx' + run: dotnet test --framework net10.0 ./ServiceStack.OrmLite.Tests/ServiceStack.OrmLite.Tests.csproj --logger 'trx;LogFileName=results.trx' - name: Test Report uses: dorny/test-reporter@v1 @@ -80,7 +80,7 @@ jobs: env: ORMLITE_DIALECT: PostgreSql11 PGSQL_CONNECTION: Server=localhost;Port=48303;User Id=postgres;Password=test;Database=test;Pooling=true;MinPoolSize=0;MaxPoolSize=200 - run: dotnet test --framework net8.0 ./ServiceStack.OrmLite.Tests.Setup/ServiceStack.OrmLite.Tests.Setup.csproj + run: dotnet test --framework net10.0 ./ServiceStack.OrmLite.Tests.Setup/ServiceStack.OrmLite.Tests.Setup.csproj - name: Test Postgres OrmLite working-directory: ServiceStack.OrmLite/tests @@ -88,7 +88,7 @@ jobs: env: ORMLITE_DIALECT: PostgreSql11 PGSQL_CONNECTION: Server=localhost;Port=48303;User Id=postgres;Password=test;Database=test;Pooling=true;MinPoolSize=0;MaxPoolSize=200 - run: dotnet test --framework net8.0 ./ServiceStack.OrmLite.Tests/ServiceStack.OrmLite.Tests.csproj --logger 'trx;LogFileName=results.trx' + run: dotnet test --framework net10.0 ./ServiceStack.OrmLite.Tests/ServiceStack.OrmLite.Tests.csproj --logger 'trx;LogFileName=results.trx' - name: Test Report uses: dorny/test-reporter@v1 @@ -105,7 +105,7 @@ jobs: env: ORMLITE_DIALECT: SqlServer2017 MSSQL_CONNECTION: Server=localhost,48501;Database=master;User Id=sa;Password=Test!tesT;MultipleActiveResultSets=True; - run: dotnet test --framework net8.0 ./ServiceStack.OrmLite.Tests.Setup/ServiceStack.OrmLite.Tests.Setup.csproj + run: dotnet test --framework net10.0 ./ServiceStack.OrmLite.Tests.Setup/ServiceStack.OrmLite.Tests.Setup.csproj - name: Test SQL Server OrmLite @@ -114,7 +114,7 @@ jobs: env: ORMLITE_DIALECT: SqlServer2017 MSSQL_CONNECTION: Server=localhost,48501;Database=master;User Id=sa;Password=Test!tesT;MultipleActiveResultSets=True; - run: dotnet test --framework net8.0 ./ServiceStack.OrmLite.Tests/ServiceStack.OrmLite.Tests.csproj --logger 'trx;LogFileName=results.trx' + run: dotnet test --framework net10.0 ./ServiceStack.OrmLite.Tests/ServiceStack.OrmLite.Tests.csproj --logger 'trx;LogFileName=results.trx' - name: Test Report uses: dorny/test-reporter@v1 @@ -131,7 +131,7 @@ jobs: env: ORMLITE_DIALECT: MySql MYSQL_CONNECTION: Server=localhost;Port=48205;Database=test;UID=root;Password=Test!tesT;AllowLoadLocalInfile=true;Convert Zero Datetime=True - run: dotnet test --framework net8.0 ./ServiceStack.OrmLite.Tests.Setup/ServiceStack.OrmLite.Tests.Setup.csproj + run: dotnet test --framework net10.0 ./ServiceStack.OrmLite.Tests.Setup/ServiceStack.OrmLite.Tests.Setup.csproj - name: Test MySql OrmLite working-directory: ServiceStack.OrmLite/tests @@ -139,7 +139,7 @@ jobs: env: ORMLITE_DIALECT: MySql MYSQL_CONNECTION: Server=localhost;Port=48205;Database=test;UID=root;Password=Test!tesT - run: dotnet test --framework net8.0 ./ServiceStack.OrmLite.Tests/ServiceStack.OrmLite.Tests.csproj --logger 'trx;LogFileName=results.trx' + run: dotnet test --framework net10.0 ./ServiceStack.OrmLite.Tests/ServiceStack.OrmLite.Tests.csproj --logger 'trx;LogFileName=results.trx' - name: Test Report uses: dorny/test-reporter@v1 diff --git a/.github/workflows/myget-push.yml b/.github/workflows/myget-push.yml index e48972d553a..ff225580304 100644 --- a/.github/workflows/myget-push.yml +++ b/.github/workflows/myget-push.yml @@ -6,15 +6,15 @@ jobs: myget-push: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd #v5 - name: Setup dotnet - uses: actions/setup-dotnet@v4 + uses: actions/setup-dotnet@v5 with: - dotnet-version: '8.0.100' + dotnet-version: 10.0.x - name: Download artifact - uses: dawidd6/action-download-artifact@v2 + uses: dawidd6/action-download-artifact@268677152d06ba59fcec7a7f0b5d961b6ccd7e1e #v2 with: workflow: pre-release-pack.yml # workflow_conclusion: success @@ -32,8 +32,8 @@ jobs: - name: Push to MyGet working-directory: ./build/staging run: | - # Check if more than 73 packages - if [[ ${number_of_packages} -gt 73 ]]; then + # Check if more than 48 packages + if [[ ${number_of_packages} -gt 48 ]]; then echo "Pushing to MyGet" dotnet nuget push '*.nupkg' -s 'https://www.myget.org/F/servicestack/api/v2/package' -k '${{ secrets.MYGET_APIKEY }}' --skip-duplicate else diff --git a/.github/workflows/nuget-pack.yml b/.github/workflows/nuget-pack.yml index 742130deb75..2e67ca0e905 100644 --- a/.github/workflows/nuget-pack.yml +++ b/.github/workflows/nuget-pack.yml @@ -27,11 +27,11 @@ jobs: ports: - 48303:5432 steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd #v5 - name: Setup dotnet - uses: actions/setup-dotnet@v4 + uses: actions/setup-dotnet@v5 with: - dotnet-version: '8.0.100' + dotnet-version: 10.0.x - name: Env setup @@ -47,7 +47,7 @@ jobs: run: dotnet build ./build.proj - name: Text tests - run: dotnet test --framework net8.0 ./ServiceStack.Text/tests/ServiceStack.Text.Tests/ServiceStack.Text.Tests.csproj --logger 'trx;LogFileName=test-results.trx' + run: dotnet test --framework net10.0 ./ServiceStack.Text/tests/ServiceStack.Text.Tests/ServiceStack.Text.Tests.csproj --logger 'trx;LogFileName=test-results.trx' - name: Text Tests Report uses: dorny/test-reporter@v1 @@ -70,7 +70,7 @@ jobs: - name: Redis Test Without Integration working-directory: ServiceStack.Redis/tests - run: dotnet test --framework net8.0 ./ServiceStack.Redis.Tests/ServiceStack.Redis.Tests.csproj --filter TestCategory\!=Integration --logger 'trx;LogFileName=non-integration-results.trx' + run: dotnet test --framework net10.0 ./ServiceStack.Redis.Tests/ServiceStack.Redis.Tests.csproj --filter TestCategory\!=Integration --logger 'trx;LogFileName=non-integration-results.trx' - name: Redis Non-Integration Tests Report uses: dorny/test-reporter@v1 @@ -85,7 +85,7 @@ jobs: - name: Redis Test With Integration id: test_integration working-directory: ServiceStack.Redis/tests - run: dotnet test --framework net8.0 ./ServiceStack.Redis.Tests/ServiceStack.Redis.Tests.csproj --filter TestCategory=Integration --logger 'trx;LogFileName=integration-results.trx' + run: dotnet test --framework net10.0 ./ServiceStack.Redis.Tests/ServiceStack.Redis.Tests.csproj --filter TestCategory=Integration --logger 'trx;LogFileName=integration-results.trx' - name: Redis Integration Tests Report uses: dorny/test-reporter@v1 @@ -104,7 +104,7 @@ jobs: working-directory: ServiceStack.OrmLite/tests env: ORMLITE_DIALECT: Sqlite - run: dotnet test --framework net8.0 ./ServiceStack.OrmLite.SqliteTests/ServiceStack.OrmLite.SqliteTests.csproj --logger 'trx;LogFileName=test-results.trx' + run: dotnet test --framework net10.0 ./ServiceStack.OrmLite.SqliteTests/ServiceStack.OrmLite.SqliteTests.csproj --logger 'trx;LogFileName=test-results.trx' - name: Test Sqlite Report uses: dorny/test-reporter@v1 @@ -120,7 +120,7 @@ jobs: run: dotnet build ./build.proj - name: Test ServiceStack.Common - run: dotnet test --framework net8.0 ./ServiceStack/tests/ServiceStack.Common.Tests/ServiceStack.Common.Tests.csproj --logger 'trx;LogFileName=results.trx' + run: dotnet test --framework net10.0 ./ServiceStack/tests/ServiceStack.Common.Tests/ServiceStack.Common.Tests.csproj --logger 'trx;LogFileName=results.trx' - name: Test Report uses: dorny/test-reporter@v1 @@ -132,7 +132,7 @@ jobs: reporter: dotnet-trx - name: Test ServiceStack.ServiceModels - run: dotnet test --framework net8.0 ./ServiceStack/tests/ServiceStack.ServiceModel.Tests/ServiceStack.ServiceModel.Tests.csproj --logger 'trx;LogFileName=results.trx' + run: dotnet test --framework net10.0 ./ServiceStack/tests/ServiceStack.ServiceModel.Tests/ServiceStack.ServiceModel.Tests.csproj --logger 'trx;LogFileName=results.trx' - name: Test Report uses: dorny/test-reporter@v1 @@ -147,7 +147,7 @@ jobs: env: PGSQL_CONNECTION: Server=localhost;Port=48303;User Id=postgres;Password=test;Database=test;Pooling=true;MinPoolSize=0;MaxPoolSize=200 MSSQL_CONNECTION: Server=localhost,48501;Database=master;User Id=sa;Password=Test!tesT;MultipleActiveResultSets=True;Encrypt=false;TrustServerCertificate=true; - run: dotnet test --framework net8.0 ./ServiceStack/tests/ServiceStack.WebHost.Endpoints.Tests/ServiceStack.WebHost.Endpoints.Tests.csproj --logger 'trx;LogFileName=results.trx' + run: dotnet test --framework net10.0 ./ServiceStack/tests/ServiceStack.WebHost.Endpoints.Tests/ServiceStack.WebHost.Endpoints.Tests.csproj --logger 'trx;LogFileName=results.trx' - name: Test Report uses: dorny/test-reporter@v1 @@ -163,7 +163,7 @@ jobs: run: dotnet build ./build.proj - name: Aws Tests - run: dotnet test --framework net8.0 ./ServiceStack.Aws/tests/ServiceStack.Aws.Tests/ServiceStack.Aws.Tests.csproj --logger 'trx;LogFileName=results.trx' + run: dotnet test --framework net10.0 ./ServiceStack.Aws/tests/ServiceStack.Aws.Tests/ServiceStack.Aws.Tests.csproj --logger 'trx;LogFileName=results.trx' - name: Test Report uses: dorny/test-reporter@v1 @@ -185,17 +185,13 @@ jobs: - name: Build Logging working-directory: ServiceStack.Logging/build run: dotnet build ./build.proj - - - name: Build Core - working-directory: ServiceStack.Core/build - run: dotnet build ./build.proj - name: Build Stripe working-directory: ServiceStack.Stripe/build run: dotnet build ./build.proj - name: Stripe Tests - run: dotnet test --framework net8.0 ./ServiceStack.Stripe/tests/ServiceStack.Stripe.Tests/ServiceStack.Stripe.Tests.csproj --logger 'trx;LogFileName=results.trx' + run: dotnet test --framework net10.0 ./ServiceStack.Stripe/tests/ServiceStack.Stripe.Tests/ServiceStack.Stripe.Tests.csproj --logger 'trx;LogFileName=results.trx' - name: Test Report uses: dorny/test-reporter@v1 @@ -210,11 +206,11 @@ jobs: needs: build-test-all runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd #v5 - name: Setup .NET - uses: actions/setup-dotnet@v4 + uses: actions/setup-dotnet@v5 with: - dotnet-version: '8.*' + dotnet-version: 10.0.x - name: Rebuild All working-directory: ./build @@ -229,7 +225,6 @@ jobs: chmod +x ../ServiceStack.Redis/build/build.sh chmod +x ../ServiceStack.Stripe/build/build.sh chmod +x ../ServiceStack.Text/build/build.sh - chmod +x ../ServiceStack.Core/build/build.sh ./build-all.sh - name: Stage output @@ -242,12 +237,12 @@ jobs: echo "number_of_packages=${number_of_packages}" >> $GITHUB_ENV - name: Check number of packages - if: env.number_of_packages < 73 + if: env.number_of_packages < 48 run: | - echo "Less packages produced than expected, failing." + echo "Expected at least 48 packages, got ${{ env.number_of_packages }}, failing." exit 1 - - uses: actions/upload-artifact@v4 + - uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 #v4 with: name: ServiceStack Packages retention-days: 1 diff --git a/.github/workflows/nuget-push.yml b/.github/workflows/nuget-push.yml index e5f738afff9..fd70f42d805 100644 --- a/.github/workflows/nuget-push.yml +++ b/.github/workflows/nuget-push.yml @@ -6,15 +6,15 @@ jobs: nuget-push: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd #v5 - name: Setup dotnet - uses: actions/setup-dotnet@v4 + uses: actions/setup-dotnet@v5 with: - dotnet-version: '8.0.100' + dotnet-version: 10.0.x - name: Download artifact - uses: dawidd6/action-download-artifact@v2 + uses: dawidd6/action-download-artifact@268677152d06ba59fcec7a7f0b5d961b6ccd7e1e #v2 with: workflow: nuget-pack.yml # workflow_conclusion: success @@ -32,8 +32,8 @@ jobs: - name: Push to NuGet working-directory: ./build/staging run: | - # Check if more than 73 packages - if [[ ${number_of_packages} -gt 73 ]]; then + # Check if more than 48 packages + if [[ ${number_of_packages} -gt 48 ]]; then echo "Pushing to NuGet" dotnet nuget push '*.nupkg' -s 'https://api.nuget.org/v3/index.json' -k '${{ secrets.NUGET_APIKEY }}' --skip-duplicate else diff --git a/.github/workflows/pre-release-pack.yml b/.github/workflows/pre-release-pack.yml index 92e0292ba61..77b2b68d259 100644 --- a/.github/workflows/pre-release-pack.yml +++ b/.github/workflows/pre-release-pack.yml @@ -9,11 +9,11 @@ jobs: pre-release-pack: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd #v5 - name: Setup dotnet - uses: actions/setup-dotnet@v4 + uses: actions/setup-dotnet@v5 with: - dotnet-version: '8.0.100' + dotnet-version: 10.0.x - name: Build All @@ -29,7 +29,6 @@ jobs: chmod +x ../ServiceStack.Redis/build/build.sh chmod +x ../ServiceStack.Stripe/build/build.sh chmod +x ../ServiceStack.Text/build/build.sh - chmod +x ../ServiceStack.Core/build/build.sh ./build-all.sh - name: Stage output @@ -43,13 +42,13 @@ jobs: - name: Check number of packages - if: env.number_of_packages < 73 + if: env.number_of_packages < 48 run: | - echo "less packages produced (${{ env.number_of_packages }}) than expected (>=73), failing." + echo "less packages produced (${{ env.number_of_packages }}) than expected (>=49), failing." ls -1 ./build/staging/*.nupkg exit 1 - - uses: actions/upload-artifact@v4 + - uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 #v4 with: name: ServiceStack Packages retention-days: 1 diff --git a/.gitignore b/.gitignore index fb54b0d60d5..128b137a4c7 100644 --- a/.gitignore +++ b/.gitignore @@ -85,3 +85,4 @@ src/ServiceStack.userprefs src/ServiceStack.sln.DotSettings ServiceStack/tests/NorthwindAuto/Configure.secrets.cs ServiceStack/tests/NorthwindAuto/App_Data/chinook.sqlite +mise.toml diff --git a/ServiceStack.Aws/src/Directory.Build.props b/ServiceStack.Aws/src/Directory.Build.props index ba36236d6cf..22bdedd1591 100644 --- a/ServiceStack.Aws/src/Directory.Build.props +++ b/ServiceStack.Aws/src/Directory.Build.props @@ -1,7 +1,7 @@ - 8.10.1 + 10.0.7 ServiceStack ServiceStack, Inc. © 2008-2022 ServiceStack, Inc @@ -41,10 +41,14 @@ - $(DefineConstants);NET8_0;NET6_0_OR_GREATER + $(DefineConstants);NET8_0;NET6_0_OR_GREATER;NET8_0_OR_GREATER - + + $(DefineConstants);NET8_0;NET6_0_OR_GREATER;NET8_0_OR_GREATER;NET10_0_OR_GREATER + + + $(DefineConstants);NETCORE;NETCORE_SUPPORT diff --git a/ServiceStack.Aws/src/ServiceStack.Aws.sln b/ServiceStack.Aws/src/ServiceStack.Aws.sln index ce41bc2ad11..ff92e2ff302 100644 --- a/ServiceStack.Aws/src/ServiceStack.Aws.sln +++ b/ServiceStack.Aws/src/ServiceStack.Aws.sln @@ -9,7 +9,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{91F39E88 ..\build\build.proj = ..\build\build.proj ..\build\start-local-dynamodb.bat = ..\build\start-local-dynamodb.bat Directory.Build.props = Directory.Build.props - ServiceStack.Aws\ServiceStack.Aws.Core.csproj = ServiceStack.Aws\ServiceStack.Aws.Core.csproj ..\tests\Directory.Build.props = ..\tests\Directory.Build.props EndProjectSection EndProject diff --git a/ServiceStack.Aws/src/ServiceStack.Aws/ServiceStack.Aws.Core.csproj b/ServiceStack.Aws/src/ServiceStack.Aws/ServiceStack.Aws.Core.csproj deleted file mode 100644 index 14305fa005e..00000000000 --- a/ServiceStack.Aws/src/ServiceStack.Aws/ServiceStack.Aws.Core.csproj +++ /dev/null @@ -1,44 +0,0 @@ - - - - ServiceStack.Aws.Core - ServiceStack.Aws - ServiceStack.Aws - netstandard2.0;net6.0;net8.0 - ServiceStack.Aws .NET Standard 2.0 - - .NET Standard 2.0 version of ServiceStack.Aws - - ServiceStack;AWS;Amazon;WebServices;DynamoDb;S3;SQS;Cache;CacheClient - - - $(DefineConstants);NETCORE;NETSTANDARD2_0 - - - $(DefineConstants);NETCORE;NET6_0;NET6_0_OR_GREATER - - - $(DefineConstants);NETCORE;NET8_0;NET6_0_OR_GREATER - - - - - - - - - - - - - - - - - - - - - - - diff --git a/ServiceStack.Aws/src/ServiceStack.Aws/ServiceStack.Aws.csproj b/ServiceStack.Aws/src/ServiceStack.Aws/ServiceStack.Aws.csproj index e39f15281e3..a97e51b4eb6 100644 --- a/ServiceStack.Aws/src/ServiceStack.Aws/ServiceStack.Aws.csproj +++ b/ServiceStack.Aws/src/ServiceStack.Aws/ServiceStack.Aws.csproj @@ -3,7 +3,7 @@ ServiceStack.Aws ServiceStack.Aws - net472;netstandard2.0;net6.0;net8.0 + net472;net6.0;net8.0;net10.0 ServiceStack integration for Amazon Web Services (AWS) ServiceStack integration for Amazon Web Services (AWS) including: @@ -17,14 +17,14 @@ ServiceStack;AWS;Amazon;WebServices;DynamoDb;S3;SQS;Cache;CacheClient - - $(DefineConstants);NETCORE;NETSTANDARD2_0 - - $(DefineConstants);NETCORE;NET6_0;NET6_0_OR_GREATER + $(DefineConstants);NETCORE;NET6_0_OR_GREATER - $(DefineConstants);NETCORE;NET8_0;NET6_0_OR_GREATER;NET8_0_OR_GREATER + $(DefineConstants);NETCORE;NET6_0_OR_GREATER;NET8_0_OR_GREATER + + + $(DefineConstants);NETCORE;NET6_0_OR_GREATER;NET8_0_OR_GREATER;NET10_0_OR_GREATER @@ -50,13 +50,6 @@ - - - - - - - diff --git a/ServiceStack.Aws/tests/Directory.Build.props b/ServiceStack.Aws/tests/Directory.Build.props index 8a38bd474fa..3bcfc476bbd 100644 --- a/ServiceStack.Aws/tests/Directory.Build.props +++ b/ServiceStack.Aws/tests/Directory.Build.props @@ -1,7 +1,7 @@ - 8.10.1 + 10.0.7 latest false @@ -23,10 +23,14 @@ - $(DefineConstants);NET8_0;NET6_0_OR_GREATER + $(DefineConstants);NET8_0;NET6_0_OR_GREATER;NET8_0_OR_GREATER - + + $(DefineConstants);NET8_0;NET6_0_OR_GREATER;NET8_0_OR_GREATER;NET10_0_OR_GREATER + + + $(DefineConstants);NETCORE;NETCORE_SUPPORT diff --git a/ServiceStack.Aws/tests/ServiceStack.Aws.DynamoDbTests/ServiceStack.Aws.DynamoDbTests.csproj b/ServiceStack.Aws/tests/ServiceStack.Aws.DynamoDbTests/ServiceStack.Aws.DynamoDbTests.csproj index e15ab56718f..fe5afc0fafe 100644 --- a/ServiceStack.Aws/tests/ServiceStack.Aws.DynamoDbTests/ServiceStack.Aws.DynamoDbTests.csproj +++ b/ServiceStack.Aws/tests/ServiceStack.Aws.DynamoDbTests/ServiceStack.Aws.DynamoDbTests.csproj @@ -1,6 +1,7 @@  - net472;net8.0 + net10.0;net472 + net10.0 portable ServiceStack.Aws.DynamoDbTests Library @@ -34,7 +35,4 @@ - - - \ No newline at end of file diff --git a/ServiceStack.Aws/tests/ServiceStack.Aws.Tests/ServiceStack.Aws.Tests.csproj b/ServiceStack.Aws/tests/ServiceStack.Aws.Tests/ServiceStack.Aws.Tests.csproj index 751c13eab10..ccc18398c70 100644 --- a/ServiceStack.Aws/tests/ServiceStack.Aws.Tests/ServiceStack.Aws.Tests.csproj +++ b/ServiceStack.Aws/tests/ServiceStack.Aws.Tests/ServiceStack.Aws.Tests.csproj @@ -1,6 +1,7 @@  - net472;net8.0 + net10.0;net472 + net10.0 portable ServiceStack.Aws.Tests Library @@ -32,6 +33,4 @@ - - \ No newline at end of file diff --git a/ServiceStack.Azure/src/Directory.Build.props b/ServiceStack.Azure/src/Directory.Build.props index ba36236d6cf..22bdedd1591 100644 --- a/ServiceStack.Azure/src/Directory.Build.props +++ b/ServiceStack.Azure/src/Directory.Build.props @@ -1,7 +1,7 @@ - 8.10.1 + 10.0.7 ServiceStack ServiceStack, Inc. © 2008-2022 ServiceStack, Inc @@ -41,10 +41,14 @@ - $(DefineConstants);NET8_0;NET6_0_OR_GREATER + $(DefineConstants);NET8_0;NET6_0_OR_GREATER;NET8_0_OR_GREATER - + + $(DefineConstants);NET8_0;NET6_0_OR_GREATER;NET8_0_OR_GREATER;NET10_0_OR_GREATER + + + $(DefineConstants);NETCORE;NETCORE_SUPPORT diff --git a/ServiceStack.Azure/src/ServiceStack.Azure.sln b/ServiceStack.Azure/src/ServiceStack.Azure.sln index ea311d6a987..2d2ede5fc97 100644 --- a/ServiceStack.Azure/src/ServiceStack.Azure.sln +++ b/ServiceStack.Azure/src/ServiceStack.Azure.sln @@ -11,7 +11,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{DCEE435D ProjectSection(SolutionItems) = preProject ..\build\build.bat = ..\build\build.bat ..\build\build.proj = ..\build\build.proj - ServiceStack.Azure\ServiceStack.Azure.Core.csproj = ServiceStack.Azure\ServiceStack.Azure.Core.csproj Directory.Build.props = Directory.Build.props ..\tests\Directory.Build.props = ..\tests\Directory.Build.props EndProjectSection diff --git a/ServiceStack.Azure/src/ServiceStack.Azure/ServiceStack.Azure.Core.csproj b/ServiceStack.Azure/src/ServiceStack.Azure/ServiceStack.Azure.Core.csproj deleted file mode 100644 index 717b690a444..00000000000 --- a/ServiceStack.Azure/src/ServiceStack.Azure/ServiceStack.Azure.Core.csproj +++ /dev/null @@ -1,40 +0,0 @@ - - - - ServiceStack.Azure.Core - ServiceStack.Azure - ServiceStack.Azure - netstandard2.0;net6.0;net8.0 - ServiceStack.Azure .NET Standard 2.0 - - .NET Standard 2.0 version of ServiceStack.Azure - - Azure;Windows;ServiceBus;Blob;Table;Storage;WebServices;Cache;CacheClient - - - $(DefineConstants);NETCORE;NETSTANDARD2_0 - - - $(DefineConstants);NETCORE;NET6_0;NET6_0_OR_GREATER - - - $(DefineConstants);NETCORE;NET8_0;NET6_0_OR_GREATER - - - - - - - - - - - - - - - - - - - diff --git a/ServiceStack.Azure/src/ServiceStack.Azure/ServiceStack.Azure.csproj b/ServiceStack.Azure/src/ServiceStack.Azure/ServiceStack.Azure.csproj index 95b10ff5e91..8cd479cf25b 100644 --- a/ServiceStack.Azure/src/ServiceStack.Azure/ServiceStack.Azure.csproj +++ b/ServiceStack.Azure/src/ServiceStack.Azure/ServiceStack.Azure.csproj @@ -3,7 +3,7 @@ ServiceStack.Azure ServiceStack.Azure - net472;netstandard2.0;net6.0;net8.0 + net472;net6.0;net8.0;net10.0 ServiceStack integration for Azure Services enable @@ -13,14 +13,14 @@ Azure;Windows;ServiceBus;Blob;Table;Storage;WebServices;Cache;CacheClient - - $(DefineConstants);NETCORE;NETSTANDARD2_0 - - $(DefineConstants);NETCORE;NET6_0;NET6_0_OR_GREATER + $(DefineConstants);NETCORE;NET6_0_OR_GREATER - $(DefineConstants);NETCORE;NET8_0;NET6_0_OR_GREATER;NET8_0_OR_GREATER + $(DefineConstants);NETCORE;NET6_0_OR_GREATER;NET8_0_OR_GREATER + + + $(DefineConstants);NETCORE;NET6_0_OR_GREATER;NET8_0_OR_GREATER;NET10_0_OR_GREATER @@ -43,13 +43,12 @@ - - - - - + + + + diff --git a/ServiceStack.Azure/tests/Directory.Build.props b/ServiceStack.Azure/tests/Directory.Build.props index 8a38bd474fa..3bcfc476bbd 100644 --- a/ServiceStack.Azure/tests/Directory.Build.props +++ b/ServiceStack.Azure/tests/Directory.Build.props @@ -1,7 +1,7 @@ - 8.10.1 + 10.0.7 latest false @@ -23,10 +23,14 @@ - $(DefineConstants);NET8_0;NET6_0_OR_GREATER + $(DefineConstants);NET8_0;NET6_0_OR_GREATER;NET8_0_OR_GREATER - + + $(DefineConstants);NET8_0;NET6_0_OR_GREATER;NET8_0_OR_GREATER;NET10_0_OR_GREATER + + + $(DefineConstants);NETCORE;NETCORE_SUPPORT diff --git a/ServiceStack.Azure/tests/ServiceStack.Azure.Tests/Messaging/MqServerAppHostTests.cs b/ServiceStack.Azure/tests/ServiceStack.Azure.Tests/Messaging/MqServerAppHostTests.cs index f174a07ff0f..fd3a7249ff4 100644 --- a/ServiceStack.Azure/tests/ServiceStack.Azure.Tests/Messaging/MqServerAppHostTests.cs +++ b/ServiceStack.Azure/tests/ServiceStack.Azure.Tests/Messaging/MqServerAppHostTests.cs @@ -41,7 +41,7 @@ private static string ConnectionString } public AzureServiceBusMqServerAppHostTests() { -#if !NETCORE_SUPPORT +#if !NETCORE NamespaceManager nm = NamespaceManager.CreateFromConnectionString(ConnectionString); Parallel.ForEach(nm.GetQueues(), qd => { diff --git a/ServiceStack.Azure/tests/ServiceStack.Azure.Tests/Messaging/MqServerIntroTests.cs b/ServiceStack.Azure/tests/ServiceStack.Azure.Tests/Messaging/MqServerIntroTests.cs index 4c2999eb9a4..02af132554e 100644 --- a/ServiceStack.Azure/tests/ServiceStack.Azure.Tests/Messaging/MqServerIntroTests.cs +++ b/ServiceStack.Azure/tests/ServiceStack.Azure.Tests/Messaging/MqServerIntroTests.cs @@ -43,7 +43,7 @@ static string ConnectionString public AzureServiceBusMqServerIntroTests() { -#if !NETCORE_SUPPORT +#if !NETCORE NamespaceManager nm = NamespaceManager.CreateFromConnectionString(ConnectionString); Parallel.ForEach(nm.GetQueues(), qd => { diff --git a/ServiceStack.Azure/tests/ServiceStack.Azure.Tests/ServiceStack.Azure.Tests.csproj b/ServiceStack.Azure/tests/ServiceStack.Azure.Tests/ServiceStack.Azure.Tests.csproj index 065a39cf83f..fbbe72bec79 100644 --- a/ServiceStack.Azure/tests/ServiceStack.Azure.Tests/ServiceStack.Azure.Tests.csproj +++ b/ServiceStack.Azure/tests/ServiceStack.Azure.Tests/ServiceStack.Azure.Tests.csproj @@ -1,7 +1,8 @@  - net472;net8.0 + net10.0;net472 + net10.0 portable ServiceStack.Azure.Tests Library @@ -16,6 +17,10 @@ false + + $(DefineConstants);NETCORE;NET6_0_OR_GREATER;NET8_0_OR_GREATER;NET10_0_OR_GREATER + + @@ -36,10 +41,9 @@ - - + + - diff --git a/ServiceStack.Blazor/src/Directory.Build.props b/ServiceStack.Blazor/src/Directory.Build.props index ba36236d6cf..22bdedd1591 100644 --- a/ServiceStack.Blazor/src/Directory.Build.props +++ b/ServiceStack.Blazor/src/Directory.Build.props @@ -1,7 +1,7 @@ - 8.10.1 + 10.0.7 ServiceStack ServiceStack, Inc. © 2008-2022 ServiceStack, Inc @@ -41,10 +41,14 @@ - $(DefineConstants);NET8_0;NET6_0_OR_GREATER + $(DefineConstants);NET8_0;NET6_0_OR_GREATER;NET8_0_OR_GREATER - + + $(DefineConstants);NET8_0;NET6_0_OR_GREATER;NET8_0_OR_GREATER;NET10_0_OR_GREATER + + + $(DefineConstants);NETCORE;NETCORE_SUPPORT diff --git a/ServiceStack.Blazor/src/ServiceStack.Blazor/Components/Tailwind/Grids/QueryPrefs.razor b/ServiceStack.Blazor/src/ServiceStack.Blazor/Components/Tailwind/Grids/QueryPrefs.razor index de758cd0a1f..199b33f7254 100644 --- a/ServiceStack.Blazor/src/ServiceStack.Blazor/Components/Tailwind/Grids/QueryPrefs.razor +++ b/ServiceStack.Blazor/src/ServiceStack.Blazor/Components/Tailwind/Grids/QueryPrefs.razor @@ -10,7 +10,7 @@
Model.SelectedColumns.Clear()) checked=@(Model.SelectedColumns.Count == 0) - class="focus:ring-indigo-500 h-4 w-4 bg-white dark:bg-black text-indigo-600 dark:text-indigo-400 border-gray-300 dark:border-gray-700"> + class="focus:ring-indigo-500 h-4 w-4 dark:bg-black text-indigo-600 dark:text-indigo-400 border-gray-300 dark:border-gray-700">
@@ -31,7 +31,7 @@ {
+ class="h-4 w-4 dark:bg-black border-gray-300 dark:border-gray-700 rounded text-indigo-600 dark:text-indigo-400 focus:ring-indigo-500">
} diff --git a/ServiceStack.Blazor/src/ServiceStack.Blazor/Components/Tailwind/ModalDialog.razor b/ServiceStack.Blazor/src/ServiceStack.Blazor/Components/Tailwind/ModalDialog.razor index 60392775cb9..c030bd591d9 100644 --- a/ServiceStack.Blazor/src/ServiceStack.Blazor/Components/Tailwind/ModalDialog.razor +++ b/ServiceStack.Blazor/src/ServiceStack.Blazor/Components/Tailwind/ModalDialog.razor @@ -1,7 +1,7 @@ @inherits UiComponentBase