From f226745817278ebf2cfeaf2372bf44686b370733 Mon Sep 17 00:00:00 2001 From: Joe Owens Date: Wed, 21 May 2025 10:44:50 +0100 Subject: [PATCH 1/4] Reverting to old style but pointing at new secrets --- .github/workflows/build.yml | 12 ++++++------ .gitignore | 1 + NEL.MESH.Tests.Acceptance/ConfigurationTests.cs | 2 +- NEL.MESH.Tests.Acceptance/MeshClientTests.cs | 2 +- .../NEL.MESH.Tests.Acceptance.csproj | 3 +++ .../100.MeshClientTests.cs | 2 +- .../ConfigurationTests.cs | 2 +- NEL.MESH.Tests.Integration/ConfigurationTests.cs | 2 +- NEL.MESH.Tests.Integration/MeshClientTests.cs | 2 +- .../NEL.MESH.Tests.Integration.csproj | 3 +++ NEL.MESH.UI/Program.cs | 2 +- 11 files changed, 20 insertions(+), 13 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index dc0683ed..c656fad6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -36,12 +36,12 @@ jobs: NEL_MESH_CLIENT_ACCEPTANCE_MESHCONFIGURATION__ROOTCERTIFICATE: ${{ secrets.NEL_MESH_CLIENT_ACCEPTANCE_MESHCONFIGURATION__ROOTCERTIFICATE }} NEL_MESH_CLIENT_ACCEPTANCE_MESHCONFIGURATION__INTERMEDIATECERTIFICATES__0: ${{ secrets.NEL_MESH_CLIENT_ACCEPTANCE_MESHCONFIGURATION__INTERMEDIATECERTIFICATES__0 }} NEL_MESH_CLIENT_ACCEPTANCE_MESHCONFIGURATION__CLIENTCERTIFICATE: ${{ secrets.NEL_MESH_CLIENT_ACCEPTANCE_MESHCONFIGURATION__CLIENTCERTIFICATE }} - NEL_MESH_CLIENT_INTEGRATION_MESHCONFIGURATION__MAILBOXID: ${{ secrets.NEL_MESH_CLIENT_INTEGRATION_MESHCONFIGURATION__MAILBOXID }} - NEL_MESH_CLIENT_INTEGRATION_MESHCONFIGURATION__PASSWORD: ${{ secrets.NEL_MESH_CLIENT_INTEGRATION_MESHCONFIGURATION__PASSWORD }} - NEL_MESH_CLIENT_INTEGRATION_MESHCONFIGURATION__KEY: ${{ secrets.NEL_MESH_CLIENT_INTEGRATION_MESHCONFIGURATION__KEY }} - NEL_MESH_CLIENT_INTEGRATION_MESHCONFIGURATION__ROOTCERTIFICATE: ${{ secrets.NEL_MESH_CLIENT_INTEGRATION_MESHCONFIGURATION__ROOTCERTIFICATE }} - NEL_MESH_CLIENT_INTEGRATION_MESHCONFIGURATION__INTERMEDIATECERTIFICATES__0: ${{ secrets.NEL_MESH_CLIENT_INTEGRATION_MESHCONFIGURATION__INTERMEDIATECERTIFICATES__0 }} - NEL_MESH_CLIENT_INTEGRATION_MESHCONFIGURATION__CLIENTCERTIFICATE: ${{ secrets.NEL_MESH_CLIENT_INTEGRATION_MESHCONFIGURATION__CLIENTCERTIFICATE }} + NEL_MESH_CLIENT_INTEGRATION_MESHCONFIGURATION__MAILBOXID: ${{ secrets.NEL_MESH_CLIENT_MESHCONFIGURATION__MAILBOXID }} + NEL_MESH_CLIENT_INTEGRATION_MESHCONFIGURATION__PASSWORD: ${{ secrets.NEL_MESH_CLIENT_MESHCONFIGURATION__PASSWORD }} + NEL_MESH_CLIENT_INTEGRATION_MESHCONFIGURATION__KEY: ${{ secrets.NEL_MESH_CLIENT_MESHCONFIGURATION__SHAREDKEY }} + NEL_MESH_CLIENT_INTEGRATION_MESHCONFIGURATION__ROOTCERTIFICATE: ${{ secrets.NEL_MESH_CLIENT_MESHCONFIGURATION__ROOTCERTIFICATE }} + NEL_MESH_CLIENT_INTEGRATION_MESHCONFIGURATION__INTERMEDIATECERTIFICATES__0: ${{ secrets.NEL_MESH_CLIENT_MESHCONFIGURATION__TLSINTERMEDIATECERTIFICATES__0 }} + NEL_MESH_CLIENT_INTEGRATION_MESHCONFIGURATION__CLIENTCERTIFICATE: ${{ secrets.NEL_MESH_CLIENT_MESHCONFIGURATION__CLIENTSIGNINGCERTIFICATE }} steps: - name: Check Out uses: actions/checkout@v3 diff --git a/.gitignore b/.gitignore index 4649a14a..e4880a80 100644 --- a/.gitignore +++ b/.gitignore @@ -374,3 +374,4 @@ local.appsettings.json /NEL.MESH.Tests.Acceptance/local.appsettings.integration.json /NEL.MESH.Tests.Integration/local.appsettings.integration.json /NEL.MESH.Tests.Integration/local.appsettings.acceptance.json +*/appsettings.Development.json diff --git a/NEL.MESH.Tests.Acceptance/ConfigurationTests.cs b/NEL.MESH.Tests.Acceptance/ConfigurationTests.cs index 79e3d4de..29b3a487 100644 --- a/NEL.MESH.Tests.Acceptance/ConfigurationTests.cs +++ b/NEL.MESH.Tests.Acceptance/ConfigurationTests.cs @@ -14,7 +14,7 @@ public ConfigurationTests() { var configurationBuilder = new ConfigurationBuilder() .AddJsonFile("appsettings.json", optional: true, reloadOnChange: true) - .AddJsonFile("local.appsettings.json", optional: true, reloadOnChange: true) + .AddJsonFile("appsettings.Development.json", optional: true, reloadOnChange: true) .AddEnvironmentVariables("NEL_MESH_CLIENT_ACCEPTANCE_"); this.configuration = configurationBuilder.Build(); diff --git a/NEL.MESH.Tests.Acceptance/MeshClientTests.cs b/NEL.MESH.Tests.Acceptance/MeshClientTests.cs index c51b62bb..417660f1 100644 --- a/NEL.MESH.Tests.Acceptance/MeshClientTests.cs +++ b/NEL.MESH.Tests.Acceptance/MeshClientTests.cs @@ -26,7 +26,7 @@ public MeshClientTests() { var configurationBuilder = new ConfigurationBuilder() .AddJsonFile("appsettings.json", optional: true, reloadOnChange: true) - .AddJsonFile("local.appsettings.json", optional: true, reloadOnChange: true) + .AddJsonFile("appsettings.Development.json", optional: true, reloadOnChange: true) .AddEnvironmentVariables("NEL_MESH_CLIENT_ACCEPTANCE_"); IConfiguration configuration = configurationBuilder.Build(); diff --git a/NEL.MESH.Tests.Acceptance/NEL.MESH.Tests.Acceptance.csproj b/NEL.MESH.Tests.Acceptance/NEL.MESH.Tests.Acceptance.csproj index ec9e4f44..22644c22 100644 --- a/NEL.MESH.Tests.Acceptance/NEL.MESH.Tests.Acceptance.csproj +++ b/NEL.MESH.Tests.Acceptance/NEL.MESH.Tests.Acceptance.csproj @@ -35,6 +35,9 @@ + + Always + Always diff --git a/NEL.MESH.Tests.Integration.Witness/100.MeshClientTests.cs b/NEL.MESH.Tests.Integration.Witness/100.MeshClientTests.cs index cc8a803d..a0a190e2 100644 --- a/NEL.MESH.Tests.Integration.Witness/100.MeshClientTests.cs +++ b/NEL.MESH.Tests.Integration.Witness/100.MeshClientTests.cs @@ -31,7 +31,7 @@ public MeshClientTests(ITestOutputHelper output) var configurationBuilder = new ConfigurationBuilder() .AddJsonFile("appsettings.json", optional: true, reloadOnChange: true) - .AddJsonFile("local.appsettings.json", optional: true, reloadOnChange: true) + .AddJsonFile("appsettings.Development.json", optional: true, reloadOnChange: true) .AddEnvironmentVariables("NEL_MESH_CLIENT_INTEGRATION_"); IConfiguration configuration = configurationBuilder.Build(); diff --git a/NEL.MESH.Tests.Integration.Witness/ConfigurationTests.cs b/NEL.MESH.Tests.Integration.Witness/ConfigurationTests.cs index 6225547d..2fbd3e35 100644 --- a/NEL.MESH.Tests.Integration.Witness/ConfigurationTests.cs +++ b/NEL.MESH.Tests.Integration.Witness/ConfigurationTests.cs @@ -14,7 +14,7 @@ public ConfigurationTests() { var configurationBuilder = new ConfigurationBuilder() .AddJsonFile("appsettings.json", optional: true, reloadOnChange: true) - .AddJsonFile("local.appsettings.json", optional: true, reloadOnChange: true) + .AddJsonFile("appsettings.Development.json", optional: true, reloadOnChange: true) .AddEnvironmentVariables("NEL_MESH_CLIENT_INTEGRATION_"); this.configuration = configurationBuilder.Build(); diff --git a/NEL.MESH.Tests.Integration/ConfigurationTests.cs b/NEL.MESH.Tests.Integration/ConfigurationTests.cs index fbc8a819..f25088ea 100644 --- a/NEL.MESH.Tests.Integration/ConfigurationTests.cs +++ b/NEL.MESH.Tests.Integration/ConfigurationTests.cs @@ -14,7 +14,7 @@ public ConfigurationTests() { var configurationBuilder = new ConfigurationBuilder() .AddJsonFile("appsettings.json", optional: true, reloadOnChange: true) - .AddJsonFile("local.appsettings.json", optional: true, reloadOnChange: true) + .AddJsonFile("appsettings.Development.json", optional: true, reloadOnChange: true) .AddEnvironmentVariables("NEL_MESH_CLIENT_INTEGRATION_"); this.configuration = configurationBuilder.Build(); diff --git a/NEL.MESH.Tests.Integration/MeshClientTests.cs b/NEL.MESH.Tests.Integration/MeshClientTests.cs index 1cf3357c..9d7a0427 100644 --- a/NEL.MESH.Tests.Integration/MeshClientTests.cs +++ b/NEL.MESH.Tests.Integration/MeshClientTests.cs @@ -23,7 +23,7 @@ public MeshClientTests() { var configurationBuilder = new ConfigurationBuilder() .AddJsonFile("appsettings.json", optional: true, reloadOnChange: true) - .AddJsonFile("local.appsettings.json", optional: true, reloadOnChange: true) + .AddJsonFile("appsettings.Development.json", optional: true, reloadOnChange: true) .AddEnvironmentVariables("NEL_MESH_CLIENT_INTEGRATION_"); IConfiguration configuration = configurationBuilder.Build(); diff --git a/NEL.MESH.Tests.Integration/NEL.MESH.Tests.Integration.csproj b/NEL.MESH.Tests.Integration/NEL.MESH.Tests.Integration.csproj index 141b8e8b..8c3e7e8b 100644 --- a/NEL.MESH.Tests.Integration/NEL.MESH.Tests.Integration.csproj +++ b/NEL.MESH.Tests.Integration/NEL.MESH.Tests.Integration.csproj @@ -40,6 +40,9 @@ + + Always + Always diff --git a/NEL.MESH.UI/Program.cs b/NEL.MESH.UI/Program.cs index e4784763..de62333f 100644 --- a/NEL.MESH.UI/Program.cs +++ b/NEL.MESH.UI/Program.cs @@ -20,7 +20,7 @@ static void Main() var configurationBuilder = new ConfigurationBuilder() .AddJsonFile("appsettings.json", optional: true, reloadOnChange: true) - .AddJsonFile("local.appsettings.json", optional: true, reloadOnChange: true); + .AddJsonFile("appsettings.Development.json", optional: true, reloadOnChange: true); IConfiguration configuration = configurationBuilder.Build(); From 61924281310ff3041125d55fcbf7b93c12591b35 Mon Sep 17 00:00:00 2001 From: Joe Owens Date: Wed, 21 May 2025 11:28:31 +0100 Subject: [PATCH 2/4] CODERUB: TLS root cert --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c656fad6..3e14a8d3 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -39,7 +39,7 @@ jobs: NEL_MESH_CLIENT_INTEGRATION_MESHCONFIGURATION__MAILBOXID: ${{ secrets.NEL_MESH_CLIENT_MESHCONFIGURATION__MAILBOXID }} NEL_MESH_CLIENT_INTEGRATION_MESHCONFIGURATION__PASSWORD: ${{ secrets.NEL_MESH_CLIENT_MESHCONFIGURATION__PASSWORD }} NEL_MESH_CLIENT_INTEGRATION_MESHCONFIGURATION__KEY: ${{ secrets.NEL_MESH_CLIENT_MESHCONFIGURATION__SHAREDKEY }} - NEL_MESH_CLIENT_INTEGRATION_MESHCONFIGURATION__ROOTCERTIFICATE: ${{ secrets.NEL_MESH_CLIENT_MESHCONFIGURATION__ROOTCERTIFICATE }} + NEL_MESH_CLIENT_INTEGRATION_MESHCONFIGURATION__ROOTCERTIFICATE: ${{ secrets.NEL_MESH_CLIENT_MESHCONFIGURATION__TLSROOTCERTIFICATE }} NEL_MESH_CLIENT_INTEGRATION_MESHCONFIGURATION__INTERMEDIATECERTIFICATES__0: ${{ secrets.NEL_MESH_CLIENT_MESHCONFIGURATION__TLSINTERMEDIATECERTIFICATES__0 }} NEL_MESH_CLIENT_INTEGRATION_MESHCONFIGURATION__CLIENTCERTIFICATE: ${{ secrets.NEL_MESH_CLIENT_MESHCONFIGURATION__CLIENTSIGNINGCERTIFICATE }} steps: From e10072de71ace04b493b4d5e3427f525dac7505e Mon Sep 17 00:00:00 2001 From: Joe Owens Date: Wed, 21 May 2025 11:38:44 +0100 Subject: [PATCH 3/4] CODERUB: Reference existing secrets --- .github/workflows/build.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3e14a8d3..dc0683ed 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -36,12 +36,12 @@ jobs: NEL_MESH_CLIENT_ACCEPTANCE_MESHCONFIGURATION__ROOTCERTIFICATE: ${{ secrets.NEL_MESH_CLIENT_ACCEPTANCE_MESHCONFIGURATION__ROOTCERTIFICATE }} NEL_MESH_CLIENT_ACCEPTANCE_MESHCONFIGURATION__INTERMEDIATECERTIFICATES__0: ${{ secrets.NEL_MESH_CLIENT_ACCEPTANCE_MESHCONFIGURATION__INTERMEDIATECERTIFICATES__0 }} NEL_MESH_CLIENT_ACCEPTANCE_MESHCONFIGURATION__CLIENTCERTIFICATE: ${{ secrets.NEL_MESH_CLIENT_ACCEPTANCE_MESHCONFIGURATION__CLIENTCERTIFICATE }} - NEL_MESH_CLIENT_INTEGRATION_MESHCONFIGURATION__MAILBOXID: ${{ secrets.NEL_MESH_CLIENT_MESHCONFIGURATION__MAILBOXID }} - NEL_MESH_CLIENT_INTEGRATION_MESHCONFIGURATION__PASSWORD: ${{ secrets.NEL_MESH_CLIENT_MESHCONFIGURATION__PASSWORD }} - NEL_MESH_CLIENT_INTEGRATION_MESHCONFIGURATION__KEY: ${{ secrets.NEL_MESH_CLIENT_MESHCONFIGURATION__SHAREDKEY }} - NEL_MESH_CLIENT_INTEGRATION_MESHCONFIGURATION__ROOTCERTIFICATE: ${{ secrets.NEL_MESH_CLIENT_MESHCONFIGURATION__TLSROOTCERTIFICATE }} - NEL_MESH_CLIENT_INTEGRATION_MESHCONFIGURATION__INTERMEDIATECERTIFICATES__0: ${{ secrets.NEL_MESH_CLIENT_MESHCONFIGURATION__TLSINTERMEDIATECERTIFICATES__0 }} - NEL_MESH_CLIENT_INTEGRATION_MESHCONFIGURATION__CLIENTCERTIFICATE: ${{ secrets.NEL_MESH_CLIENT_MESHCONFIGURATION__CLIENTSIGNINGCERTIFICATE }} + NEL_MESH_CLIENT_INTEGRATION_MESHCONFIGURATION__MAILBOXID: ${{ secrets.NEL_MESH_CLIENT_INTEGRATION_MESHCONFIGURATION__MAILBOXID }} + NEL_MESH_CLIENT_INTEGRATION_MESHCONFIGURATION__PASSWORD: ${{ secrets.NEL_MESH_CLIENT_INTEGRATION_MESHCONFIGURATION__PASSWORD }} + NEL_MESH_CLIENT_INTEGRATION_MESHCONFIGURATION__KEY: ${{ secrets.NEL_MESH_CLIENT_INTEGRATION_MESHCONFIGURATION__KEY }} + NEL_MESH_CLIENT_INTEGRATION_MESHCONFIGURATION__ROOTCERTIFICATE: ${{ secrets.NEL_MESH_CLIENT_INTEGRATION_MESHCONFIGURATION__ROOTCERTIFICATE }} + NEL_MESH_CLIENT_INTEGRATION_MESHCONFIGURATION__INTERMEDIATECERTIFICATES__0: ${{ secrets.NEL_MESH_CLIENT_INTEGRATION_MESHCONFIGURATION__INTERMEDIATECERTIFICATES__0 }} + NEL_MESH_CLIENT_INTEGRATION_MESHCONFIGURATION__CLIENTCERTIFICATE: ${{ secrets.NEL_MESH_CLIENT_INTEGRATION_MESHCONFIGURATION__CLIENTCERTIFICATE }} steps: - name: Check Out uses: actions/checkout@v3 From b2fa57acde5193479bca42e7666a1ae72906dba2 Mon Sep 17 00:00:00 2001 From: Joe Owens Date: Wed, 21 May 2025 11:51:37 +0100 Subject: [PATCH 4/4] CODERUB: Reset to main --- .gitignore | 1 - NEL.MESH.Tests.Acceptance/ConfigurationTests.cs | 2 +- NEL.MESH.Tests.Acceptance/MeshClientTests.cs | 2 +- NEL.MESH.Tests.Acceptance/NEL.MESH.Tests.Acceptance.csproj | 3 --- NEL.MESH.Tests.Integration.Witness/100.MeshClientTests.cs | 2 +- NEL.MESH.Tests.Integration.Witness/ConfigurationTests.cs | 2 +- NEL.MESH.Tests.Integration/ConfigurationTests.cs | 2 +- NEL.MESH.Tests.Integration/MeshClientTests.cs | 2 +- NEL.MESH.Tests.Integration/NEL.MESH.Tests.Integration.csproj | 3 --- NEL.MESH.UI/Program.cs | 2 +- 10 files changed, 7 insertions(+), 14 deletions(-) diff --git a/.gitignore b/.gitignore index e4880a80..4649a14a 100644 --- a/.gitignore +++ b/.gitignore @@ -374,4 +374,3 @@ local.appsettings.json /NEL.MESH.Tests.Acceptance/local.appsettings.integration.json /NEL.MESH.Tests.Integration/local.appsettings.integration.json /NEL.MESH.Tests.Integration/local.appsettings.acceptance.json -*/appsettings.Development.json diff --git a/NEL.MESH.Tests.Acceptance/ConfigurationTests.cs b/NEL.MESH.Tests.Acceptance/ConfigurationTests.cs index 29b3a487..79e3d4de 100644 --- a/NEL.MESH.Tests.Acceptance/ConfigurationTests.cs +++ b/NEL.MESH.Tests.Acceptance/ConfigurationTests.cs @@ -14,7 +14,7 @@ public ConfigurationTests() { var configurationBuilder = new ConfigurationBuilder() .AddJsonFile("appsettings.json", optional: true, reloadOnChange: true) - .AddJsonFile("appsettings.Development.json", optional: true, reloadOnChange: true) + .AddJsonFile("local.appsettings.json", optional: true, reloadOnChange: true) .AddEnvironmentVariables("NEL_MESH_CLIENT_ACCEPTANCE_"); this.configuration = configurationBuilder.Build(); diff --git a/NEL.MESH.Tests.Acceptance/MeshClientTests.cs b/NEL.MESH.Tests.Acceptance/MeshClientTests.cs index 417660f1..c51b62bb 100644 --- a/NEL.MESH.Tests.Acceptance/MeshClientTests.cs +++ b/NEL.MESH.Tests.Acceptance/MeshClientTests.cs @@ -26,7 +26,7 @@ public MeshClientTests() { var configurationBuilder = new ConfigurationBuilder() .AddJsonFile("appsettings.json", optional: true, reloadOnChange: true) - .AddJsonFile("appsettings.Development.json", optional: true, reloadOnChange: true) + .AddJsonFile("local.appsettings.json", optional: true, reloadOnChange: true) .AddEnvironmentVariables("NEL_MESH_CLIENT_ACCEPTANCE_"); IConfiguration configuration = configurationBuilder.Build(); diff --git a/NEL.MESH.Tests.Acceptance/NEL.MESH.Tests.Acceptance.csproj b/NEL.MESH.Tests.Acceptance/NEL.MESH.Tests.Acceptance.csproj index 22644c22..ec9e4f44 100644 --- a/NEL.MESH.Tests.Acceptance/NEL.MESH.Tests.Acceptance.csproj +++ b/NEL.MESH.Tests.Acceptance/NEL.MESH.Tests.Acceptance.csproj @@ -35,9 +35,6 @@ - - Always - Always diff --git a/NEL.MESH.Tests.Integration.Witness/100.MeshClientTests.cs b/NEL.MESH.Tests.Integration.Witness/100.MeshClientTests.cs index a0a190e2..cc8a803d 100644 --- a/NEL.MESH.Tests.Integration.Witness/100.MeshClientTests.cs +++ b/NEL.MESH.Tests.Integration.Witness/100.MeshClientTests.cs @@ -31,7 +31,7 @@ public MeshClientTests(ITestOutputHelper output) var configurationBuilder = new ConfigurationBuilder() .AddJsonFile("appsettings.json", optional: true, reloadOnChange: true) - .AddJsonFile("appsettings.Development.json", optional: true, reloadOnChange: true) + .AddJsonFile("local.appsettings.json", optional: true, reloadOnChange: true) .AddEnvironmentVariables("NEL_MESH_CLIENT_INTEGRATION_"); IConfiguration configuration = configurationBuilder.Build(); diff --git a/NEL.MESH.Tests.Integration.Witness/ConfigurationTests.cs b/NEL.MESH.Tests.Integration.Witness/ConfigurationTests.cs index 2fbd3e35..6225547d 100644 --- a/NEL.MESH.Tests.Integration.Witness/ConfigurationTests.cs +++ b/NEL.MESH.Tests.Integration.Witness/ConfigurationTests.cs @@ -14,7 +14,7 @@ public ConfigurationTests() { var configurationBuilder = new ConfigurationBuilder() .AddJsonFile("appsettings.json", optional: true, reloadOnChange: true) - .AddJsonFile("appsettings.Development.json", optional: true, reloadOnChange: true) + .AddJsonFile("local.appsettings.json", optional: true, reloadOnChange: true) .AddEnvironmentVariables("NEL_MESH_CLIENT_INTEGRATION_"); this.configuration = configurationBuilder.Build(); diff --git a/NEL.MESH.Tests.Integration/ConfigurationTests.cs b/NEL.MESH.Tests.Integration/ConfigurationTests.cs index f25088ea..fbc8a819 100644 --- a/NEL.MESH.Tests.Integration/ConfigurationTests.cs +++ b/NEL.MESH.Tests.Integration/ConfigurationTests.cs @@ -14,7 +14,7 @@ public ConfigurationTests() { var configurationBuilder = new ConfigurationBuilder() .AddJsonFile("appsettings.json", optional: true, reloadOnChange: true) - .AddJsonFile("appsettings.Development.json", optional: true, reloadOnChange: true) + .AddJsonFile("local.appsettings.json", optional: true, reloadOnChange: true) .AddEnvironmentVariables("NEL_MESH_CLIENT_INTEGRATION_"); this.configuration = configurationBuilder.Build(); diff --git a/NEL.MESH.Tests.Integration/MeshClientTests.cs b/NEL.MESH.Tests.Integration/MeshClientTests.cs index 9d7a0427..1cf3357c 100644 --- a/NEL.MESH.Tests.Integration/MeshClientTests.cs +++ b/NEL.MESH.Tests.Integration/MeshClientTests.cs @@ -23,7 +23,7 @@ public MeshClientTests() { var configurationBuilder = new ConfigurationBuilder() .AddJsonFile("appsettings.json", optional: true, reloadOnChange: true) - .AddJsonFile("appsettings.Development.json", optional: true, reloadOnChange: true) + .AddJsonFile("local.appsettings.json", optional: true, reloadOnChange: true) .AddEnvironmentVariables("NEL_MESH_CLIENT_INTEGRATION_"); IConfiguration configuration = configurationBuilder.Build(); diff --git a/NEL.MESH.Tests.Integration/NEL.MESH.Tests.Integration.csproj b/NEL.MESH.Tests.Integration/NEL.MESH.Tests.Integration.csproj index 8c3e7e8b..141b8e8b 100644 --- a/NEL.MESH.Tests.Integration/NEL.MESH.Tests.Integration.csproj +++ b/NEL.MESH.Tests.Integration/NEL.MESH.Tests.Integration.csproj @@ -40,9 +40,6 @@ - - Always - Always diff --git a/NEL.MESH.UI/Program.cs b/NEL.MESH.UI/Program.cs index de62333f..e4784763 100644 --- a/NEL.MESH.UI/Program.cs +++ b/NEL.MESH.UI/Program.cs @@ -20,7 +20,7 @@ static void Main() var configurationBuilder = new ConfigurationBuilder() .AddJsonFile("appsettings.json", optional: true, reloadOnChange: true) - .AddJsonFile("appsettings.Development.json", optional: true, reloadOnChange: true); + .AddJsonFile("local.appsettings.json", optional: true, reloadOnChange: true); IConfiguration configuration = configurationBuilder.Build();