diff --git a/.github/workflows/backend.yml b/.github/workflows/backend.yml index dbb9cbf..0a757e8 100644 --- a/.github/workflows/backend.yml +++ b/.github/workflows/backend.yml @@ -8,12 +8,12 @@ jobs: strategy: fail-fast: true matrix: - dotnet-version: ["6.0.x"] + dotnet-version: ["6.0.x", "7.0.x", "8.0.x"] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Setup .NET Core SDK ${{ matrix.dotnet-version }} - uses: actions/setup-dotnet@v2 + uses: actions/setup-dotnet@v4 with: dotnet-version: ${{ matrix.dotnet-version }} diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 4de5f8c..9139465 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -9,7 +9,7 @@ jobs: timeout-minutes: 15 steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Verify commit exists in origin/main run: | git fetch --no-tags --prune --depth=1 origin +refs/heads/*:refs/remotes/origin/* diff --git a/README.md b/README.md index 917aee3..948314d 100644 --- a/README.md +++ b/README.md @@ -40,17 +40,17 @@ services.AddRelewise(options => options.ReadFromConfiguration(configuration)); The configuration offers a lot of other great features, such as -- Set specific options for `DatasetId`, `ApiKey` and `Timeout` for the individual client instances of `ITracker`, `IRecommender` and `ISearcher`. +- Set specific options for `DatasetId`, `ApiKey`, `ServerUrl` and `Timeout` for the individual client instances of `ITracker`, `IRecommender` and `ISearcher`. - Named clients to allow different configuration for integrations etc or to use for a multi site-setup. Here is a full example of all the configuration settings we provide via the appsettings or via the fluent API: ```json "Relewise": { - "DatasetId": "6D9361AA-A23D-4BF2-A818-5ABA792E2102", - "ApiKey": "r4FqfMqtiZjJmoN", + "DatasetId": "<>", + "ApiKey": "<>", "Timeout": "00:00:03", - "ServerUrl": "https://stage01-api.relewise.com", + "ServerUrl": "<>", "Tracker": { "Timeout": "00:00:10" }, @@ -67,8 +67,9 @@ Here is a full example of all the configuration settings we provide via the apps } }, "ContentSite": { - "DatasetId": "8DF23DAF-6C96-47DB-BE34-84629359D3B8", - "ApiKey": "61ce444b6e7c4f", + "DatasetId": "<>", + "ApiKey": "<>", + "ServerUrl": "<>", "Timeout": "00:00:03", "Tracker": { "Timeout": "00:00:10" diff --git a/Relewise.Client.Extensions.sln b/Relewise.Client.Extensions.sln index 4cfd3fa..d578e50 100644 --- a/Relewise.Client.Extensions.sln +++ b/Relewise.Client.Extensions.sln @@ -14,6 +14,12 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Docs", "Docs", "{0B49B522-D README.md = README.md EndProjectSection EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "GitHub Actions", "GitHub Actions", "{FB651A7A-743B-4369-AD17-FDFDBB97726A}" + ProjectSection(SolutionItems) = preProject + .github\workflows\backend.yml = .github\workflows\backend.yml + .github\workflows\publish.yml = .github\workflows\publish.yml + EndProjectSection +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU diff --git a/src/Relewise.Client.Extensions.Tests/Relewise.Client.Extensions.Tests.csproj b/src/Relewise.Client.Extensions.Tests/Relewise.Client.Extensions.Tests.csproj index 30496e4..1a92aaa 100644 --- a/src/Relewise.Client.Extensions.Tests/Relewise.Client.Extensions.Tests.csproj +++ b/src/Relewise.Client.Extensions.Tests/Relewise.Client.Extensions.Tests.csproj @@ -1,9 +1,9 @@  - net6.0 + net8.0 false - 10 + latest diff --git a/src/Relewise.Client.Extensions/Builders.cs b/src/Relewise.Client.Extensions/Builders.cs index 176db0c..c84e693 100644 --- a/src/Relewise.Client.Extensions/Builders.cs +++ b/src/Relewise.Client.Extensions/Builders.cs @@ -83,7 +83,7 @@ public void Add(string name, Action options, bool if (Clients.ContainsKey(name) && throwIfExists) throw new ArgumentException("A client with that name was already registered", nameof(name)); - if (Clients.TryGetValue(name, out RelewiseClientsOptionsBuilder builder)) + if (Clients.TryGetValue(name, out RelewiseClientsOptionsBuilder? builder)) { if (throwIfExists) throw new ArgumentException("A client with that name was already registered", nameof(name)); diff --git a/src/Relewise.Client.Extensions/Relewise.Client.Extensions.csproj b/src/Relewise.Client.Extensions/Relewise.Client.Extensions.csproj index b0ee328..8381b6e 100644 --- a/src/Relewise.Client.Extensions/Relewise.Client.Extensions.csproj +++ b/src/Relewise.Client.Extensions/Relewise.Client.Extensions.csproj @@ -1,11 +1,11 @@  - netstandard2.0 - true - enable - 10 - + netstandard2.0;net6.0;net7.0;net8.0 + latest + enable + true + true Relewise.Client.Extensions Relewise.Client.Extensions Relewise Client Extensions @@ -13,29 +13,28 @@ logo.png Relewise;Recommendations;Search;SearchEngine;Personalization;Recommender false - http://opensource.org/licenses/MIT - MIT + README.md + LICENSE https://github.com/Relewise/relewise-sdk-csharp-extensions https://github.com/Relewise/relewise-sdk-csharp-extensions Relewise.Client.Extensions - 1.4.2 - true - Nullable + 1.5.0 Relewise Relewise - README.md + true - - - - + + + + - - + + +