From 5f49a7c80c3b7284dcdf4a509551d57115bf13aa Mon Sep 17 00:00:00 2001 From: Mike Chu Date: Mon, 3 Jul 2023 14:05:41 -0400 Subject: [PATCH 1/6] Update assembly semantic version --- OptimizelySDK.DemoApp/Properties/AssemblyInfo.cs | 8 +++----- OptimizelySDK.Net35/Properties/AssemblyInfo.cs | 9 +++------ OptimizelySDK.Net40/Properties/AssemblyInfo.cs | 9 +++------ OptimizelySDK.NetStandard16/Properties/AssemblyInfo.cs | 9 +++------ OptimizelySDK.NetStandard20/Properties/AssemblyInfo.cs | 9 +++------ OptimizelySDK.Tests/Properties/AssemblyInfo.cs | 8 +++----- 6 files changed, 18 insertions(+), 34 deletions(-) diff --git a/OptimizelySDK.DemoApp/Properties/AssemblyInfo.cs b/OptimizelySDK.DemoApp/Properties/AssemblyInfo.cs index 719fc83e..95223eb2 100644 --- a/OptimizelySDK.DemoApp/Properties/AssemblyInfo.cs +++ b/OptimizelySDK.DemoApp/Properties/AssemblyInfo.cs @@ -35,9 +35,7 @@ // Build Number // Revision // -// You can specify all the values or you can default the Revision and Build Numbers -// by using the '*' as shown below: -[assembly: AssemblyVersion("3.11.2.1")] -[assembly: AssemblyFileVersion("3.11.2.1")] -[assembly: AssemblyInformationalVersion("3.11.2.1")] // Used by Nuget. +[assembly: AssemblyVersion("3.11.3.0")] +[assembly: AssemblyFileVersion("3.11.3.0")] +[assembly: AssemblyInformationalVersion("3.11.3")] // Used by Nuget. diff --git a/OptimizelySDK.Net35/Properties/AssemblyInfo.cs b/OptimizelySDK.Net35/Properties/AssemblyInfo.cs index 1a3c7df2..763e1bd1 100644 --- a/OptimizelySDK.Net35/Properties/AssemblyInfo.cs +++ b/OptimizelySDK.Net35/Properties/AssemblyInfo.cs @@ -35,9 +35,6 @@ // Build Number // Revision // -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("3.11.2.1")] -[assembly: AssemblyFileVersion("3.11.2.1")] -[assembly: AssemblyInformationalVersion("3.11.2.1")] // Used by Nuget. +[assembly: AssemblyVersion("3.11.3.0")] +[assembly: AssemblyFileVersion("3.11.3.0")] +[assembly: AssemblyInformationalVersion("3.11.3")] // Used by Nuget. diff --git a/OptimizelySDK.Net40/Properties/AssemblyInfo.cs b/OptimizelySDK.Net40/Properties/AssemblyInfo.cs index 07ab68db..1d7137a0 100644 --- a/OptimizelySDK.Net40/Properties/AssemblyInfo.cs +++ b/OptimizelySDK.Net40/Properties/AssemblyInfo.cs @@ -35,9 +35,6 @@ // Build Number // Revision // -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("3.11.2.1")] -[assembly: AssemblyFileVersion("3.11.2.1")] -[assembly: AssemblyInformationalVersion("3.11.2.1")] // Used by Nuget. +[assembly: AssemblyVersion("3.11.3.0")] +[assembly: AssemblyFileVersion("3.11.3.0")] +[assembly: AssemblyInformationalVersion("3.11.3")] // Used by Nuget. diff --git a/OptimizelySDK.NetStandard16/Properties/AssemblyInfo.cs b/OptimizelySDK.NetStandard16/Properties/AssemblyInfo.cs index 5089e25d..9ecccade 100644 --- a/OptimizelySDK.NetStandard16/Properties/AssemblyInfo.cs +++ b/OptimizelySDK.NetStandard16/Properties/AssemblyInfo.cs @@ -35,9 +35,6 @@ // Build Number // Revision // -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("3.11.2.1")] -[assembly: AssemblyFileVersion("3.11.2.1")] -[assembly: AssemblyInformationalVersion("3.11.2.1")] // Used by Nuget. +[assembly: AssemblyVersion("3.11.3.0")] +[assembly: AssemblyFileVersion("3.11.3.0")] +[assembly: AssemblyInformationalVersion("3.11.3")] // Used by Nuget. diff --git a/OptimizelySDK.NetStandard20/Properties/AssemblyInfo.cs b/OptimizelySDK.NetStandard20/Properties/AssemblyInfo.cs index 3db34e14..4f7815f6 100644 --- a/OptimizelySDK.NetStandard20/Properties/AssemblyInfo.cs +++ b/OptimizelySDK.NetStandard20/Properties/AssemblyInfo.cs @@ -35,9 +35,6 @@ // Build Number // Revision // -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("3.11.2.1")] -[assembly: AssemblyFileVersion("3.11.2.1")] -[assembly: AssemblyInformationalVersion("3.11.2.1")] // Used by Nuget. +[assembly: AssemblyVersion("3.11.3.0")] +[assembly: AssemblyFileVersion("3.11.3.0")] +[assembly: AssemblyInformationalVersion("3.11.3")] // Used by Nuget. diff --git a/OptimizelySDK.Tests/Properties/AssemblyInfo.cs b/OptimizelySDK.Tests/Properties/AssemblyInfo.cs index 99d29cf9..f91d74aa 100644 --- a/OptimizelySDK.Tests/Properties/AssemblyInfo.cs +++ b/OptimizelySDK.Tests/Properties/AssemblyInfo.cs @@ -29,8 +29,6 @@ // Build Number // Revision // -// You can specify all the values or you can default the Revision and Build Numbers -// by using the '*' as shown below: -[assembly: AssemblyVersion("3.11.2.1")] -[assembly: AssemblyFileVersion("3.11.2.1")] -[assembly: AssemblyInformationalVersion("3.11.2.1")] // Used by Nuget. +[assembly: AssemblyVersion("3.11.3.0")] +[assembly: AssemblyFileVersion("3.11.3.0")] +[assembly: AssemblyInformationalVersion("3.11.3")] // Used by Nuget. From e10e90c173ea79f569bcd5749c1e1b702eb15537 Mon Sep 17 00:00:00 2001 From: Mike Chu Date: Mon, 3 Jul 2023 14:11:07 -0400 Subject: [PATCH 2/6] Update CHANGELOG.md --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3edbc68f..23176cfa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # Optimizely C# SDK Changelog +## 3.11.3 +July 3, 2023 + +### Bug Fix +- Last-Modified in header not found and used to reduce polling payload ([#355](https://github.com/optimizely/csharp-sdk/pull/355)). + ## 3.11.2.1 March 24, 2023 From 6d9c58c03879ae1d919210b2e124694aaa673c1c Mon Sep 17 00:00:00 2001 From: Mike Chu Date: Tue, 18 Jul 2023 16:35:16 -0400 Subject: [PATCH 3/6] Update the date --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 23176cfa..d3a777ff 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,7 @@ # Optimizely C# SDK Changelog ## 3.11.3 -July 3, 2023 +July 18, 2023 ### Bug Fix - Last-Modified in header not found and used to reduce polling payload ([#355](https://github.com/optimizely/csharp-sdk/pull/355)). From cb1c68ba0847f04ea54384c9b4500502c00681e6 Mon Sep 17 00:00:00 2001 From: Mike Chu Date: Wed, 19 Jul 2023 09:24:17 -0400 Subject: [PATCH 4/6] Downgrade to non-ODP FSC version for e2e GH Actions tests --- .github/workflows/csharp.yml | 4 ++-- .github/workflows/integration_test.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/csharp.yml b/.github/workflows/csharp.yml index f096db7f..28895739 100644 --- a/.github/workflows/csharp.yml +++ b/.github/workflows/csharp.yml @@ -101,7 +101,7 @@ jobs: integration_tests: name: Run Integration Tests needs: [ netFrameworksAndUnitTest, netStandard16, netStandard20 ] - uses: optimizely/csharp-sdk/.github/workflows/integration_test.yml@master + uses: optimizely/csharp-sdk/.github/workflows/integration_test.yml@mike/prep-release-3.11.3 secrets: CI_USER_TOKEN: ${{ secrets.CI_USER_TOKEN }} TRAVIS_COM_TOKEN: ${{ secrets.TRAVIS_COM_TOKEN }} @@ -109,7 +109,7 @@ jobs: fullstack_production_suite: name: Run Performance Tests needs: [ netFrameworksAndUnitTest, netStandard16, netStandard20 ] - uses: optimizely/csharp-sdk/.github/workflows/integration_test.yml@master + uses: optimizely/csharp-sdk/.github/workflows/integration_test.yml@mike/prep-release-3.11.3 with: FULLSTACK_TEST_REPO: ProdTesting secrets: diff --git a/.github/workflows/integration_test.yml b/.github/workflows/integration_test.yml index 423e2dfe..3ba752d5 100644 --- a/.github/workflows/integration_test.yml +++ b/.github/workflows/integration_test.yml @@ -37,7 +37,7 @@ jobs: SDK: csharp FULLSTACK_TEST_REPO: ${{ inputs.FULLSTACK_TEST_REPO }} BUILD_NUMBER: ${{ github.run_id }} - TESTAPP_BRANCH: master + TESTAPP_BRANCH: mike/3.11.x-testing # TestApp branch that was not ODP aware GITHUB_TOKEN: ${{ secrets.CI_USER_TOKEN }} EVENT_TYPE: ${{ github.event_name }} GITHUB_CONTEXT: ${{ toJson(github) }} From 29919a77d9ac68e208824883934d133c2644c901 Mon Sep 17 00:00:00 2001 From: Mike Chu Date: Wed, 19 Jul 2023 09:27:07 -0400 Subject: [PATCH 5/6] Try using hash of integration_test.yml --- .github/workflows/csharp.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/csharp.yml b/.github/workflows/csharp.yml index 28895739..47e69860 100644 --- a/.github/workflows/csharp.yml +++ b/.github/workflows/csharp.yml @@ -101,7 +101,7 @@ jobs: integration_tests: name: Run Integration Tests needs: [ netFrameworksAndUnitTest, netStandard16, netStandard20 ] - uses: optimizely/csharp-sdk/.github/workflows/integration_test.yml@mike/prep-release-3.11.3 + uses: optimizely/csharp-sdk/.github/workflows/integration_test.yml@cb1c68ba0847f04ea54384c9b4500502c00681e6 secrets: CI_USER_TOKEN: ${{ secrets.CI_USER_TOKEN }} TRAVIS_COM_TOKEN: ${{ secrets.TRAVIS_COM_TOKEN }} @@ -109,7 +109,7 @@ jobs: fullstack_production_suite: name: Run Performance Tests needs: [ netFrameworksAndUnitTest, netStandard16, netStandard20 ] - uses: optimizely/csharp-sdk/.github/workflows/integration_test.yml@mike/prep-release-3.11.3 + uses: optimizely/csharp-sdk/.github/workflows/integration_test.yml@cb1c68ba0847f04ea54384c9b4500502c00681e6 with: FULLSTACK_TEST_REPO: ProdTesting secrets: From 7198c4fe74420e1f923309715ceb525e38b4292a Mon Sep 17 00:00:00 2001 From: Mike Chu Date: Wed, 19 Jul 2023 10:50:39 -0400 Subject: [PATCH 6/6] Set REPO_SLUG (hopefully run pre-ODP suite) --- .github/workflows/integration_test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/integration_test.yml b/.github/workflows/integration_test.yml index 3ba752d5..eaa54405 100644 --- a/.github/workflows/integration_test.yml +++ b/.github/workflows/integration_test.yml @@ -41,7 +41,7 @@ jobs: GITHUB_TOKEN: ${{ secrets.CI_USER_TOKEN }} EVENT_TYPE: ${{ github.event_name }} GITHUB_CONTEXT: ${{ toJson(github) }} - #REPO_SLUG: ${{ github.repository }} + REPO_SLUG: optimizely/fullstack-sdk-compatibility-suite@b45d804ce7670090341fcbae91f5daa39b03aa94 PULL_REQUEST_SLUG: ${{ github.repository }} UPSTREAM_REPO: ${{ github.repository }} PULL_REQUEST_SHA: ${{ github.event.pull_request.head.sha }}