From c2c69af7ccddf49726cd8703d2196ef2d770a273 Mon Sep 17 00:00:00 2001 From: Ilya Skuratovsky Date: Wed, 18 Dec 2024 15:50:12 +0000 Subject: [PATCH 01/27] Set up CI with Start Right --- deploy-networking-echo-test-servers.yml | 44 +++++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 deploy-networking-echo-test-servers.yml diff --git a/deploy-networking-echo-test-servers.yml b/deploy-networking-echo-test-servers.yml new file mode 100644 index 00000000000000..8b8bd8ec4d5a8d --- /dev/null +++ b/deploy-networking-echo-test-servers.yml @@ -0,0 +1,44 @@ +# This pipeline is a basic starter for using 1ESPipelineTemplates to build in a VM. +# Refer to our onboarding documentation at https://aka.ms/1espt for more details and support channels. +name: Pipeline Building In VM +trigger: none + +resources: + repositories: + - repository: 1ESPipelineTemplates + type: git + name: 1ESPipelineTemplates/1ESPipelineTemplates + ref: refs/tags/release + +extends: + template: v1/1ES.Unofficial.PipelineTemplate.yml@1ESPipelineTemplates + parameters: + customBuildTags: + - 1ES.PT.ViaStartRight + pool: + name: NetCore1ESPool-Internal + image: --imageName-- + os: --operatingSystem-- + sdl: + sourceAnalysisPool: + name: NetCore1ESPool-Internal + # The image must be windows-based due to restrictions of the SDL tools. See: https://eng.ms/docs/cloud-ai-platform/devdiv/one-engineering-system-1es/1es-docs/1es-pipeline-templates/features/sdlanalysis/overview#how-to-specify-a-windows-pool-for-the-sdl-source-analysis-stage + # In the case of a windows build, this can be the same as the above pool image. + image: --sdlImageName-- + os: windows + + stages: + - stage: stage + displayName: Building in a VM + jobs: + - job: job + displayName: Job + # Remove templateContext and outputs if your pipeline does not publish any artifacts. Check here for more details: https://eng.ms/docs/cloud-ai-platform/devdiv/one-engineering-system-1es/1es-docs/1es-pipeline-templates/features/outputs + templateContext: + outputs: + - output: pipelineArtifact + targetPath: $(System.DefaultWorkingDirectory)/Output + artifactName: myPipelineArtifact + steps: + - checkout: self + - powershell: echo "Hello World from Job" From 8f235e7251c5e551b9bbe7ea2edf0dcdde1eb28e Mon Sep 17 00:00:00 2001 From: Radek Zikmund Date: Mon, 6 Jan 2025 12:31:55 +0000 Subject: [PATCH 02/27] Update deploy-networking-echo-test-servers.yml for Azure Pipelines --- deploy-networking-echo-test-servers.yml | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/deploy-networking-echo-test-servers.yml b/deploy-networking-echo-test-servers.yml index 8b8bd8ec4d5a8d..5cb1afec763d94 100644 --- a/deploy-networking-echo-test-servers.yml +++ b/deploy-networking-echo-test-servers.yml @@ -1,6 +1,5 @@ # This pipeline is a basic starter for using 1ESPipelineTemplates to build in a VM. # Refer to our onboarding documentation at https://aka.ms/1espt for more details and support channels. -name: Pipeline Building In VM trigger: none resources: @@ -10,23 +9,19 @@ resources: name: 1ESPipelineTemplates/1ESPipelineTemplates ref: refs/tags/release +variables: + - template: /eng/common/templates-official/variables/pool-providers.yml + extends: template: v1/1ES.Unofficial.PipelineTemplate.yml@1ESPipelineTemplates parameters: customBuildTags: - 1ES.PT.ViaStartRight pool: - name: NetCore1ESPool-Internal - image: --imageName-- - os: --operatingSystem-- - sdl: - sourceAnalysisPool: - name: NetCore1ESPool-Internal - # The image must be windows-based due to restrictions of the SDL tools. See: https://eng.ms/docs/cloud-ai-platform/devdiv/one-engineering-system-1es/1es-docs/1es-pipeline-templates/features/sdlanalysis/overview#how-to-specify-a-windows-pool-for-the-sdl-source-analysis-stage - # In the case of a windows build, this can be the same as the above pool image. - image: --sdlImageName-- - os: windows - + name: $(DncEngInternalBuildPool) + image: 1es-windows-2022 + os: windows + stages: - stage: stage displayName: Building in a VM From 6b73163debc3a528ecb095980b9f6636f81969bd Mon Sep 17 00:00:00 2001 From: Radek Zikmund Date: Mon, 6 Jan 2025 13:00:24 +0000 Subject: [PATCH 03/27] Update deploy-networking-echo-test-servers.yml for Azure Pipelines Add build and publish steps (TODO: Authorize) --- deploy-networking-echo-test-servers.yml | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/deploy-networking-echo-test-servers.yml b/deploy-networking-echo-test-servers.yml index 5cb1afec763d94..d87e445256dab0 100644 --- a/deploy-networking-echo-test-servers.yml +++ b/deploy-networking-echo-test-servers.yml @@ -27,7 +27,7 @@ extends: displayName: Building in a VM jobs: - job: job - displayName: Job + displayName: Build # Remove templateContext and outputs if your pipeline does not publish any artifacts. Check here for more details: https://eng.ms/docs/cloud-ai-platform/devdiv/one-engineering-system-1es/1es-docs/1es-pipeline-templates/features/outputs templateContext: outputs: @@ -36,4 +36,18 @@ extends: artifactName: myPipelineArtifact steps: - checkout: self - - powershell: echo "Hello World from Job" + - task: DotNetCoreCLI@2 + inputs: + command: 'publish' + publishWebProjects: false + projects: '/src/libraries/Common/tests/System/Net/Prerequisites/NetCoreServer/NetCoreServer.csproj' + arguments: '-c Release /p:GenevaTelemetry=true' + - task: AzureRmWebAppDeployment@4 + inputs: + ConnectionType: 'AzureRM' + appType: 'webApp' + WebAppName: 'corefx-net-http11' + deployToSlotOrASE: true + ResourceGroupName: 'Production-WestUS' + SlotName: 'staging' + packageForLinux: '$(System.DefaultWorkingDirectory)/**/*.zip' \ No newline at end of file From da6f949af957dc02d8a8ecca2267bb9ca0258bfb Mon Sep 17 00:00:00 2001 From: Radek Zikmund Date: Mon, 6 Jan 2025 13:46:27 +0000 Subject: [PATCH 04/27] Update deploy-networking-echo-test-servers.yml for Azure Pipelines Add azureSubscription reference --- deploy-networking-echo-test-servers.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/deploy-networking-echo-test-servers.yml b/deploy-networking-echo-test-servers.yml index d87e445256dab0..1e521c0828e067 100644 --- a/deploy-networking-echo-test-servers.yml +++ b/deploy-networking-echo-test-servers.yml @@ -45,6 +45,7 @@ extends: - task: AzureRmWebAppDeployment@4 inputs: ConnectionType: 'AzureRM' + azureSubscription: .NET Libraries Network Testing appType: 'webApp' WebAppName: 'corefx-net-http11' deployToSlotOrASE: true From 89c695e3178e36bc9dd450301b9be1b9511fbfa1 Mon Sep 17 00:00:00 2001 From: Radek Zikmund Date: Mon, 6 Jan 2025 14:06:26 +0000 Subject: [PATCH 05/27] Update .NET version in pipeline --- deploy-networking-echo-test-servers.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/deploy-networking-echo-test-servers.yml b/deploy-networking-echo-test-servers.yml index 1e521c0828e067..141ff3324d0c94 100644 --- a/deploy-networking-echo-test-servers.yml +++ b/deploy-networking-echo-test-servers.yml @@ -36,6 +36,10 @@ extends: artifactName: myPipelineArtifact steps: - checkout: self + - task: UseDotNet@2 + inputs: + packageType: 'sdk' + useGlobalJson: true - task: DotNetCoreCLI@2 inputs: command: 'publish' From 9e72d2150ecab3965d2aa9ec45c13c87bb36c6e7 Mon Sep 17 00:00:00 2001 From: Radek Zikmund Date: Mon, 6 Jan 2025 14:21:42 +0000 Subject: [PATCH 06/27] allow preview versions of .NET --- deploy-networking-echo-test-servers.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/deploy-networking-echo-test-servers.yml b/deploy-networking-echo-test-servers.yml index 141ff3324d0c94..cef1e96aa70aeb 100644 --- a/deploy-networking-echo-test-servers.yml +++ b/deploy-networking-echo-test-servers.yml @@ -40,6 +40,7 @@ extends: inputs: packageType: 'sdk' useGlobalJson: true + includePreviewVersions: true - task: DotNetCoreCLI@2 inputs: command: 'publish' From d6ada5280b8f66edb0262454f66ea84cb4280927 Mon Sep 17 00:00:00 2001 From: Radek Zikmund Date: Mon, 6 Jan 2025 14:44:21 +0000 Subject: [PATCH 07/27] fix --- deploy-networking-echo-test-servers.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy-networking-echo-test-servers.yml b/deploy-networking-echo-test-servers.yml index cef1e96aa70aeb..4f3c4ae93fc093 100644 --- a/deploy-networking-echo-test-servers.yml +++ b/deploy-networking-echo-test-servers.yml @@ -39,7 +39,7 @@ extends: - task: UseDotNet@2 inputs: packageType: 'sdk' - useGlobalJson: true + version: '10.x' includePreviewVersions: true - task: DotNetCoreCLI@2 inputs: From 5a91612e30c19c20c2ffe18e49be552bd75806a0 Mon Sep 17 00:00:00 2001 From: Radek Zikmund Date: Mon, 6 Jan 2025 14:59:53 +0000 Subject: [PATCH 08/27] Update deploy-networking-echo-test-servers.yml for Azure Pipelines --- deploy-networking-echo-test-servers.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/deploy-networking-echo-test-servers.yml b/deploy-networking-echo-test-servers.yml index 4f3c4ae93fc093..7156467dcf16ea 100644 --- a/deploy-networking-echo-test-servers.yml +++ b/deploy-networking-echo-test-servers.yml @@ -39,14 +39,14 @@ extends: - task: UseDotNet@2 inputs: packageType: 'sdk' - version: '10.x' + version: '8.x' includePreviewVersions: true - task: DotNetCoreCLI@2 inputs: command: 'publish' publishWebProjects: false projects: '/src/libraries/Common/tests/System/Net/Prerequisites/NetCoreServer/NetCoreServer.csproj' - arguments: '-c Release /p:GenevaTelemetry=true' + arguments: '-c Release /p:GenevaTelemetry=true /p:AspNetCoreAppCurrent=net8.0' - task: AzureRmWebAppDeployment@4 inputs: ConnectionType: 'AzureRM' From ede1b2b5a885c0cf067d0b410dcc1b746c86be91 Mon Sep 17 00:00:00 2001 From: Radek Zikmund Date: Tue, 7 Jan 2025 09:52:55 +0000 Subject: [PATCH 09/27] Use multi level lookup --- deploy-networking-echo-test-servers.yml | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/deploy-networking-echo-test-servers.yml b/deploy-networking-echo-test-servers.yml index 7156467dcf16ea..030b6024b3011d 100644 --- a/deploy-networking-echo-test-servers.yml +++ b/deploy-networking-echo-test-servers.yml @@ -28,25 +28,23 @@ extends: jobs: - job: job displayName: Build - # Remove templateContext and outputs if your pipeline does not publish any artifacts. Check here for more details: https://eng.ms/docs/cloud-ai-platform/devdiv/one-engineering-system-1es/1es-docs/1es-pipeline-templates/features/outputs - templateContext: - outputs: - - output: pipelineArtifact - targetPath: $(System.DefaultWorkingDirectory)/Output - artifactName: myPipelineArtifact steps: - checkout: self + - task: UseDotNet@2 inputs: packageType: 'sdk' version: '8.x' includePreviewVersions: true + performMultiLevelLookup: true + - task: DotNetCoreCLI@2 inputs: command: 'publish' publishWebProjects: false projects: '/src/libraries/Common/tests/System/Net/Prerequisites/NetCoreServer/NetCoreServer.csproj' - arguments: '-c Release /p:GenevaTelemetry=true /p:AspNetCoreAppCurrent=net8.0' + arguments: '-c Release /p:GenevaTelemetry=false /p:AspNetCoreAppCurrent=net8.0' + - task: AzureRmWebAppDeployment@4 inputs: ConnectionType: 'AzureRM' @@ -56,4 +54,4 @@ extends: deployToSlotOrASE: true ResourceGroupName: 'Production-WestUS' SlotName: 'staging' - packageForLinux: '$(System.DefaultWorkingDirectory)/**/*.zip' \ No newline at end of file + package: '$(System.DefaultWorkingDirectory)/**/*.zip' \ No newline at end of file From bae3096625cc239a60ab18f8ae621a838d2962fa Mon Sep 17 00:00:00 2001 From: Radek Zikmund Date: Tue, 7 Jan 2025 12:01:44 +0000 Subject: [PATCH 10/27] Manual invocation of dotnet build. --- deploy-networking-echo-test-servers.yml | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/deploy-networking-echo-test-servers.yml b/deploy-networking-echo-test-servers.yml index 030b6024b3011d..74638f640bf270 100644 --- a/deploy-networking-echo-test-servers.yml +++ b/deploy-networking-echo-test-servers.yml @@ -31,21 +31,19 @@ extends: steps: - checkout: self - - task: UseDotNet@2 + - task: PowerShell@2 + displayName: Run dotnet publish inputs: - packageType: 'sdk' - version: '8.x' - includePreviewVersions: true - performMultiLevelLookup: true - - - task: DotNetCoreCLI@2 + targetType: 'inline' + script: './dotnet.cmd publish ./src/libraries/Common/tests/System/Net/Prerequisites/NetCoreServer/NetCoreServer.csproj -c Release /p:GenevaTelemetry=false /p:AspNetCoreAppCurrent=net10.0' + - task: zip@0 + displayName: Zip artifacts inputs: - command: 'publish' - publishWebProjects: false - projects: '/src/libraries/Common/tests/System/Net/Prerequisites/NetCoreServer/NetCoreServer.csproj' - arguments: '-c Release /p:GenevaTelemetry=false /p:AspNetCoreAppCurrent=net8.0' + pathToZipFolder: 'artifacts\bin\NetCoreServer\Release\net10.0\publish\' + pathToZipFile: 'artifacts\bin\NetCoreServer\Release\net10.0\publish.zip' - task: AzureRmWebAppDeployment@4 + displayName: Deploy to staging slot inputs: ConnectionType: 'AzureRM' azureSubscription: .NET Libraries Network Testing @@ -54,4 +52,4 @@ extends: deployToSlotOrASE: true ResourceGroupName: 'Production-WestUS' SlotName: 'staging' - package: '$(System.DefaultWorkingDirectory)/**/*.zip' \ No newline at end of file + package: 'artifacts\bin\NetCoreServer\Release\net10.0\publish.zip' \ No newline at end of file From 7847c669ac6f4dae2e5f1e966bb4e05f818d336c Mon Sep 17 00:00:00 2001 From: Radek Zikmund Date: Tue, 7 Jan 2025 13:47:32 +0000 Subject: [PATCH 11/27] use .NET 8 --- deploy-networking-echo-test-servers.yml | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/deploy-networking-echo-test-servers.yml b/deploy-networking-echo-test-servers.yml index 74638f640bf270..e9ff3766ba882c 100644 --- a/deploy-networking-echo-test-servers.yml +++ b/deploy-networking-echo-test-servers.yml @@ -11,6 +11,8 @@ resources: variables: - template: /eng/common/templates-official/variables/pool-providers.yml + - name: FrameworkVersion + value: net8.0 extends: template: v1/1ES.Unofficial.PipelineTemplate.yml@1ESPipelineTemplates @@ -31,16 +33,27 @@ extends: steps: - checkout: self + - task: UseDotNet@2 + inputs: + packageType: "sdk" + version: "8.x" + + - task: PowerShell@2 + displayName: Bypass global.json + inputs: + targetType: 'inline' + script: 'echo "{}" > ./src/libraries/Common/tests/System/Net/Prerequisites/NetCoreServer/global.json' + - task: PowerShell@2 displayName: Run dotnet publish inputs: targetType: 'inline' - script: './dotnet.cmd publish ./src/libraries/Common/tests/System/Net/Prerequisites/NetCoreServer/NetCoreServer.csproj -c Release /p:GenevaTelemetry=false /p:AspNetCoreAppCurrent=net10.0' + script: 'dotnet publish ./src/libraries/Common/tests/System/Net/Prerequisites/NetCoreServer/NetCoreServer.csproj -c Release /p:GenevaTelemetry=false /p:AspNetCoreAppCurrent=$(FrameworkVersion)' - task: zip@0 displayName: Zip artifacts inputs: - pathToZipFolder: 'artifacts\bin\NetCoreServer\Release\net10.0\publish\' - pathToZipFile: 'artifacts\bin\NetCoreServer\Release\net10.0\publish.zip' + pathToZipFolder: 'artifacts\bin\NetCoreServer\Release\$(FrameworkVersion)\publish\' + pathToZipFile: 'artifacts\bin\NetCoreServer\Release\$(FrameworkVersion)\publish.zip' - task: AzureRmWebAppDeployment@4 displayName: Deploy to staging slot @@ -52,4 +65,4 @@ extends: deployToSlotOrASE: true ResourceGroupName: 'Production-WestUS' SlotName: 'staging' - package: 'artifacts\bin\NetCoreServer\Release\net10.0\publish.zip' \ No newline at end of file + package: 'artifacts\bin\NetCoreServer\Release\$(FrameworkVersion)\publish.zip' \ No newline at end of file From e9785cf02bcad0941f358e9c35a1b96011307bc3 Mon Sep 17 00:00:00 2001 From: Radek Zikmund Date: Tue, 7 Jan 2025 14:06:30 +0000 Subject: [PATCH 12/27] script task instead of powershell --- deploy-networking-echo-test-servers.yml | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/deploy-networking-echo-test-servers.yml b/deploy-networking-echo-test-servers.yml index e9ff3766ba882c..a16ea2d04d7867 100644 --- a/deploy-networking-echo-test-servers.yml +++ b/deploy-networking-echo-test-servers.yml @@ -38,17 +38,12 @@ extends: packageType: "sdk" version: "8.x" - - task: PowerShell@2 + - script: echo "{}" > ./src/libraries/Common/tests/System/Net/Prerequisites/NetCoreServer/global.json displayName: Bypass global.json - inputs: - targetType: 'inline' - script: 'echo "{}" > ./src/libraries/Common/tests/System/Net/Prerequisites/NetCoreServer/global.json' - - task: PowerShell@2 + - script: dotnet publish ./src/libraries/Common/tests/System/Net/Prerequisites/NetCoreServer/NetCoreServer.csproj -c Release /p:GenevaTelemetry=false /p:AspNetCoreAppCurrent=$(FrameworkVersion) displayName: Run dotnet publish - inputs: - targetType: 'inline' - script: 'dotnet publish ./src/libraries/Common/tests/System/Net/Prerequisites/NetCoreServer/NetCoreServer.csproj -c Release /p:GenevaTelemetry=false /p:AspNetCoreAppCurrent=$(FrameworkVersion)' + - task: zip@0 displayName: Zip artifacts inputs: From 6b4acf6f492dd7064da3383e0e391f9906156250 Mon Sep 17 00:00:00 2001 From: Radek Zikmund Date: Tue, 7 Jan 2025 14:22:50 +0000 Subject: [PATCH 13/27] Specify working directory during build --- deploy-networking-echo-test-servers.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/deploy-networking-echo-test-servers.yml b/deploy-networking-echo-test-servers.yml index a16ea2d04d7867..02b4f1098ed95f 100644 --- a/deploy-networking-echo-test-servers.yml +++ b/deploy-networking-echo-test-servers.yml @@ -41,7 +41,8 @@ extends: - script: echo "{}" > ./src/libraries/Common/tests/System/Net/Prerequisites/NetCoreServer/global.json displayName: Bypass global.json - - script: dotnet publish ./src/libraries/Common/tests/System/Net/Prerequisites/NetCoreServer/NetCoreServer.csproj -c Release /p:GenevaTelemetry=false /p:AspNetCoreAppCurrent=$(FrameworkVersion) + - script: dotnet publish -c Release /p:GenevaTelemetry=false /p:AspNetCoreAppCurrent=$(FrameworkVersion) + workingDirectory: ./src/libraries/Common/tests/System/Net/Prerequisites/NetCoreServer displayName: Run dotnet publish - task: zip@0 From fb75eb394c15189d6fe76901afb7d3b6ed712b0f Mon Sep 17 00:00:00 2001 From: Radek Zikmund Date: Tue, 7 Jan 2025 14:39:00 +0000 Subject: [PATCH 14/27] remove global.json --- deploy-networking-echo-test-servers.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/deploy-networking-echo-test-servers.yml b/deploy-networking-echo-test-servers.yml index 02b4f1098ed95f..92d8caa7a2f879 100644 --- a/deploy-networking-echo-test-servers.yml +++ b/deploy-networking-echo-test-servers.yml @@ -38,8 +38,8 @@ extends: packageType: "sdk" version: "8.x" - - script: echo "{}" > ./src/libraries/Common/tests/System/Net/Prerequisites/NetCoreServer/global.json - displayName: Bypass global.json + - script: rm ./global.json + displayName: Bypass repository global.json - script: dotnet publish -c Release /p:GenevaTelemetry=false /p:AspNetCoreAppCurrent=$(FrameworkVersion) workingDirectory: ./src/libraries/Common/tests/System/Net/Prerequisites/NetCoreServer @@ -61,4 +61,4 @@ extends: deployToSlotOrASE: true ResourceGroupName: 'Production-WestUS' SlotName: 'staging' - package: 'artifacts\bin\NetCoreServer\Release\$(FrameworkVersion)\publish.zip' \ No newline at end of file + package: 'artifacts\bin\NetCoreServer\Release\$(FrameworkVersion)\publish.zip' From 1035b70d225397678e8c835a9856e14251866873 Mon Sep 17 00:00:00 2001 From: Radek Zikmund Date: Tue, 7 Jan 2025 15:10:55 +0000 Subject: [PATCH 15/27] fix --- deploy-networking-echo-test-servers.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/deploy-networking-echo-test-servers.yml b/deploy-networking-echo-test-servers.yml index 92d8caa7a2f879..399196cb9fa08c 100644 --- a/deploy-networking-echo-test-servers.yml +++ b/deploy-networking-echo-test-servers.yml @@ -38,10 +38,11 @@ extends: packageType: "sdk" version: "8.x" - - script: rm ./global.json + - script: echo {} > ./global.json displayName: Bypass repository global.json + workingDirectory: ./src/libraries/Common/tests/System/Net/Prerequisites/NetCoreServer - - script: dotnet publish -c Release /p:GenevaTelemetry=false /p:AspNetCoreAppCurrent=$(FrameworkVersion) + - script: dotnet publish -c Release /p:GenevaTelemetry=false /p:_TargetFrameworkForXHarness=$(FrameworkVersion) workingDirectory: ./src/libraries/Common/tests/System/Net/Prerequisites/NetCoreServer displayName: Run dotnet publish From 6aa6fc205df474ab1fb1f898626ef6cb80ce65e7 Mon Sep 17 00:00:00 2001 From: Radek Zikmund Date: Tue, 7 Jan 2025 16:46:48 +0100 Subject: [PATCH 16/27] Add versions reference --- .../System/Net/Prerequisites/NetCoreServer/Directory.Build.props | 1 + 1 file changed, 1 insertion(+) diff --git a/src/libraries/Common/tests/System/Net/Prerequisites/NetCoreServer/Directory.Build.props b/src/libraries/Common/tests/System/Net/Prerequisites/NetCoreServer/Directory.Build.props index 65a9a7c3bf4783..8b6a62bf6d7d27 100644 --- a/src/libraries/Common/tests/System/Net/Prerequisites/NetCoreServer/Directory.Build.props +++ b/src/libraries/Common/tests/System/Net/Prerequisites/NetCoreServer/Directory.Build.props @@ -4,4 +4,5 @@ + From 642fed1149c53fafe5219bfb381a3963c152d980 Mon Sep 17 00:00:00 2001 From: Radek Zikmund Date: Wed, 8 Jan 2025 10:23:05 +0100 Subject: [PATCH 17/27] Update to released OpenTelemetry packages --- .../Prerequisites/NetCoreServer/NetCoreServer.csproj | 10 +++++----- .../System/Net/Prerequisites/NetCoreServer/Startup.cs | 7 ++----- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/src/libraries/Common/tests/System/Net/Prerequisites/NetCoreServer/NetCoreServer.csproj b/src/libraries/Common/tests/System/Net/Prerequisites/NetCoreServer/NetCoreServer.csproj index a458eb3eeec5ed..0010a9bfa92c2e 100644 --- a/src/libraries/Common/tests/System/Net/Prerequisites/NetCoreServer/NetCoreServer.csproj +++ b/src/libraries/Common/tests/System/Net/Prerequisites/NetCoreServer/NetCoreServer.csproj @@ -16,11 +16,11 @@ - - - - - + + + + + diff --git a/src/libraries/Common/tests/System/Net/Prerequisites/NetCoreServer/Startup.cs b/src/libraries/Common/tests/System/Net/Prerequisites/NetCoreServer/Startup.cs index 5eade747eb9d34..0dec43c28f5b82 100644 --- a/src/libraries/Common/tests/System/Net/Prerequisites/NetCoreServer/Startup.cs +++ b/src/libraries/Common/tests/System/Net/Prerequisites/NetCoreServer/Startup.cs @@ -10,10 +10,6 @@ using OpenTelemetry.Trace; using OpenTelemetry.Metrics; using OpenTelemetry.Exporter.Geneva; -using System.Diagnostics.Metrics; -using Microsoft.AspNetCore.Http; -using System.Threading.Tasks; -using System.Diagnostics; using System.Collections.Generic; #endif @@ -31,7 +27,8 @@ public Startup(IConfiguration configuration) public void ConfigureServices(IServiceCollection services) { #if GENEVA_TELEMETRY - services.AddOpenTelemetryMetrics((builder) => builder + services.AddOpenTelemetry() + .WithMetrics((builder) => builder .AddAspNetCoreInstrumentation() .AddGenevaMetricExporter(options => { From d5bdc8f7e8f90381775eb50ae5433479eac56978 Mon Sep 17 00:00:00 2001 From: Radek Zikmund Date: Wed, 8 Jan 2025 10:26:25 +0100 Subject: [PATCH 18/27] Turn on GenevaTelemetry in the pipeline build --- deploy-networking-echo-test-servers.yml | 86 +++++++++++++------------ 1 file changed, 44 insertions(+), 42 deletions(-) diff --git a/deploy-networking-echo-test-servers.yml b/deploy-networking-echo-test-servers.yml index 399196cb9fa08c..8f6fb6a844f3d4 100644 --- a/deploy-networking-echo-test-servers.yml +++ b/deploy-networking-echo-test-servers.yml @@ -4,62 +4,64 @@ trigger: none resources: repositories: - - repository: 1ESPipelineTemplates - type: git - name: 1ESPipelineTemplates/1ESPipelineTemplates - ref: refs/tags/release + - repository: 1ESPipelineTemplates + type: git + name: 1ESPipelineTemplates/1ESPipelineTemplates + ref: refs/tags/release variables: - - template: /eng/common/templates-official/variables/pool-providers.yml - - name: FrameworkVersion - value: net8.0 + - template: /eng/common/templates-official/variables/pool-providers.yml + - name: FrameworkVersion + value: 8.0 + - name: TargetFramework + value: net$(FrameworkVersion) extends: template: v1/1ES.Unofficial.PipelineTemplate.yml@1ESPipelineTemplates parameters: customBuildTags: - - 1ES.PT.ViaStartRight + - 1ES.PT.ViaStartRight pool: name: $(DncEngInternalBuildPool) image: 1es-windows-2022 os: windows - + stages: - - stage: stage - displayName: Building in a VM - jobs: - - job: job - displayName: Build - steps: - - checkout: self + - stage: stage + displayName: Building in a VM + jobs: + - job: job + displayName: Build + steps: + - checkout: self - - task: UseDotNet@2 - inputs: - packageType: "sdk" - version: "8.x" + - task: UseDotNet@2 + inputs: + packageType: "sdk" + version: $(FrameworkVersion) - - script: echo {} > ./global.json - displayName: Bypass repository global.json - workingDirectory: ./src/libraries/Common/tests/System/Net/Prerequisites/NetCoreServer + - script: echo {} > ./global.json + displayName: Bypass repository global.json + workingDirectory: ./src/libraries/Common/tests/System/Net/Prerequisites/NetCoreServer - - script: dotnet publish -c Release /p:GenevaTelemetry=false /p:_TargetFrameworkForXHarness=$(FrameworkVersion) - workingDirectory: ./src/libraries/Common/tests/System/Net/Prerequisites/NetCoreServer - displayName: Run dotnet publish + - script: dotnet publish -c Release /p:GenevaTelemetry=true /p:_TargetFrameworkForXHarness=$(TargetFramework) + workingDirectory: ./src/libraries/Common/tests/System/Net/Prerequisites/NetCoreServer + displayName: Run dotnet publish - - task: zip@0 - displayName: Zip artifacts - inputs: - pathToZipFolder: 'artifacts\bin\NetCoreServer\Release\$(FrameworkVersion)\publish\' - pathToZipFile: 'artifacts\bin\NetCoreServer\Release\$(FrameworkVersion)\publish.zip' + - task: zip@0 + displayName: Zip artifacts + inputs: + pathToZipFolder: 'artifacts\bin\NetCoreServer\Release\$(TargetFramework)\publish\' + pathToZipFile: 'artifacts\bin\NetCoreServer\Release\$(TargetFramework)\publish.zip' - - task: AzureRmWebAppDeployment@4 - displayName: Deploy to staging slot - inputs: - ConnectionType: 'AzureRM' - azureSubscription: .NET Libraries Network Testing - appType: 'webApp' - WebAppName: 'corefx-net-http11' - deployToSlotOrASE: true - ResourceGroupName: 'Production-WestUS' - SlotName: 'staging' - package: 'artifacts\bin\NetCoreServer\Release\$(FrameworkVersion)\publish.zip' + - task: AzureRmWebAppDeployment@4 + displayName: Deploy to staging slot + inputs: + ConnectionType: "AzureRM" + azureSubscription: .NET Libraries Network Testing + appType: "webApp" + WebAppName: "corefx-net-http11" + deployToSlotOrASE: true + ResourceGroupName: "Production-WestUS" + SlotName: "staging" + package: 'artifacts\bin\NetCoreServer\Release\$(TargetFramework)\publish.zip' From 163a478d6c1bdcb2f64aa4df755ff43ea6f9a1bd Mon Sep 17 00:00:00 2001 From: Radek Zikmund Date: Thu, 9 Jan 2025 12:48:59 +0100 Subject: [PATCH 19/27] Add swagger file --- .../NetCoreServer/GenericHandler.cs | 10 + .../NetCoreServer/NetCoreServer.csproj | 5 + .../Prerequisites/NetCoreServer/swagger.json | 297 ++++++++++++++++++ 3 files changed, 312 insertions(+) create mode 100644 src/libraries/Common/tests/System/Net/Prerequisites/NetCoreServer/swagger.json diff --git a/src/libraries/Common/tests/System/Net/Prerequisites/NetCoreServer/GenericHandler.cs b/src/libraries/Common/tests/System/Net/Prerequisites/NetCoreServer/GenericHandler.cs index c433a9edbcb76c..3731385df3bb27 100644 --- a/src/libraries/Common/tests/System/Net/Prerequisites/NetCoreServer/GenericHandler.cs +++ b/src/libraries/Common/tests/System/Net/Prerequisites/NetCoreServer/GenericHandler.cs @@ -19,6 +19,16 @@ public GenericHandler(RequestDelegate next) public async Task Invoke(HttpContext context) { PathString path = context.Request.Path; + if (path.Equals(new PathString("/swagger.json"))) + { + using (var stream = typeof(GenericHandler).Assembly.GetManifestResourceStream("NetCoreServer.swagger.json")) + { + context.Response.ContentType = "application/json"; + await stream.CopyToAsync(context.Response.Body); + } + return; + } + if (path.Equals(new PathString("/deflate.ashx"))) { await DeflateHandler.InvokeAsync(context); diff --git a/src/libraries/Common/tests/System/Net/Prerequisites/NetCoreServer/NetCoreServer.csproj b/src/libraries/Common/tests/System/Net/Prerequisites/NetCoreServer/NetCoreServer.csproj index 0010a9bfa92c2e..d1c331b0aabcdb 100644 --- a/src/libraries/Common/tests/System/Net/Prerequisites/NetCoreServer/NetCoreServer.csproj +++ b/src/libraries/Common/tests/System/Net/Prerequisites/NetCoreServer/NetCoreServer.csproj @@ -21,6 +21,11 @@ + + + + + diff --git a/src/libraries/Common/tests/System/Net/Prerequisites/NetCoreServer/swagger.json b/src/libraries/Common/tests/System/Net/Prerequisites/NetCoreServer/swagger.json new file mode 100644 index 00000000000000..a8e1fe103db9a8 --- /dev/null +++ b/src/libraries/Common/tests/System/Net/Prerequisites/NetCoreServer/swagger.json @@ -0,0 +1,297 @@ +{ + "openapi": "3.0.3", + "info": { + "title": ".NET Networking Echo Test Servers", + "license": { + "name": "Apache 2.0", + "url": "http://www.apache.org/licenses/LICENSE-2.0.html" + }, + "version": "1.0.0" + }, + "servers": [ + { + "url": "https://corefx-net-http11.azurewebsites.net/" + }, + { + "url": "https://corefx-net-http2.azurewebsites.net/" + } + ], + "paths": { + "/deflate.ashx": { + "get": { + "summary": "Get DEFLATE compressed content", + "description": "Get DEFLATE compressed content", + "responses": { + "200": { + "description": "Successful operation", + "content": { + "text/plain": { + "example": "Sending DEFLATE compressed" + } + } + } + } + } + }, + "/echo.ashx": { + "get": { + "summary": "Get request data echoed back", + "description": "Get request data echoed back", + "responses": { + "200": { + "description": "Successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/RequestInformation" + } + } + } + } + } + } + }, + "/emptycontent.ashx": { + "get": { + "summary": "Get empty content back", + "description": "Get empty content back", + "responses": { + "200": { + "description": "Successful operation" + } + } + } + }, + "/gzip.ashx": { + "get": { + "summary": "Get gzip-compressed content", + "description": "Get gzip-compressed content", + "responses": { + "200": { + "description": "Successful operation", + "content": { + "text/plain": { + "example": "Sending GZIP compressed" + } + } + } + } + } + }, + "/redirect.ashx": { + "get": { + "summary": "Get a redirect response", + "description": "get a redirect response", + "parameters": [ + { + "in": "query", + "name": "uri", + "required": true, + "schema": { + "type": "string" + } + } + ], + "responses": { + "200": { + "description": "Successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/RequestInformation" + } + } + } + }, + "400": { + "description": "Failed operation" + } + } + } + }, + "/statuscode.ashx": { + "get": { + "summary": "Get a specific status code in response", + "description": "Get a specific status code in response", + "parameters": [ + { + "in": "query", + "name": "statuscode", + "required": true, + "schema": { + "type": "integer" + } + }, + { + "in": "query", + "name": "statusdescription", + "required": false, + "schema": { + "type": "string" + } + }, + { + "in": "query", + "name": "delay", + "required": false, + "schema": { + "type": "integer" + } + } + ], + "responses": { + "200": { + "description": "Successful operation" + }, + "400": { + "description": "Error parsing status code" + } + } + } + }, + "/version": { + "get": { + "summary": "Get version information", + "description": "Get version information", + "responses": { + "200": { + "description": "Successful operation", + "content": { + "text/plain": { + "example": "Information for: NetCoreServer.dll\nLocation: C:\\home\\site\\wwwroot\nFramework: .NET 6.0.32\nFile Version: 1.0.0.0\nProduct Version: 1.0.0\nCreation Date: 4/11/2019 9:05:08 PM\nLast Modified: 2/28/2022 2:06:00 PM\n" + } + } + } + } + } + }, + "/test.ashx": { + "get": { + "summary": "Test endpoint", + "description": "Test endpoint", + "responses": { + "200": { + "description": "Successful operation", + "content": { + "text/plain": { + "example": { + "Method": "GET", + "Url": "/test.ashx", + "Headers": { + "Accept": "text/plain", + "Accept-Encoding": "gzip, deflate, br, zstd", + "Accept-Language": "en-US,en;q=0.9,cs;q=0.8", + "Host": "corefx-net-http11.azurewebsites.net", + "Max-Forwards": "10", + "Referer": "https://editor-next.swagger.io/", + "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36 Edg/131.0.0.0", + "Origin": "https://editor-next.swagger.io", + "sec-ch-ua-platform": "\"Windows\"", + "sec-ch-ua": "\"Microsoft Edge\";v=\"131\", \"Chromium\";v=\"131\", \"Not_A Brand\";v=\"24\"", + "sec-ch-ua-mobile": "?0", + "Sec-Fetch-Site": "cross-site", + "Sec-Fetch-Mode": "cors", + "Sec-Fetch-Dest": "empty", + "X-ARR-LOG-ID": "46cb3aaa-9ad7-44b1-b284-a492ded947ed", + "CLIENT-IP": "167.220.196.35:19180", + "DISGUISED-HOST": "corefx-net-http11.azurewebsites.net", + "X-SITE-DEPLOYMENT-ID": "corefx-net-http11", + "WAS-DEFAULT-HOSTNAME": "corefx-net-http11.azurewebsites.net", + "X-Forwarded-Proto": "https", + "X-AppService-Proto": "https", + "X-ARR-SSL": "2048|256|CN=Microsoft Azure RSA TLS Issuing CA 08, O=Microsoft Corporation, C=US|CN=*.azurewebsites.net, O=Microsoft Corporation, L=Redmond, S=WA, C=US", + "X-Forwarded-TlsVersion": "1.3", + "X-Forwarded-For": "167.220.196.35:19180", + "X-Original-URL": "/test.ashx", + "X-WAWS-Unencoded-URL": "/test.ashx" + }, + "Cookies": {}, + "BodyContent": "", + "BodyLength": 0, + "SecureConnection": true, + "ClientCertificatePresent": false, + "ClientCertificate": null + } + } + }, + "headers": { + "Content-MD5": { + "schema": { + "type": "string" + }, + "description": "Base64-encoded MD5 hash of the response content" + } + } + } + } + } + }, + "/large.ashx": { + "get": { + "summary": "Get a large response", + "description": "Get a large response", + "parameters": [ + { + "in": "query", + "name": "size", + "required": false, + "schema": { + "type": "integer" + } + } + ], + "responses": { + "200": { + "description": "Successful operation", + "content": { + "application/octet-stream": { + "schema": { + "type": "array" + } + } + } + } + } + } + } + }, + "components": { + "schemas": { + "RequestInformation": { + "type": "object", + "properties": { + "Method": { + "type": "string", + "example": "GET" + }, + "Url": { + "type": "string", + "format": "uri", + "example": "/echo.ashx" + }, + "Headers": { + "type": "object" + }, + "Cookies": { + "type": "object" + }, + "BodyContent": { + "type": "string" + }, + "BodyLength": { + "type": "integer" + }, + "SecureConnection": { + "type": "boolean" + }, + "ClientCertificatePresent": { + "type": "boolean" + }, + "ClientCertificate": { + "type": "object" + } + } + } + } + } +} \ No newline at end of file From 337c575e37d0675861fad605701dc807b7476a28 Mon Sep 17 00:00:00 2001 From: Radek Zikmund Date: Thu, 9 Jan 2025 12:51:29 +0100 Subject: [PATCH 20/27] Move yml file to eng/pipelines/libraries --- .../pipelines/libraries/deploy-networking-echo-test-servers.yml | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename deploy-networking-echo-test-servers.yml => eng/pipelines/libraries/deploy-networking-echo-test-servers.yml (100%) diff --git a/deploy-networking-echo-test-servers.yml b/eng/pipelines/libraries/deploy-networking-echo-test-servers.yml similarity index 100% rename from deploy-networking-echo-test-servers.yml rename to eng/pipelines/libraries/deploy-networking-echo-test-servers.yml From 926d7130c891e6970b4059e295b3696c2fe902f5 Mon Sep 17 00:00:00 2001 From: Radek Zikmund Date: Thu, 9 Jan 2025 13:36:13 +0100 Subject: [PATCH 21/27] Fix pipeline --- .../libraries/deploy-networking-echo-test-servers.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/pipelines/libraries/deploy-networking-echo-test-servers.yml b/eng/pipelines/libraries/deploy-networking-echo-test-servers.yml index 8f6fb6a844f3d4..f2acfcad36460f 100644 --- a/eng/pipelines/libraries/deploy-networking-echo-test-servers.yml +++ b/eng/pipelines/libraries/deploy-networking-echo-test-servers.yml @@ -12,9 +12,9 @@ resources: variables: - template: /eng/common/templates-official/variables/pool-providers.yml - name: FrameworkVersion - value: 8.0 + value: 8.x - name: TargetFramework - value: net$(FrameworkVersion) + value: net8.0 extends: template: v1/1ES.Unofficial.PipelineTemplate.yml@1ESPipelineTemplates From 6c119e1a2249522d1095398ffdb06d750090d6d3 Mon Sep 17 00:00:00 2001 From: Radek Zikmund Date: Tue, 14 Jan 2025 10:33:56 +0100 Subject: [PATCH 22/27] Deploy to http2 as well --- .../deploy-networking-echo-test-servers.yml | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/eng/pipelines/libraries/deploy-networking-echo-test-servers.yml b/eng/pipelines/libraries/deploy-networking-echo-test-servers.yml index f2acfcad36460f..827567a6c2bdd9 100644 --- a/eng/pipelines/libraries/deploy-networking-echo-test-servers.yml +++ b/eng/pipelines/libraries/deploy-networking-echo-test-servers.yml @@ -55,7 +55,7 @@ extends: pathToZipFile: 'artifacts\bin\NetCoreServer\Release\$(TargetFramework)\publish.zip' - task: AzureRmWebAppDeployment@4 - displayName: Deploy to staging slot + displayName: Deploy to corefx-net-http11 inputs: ConnectionType: "AzureRM" azureSubscription: .NET Libraries Network Testing @@ -65,3 +65,15 @@ extends: ResourceGroupName: "Production-WestUS" SlotName: "staging" package: 'artifacts\bin\NetCoreServer\Release\$(TargetFramework)\publish.zip' + + - task: AzureRmWebAppDeployment@4 + displayName: Deploy to corefx-net-http2-staging + inputs: + ConnectionType: "AzureRM" + azureSubscription: .NET Libraries Network Testing + appType: "webApp" + WebAppName: "corefx-net-http2" + deployToSlotOrASE: true + ResourceGroupName: "Production-WestUS" + SlotName: "staging" + package: 'artifacts\bin\NetCoreServer\Release\$(TargetFramework)\publish.zip' From fb5de3c6beeb0e9e3f69e407174a5232813579eb Mon Sep 17 00:00:00 2001 From: Radek Zikmund <32671551+rzikm@users.noreply.github.com> Date: Tue, 14 Jan 2025 10:43:16 +0100 Subject: [PATCH 23/27] Update eng/pipelines/libraries/deploy-networking-echo-test-servers.yml --- eng/pipelines/libraries/deploy-networking-echo-test-servers.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/eng/pipelines/libraries/deploy-networking-echo-test-servers.yml b/eng/pipelines/libraries/deploy-networking-echo-test-servers.yml index 827567a6c2bdd9..c99b8f8d99e009 100644 --- a/eng/pipelines/libraries/deploy-networking-echo-test-servers.yml +++ b/eng/pipelines/libraries/deploy-networking-echo-test-servers.yml @@ -1,5 +1,3 @@ -# This pipeline is a basic starter for using 1ESPipelineTemplates to build in a VM. -# Refer to our onboarding documentation at https://aka.ms/1espt for more details and support channels. trigger: none resources: From f7221ea9907021cb93c73e214e78ba2093cb1db6 Mon Sep 17 00:00:00 2001 From: Radek Zikmund <32671551+rzikm@users.noreply.github.com> Date: Tue, 14 Jan 2025 19:32:12 +0100 Subject: [PATCH 24/27] Remove duplicate server URL from swagger file --- .../tests/System/Net/Prerequisites/NetCoreServer/swagger.json | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/libraries/Common/tests/System/Net/Prerequisites/NetCoreServer/swagger.json b/src/libraries/Common/tests/System/Net/Prerequisites/NetCoreServer/swagger.json index a8e1fe103db9a8..8472a602b9bdc8 100644 --- a/src/libraries/Common/tests/System/Net/Prerequisites/NetCoreServer/swagger.json +++ b/src/libraries/Common/tests/System/Net/Prerequisites/NetCoreServer/swagger.json @@ -11,9 +11,6 @@ "servers": [ { "url": "https://corefx-net-http11.azurewebsites.net/" - }, - { - "url": "https://corefx-net-http2.azurewebsites.net/" } ], "paths": { From ebc38d0ffdf49f299d1a351b5d1bbb8e590b14c0 Mon Sep 17 00:00:00 2001 From: Radek Zikmund <32671551+rzikm@users.noreply.github.com> Date: Wed, 15 Jan 2025 09:59:26 +0100 Subject: [PATCH 25/27] Update eng/pipelines/libraries/deploy-networking-echo-test-servers.yml Co-authored-by: Anton Firszov --- eng/pipelines/libraries/deploy-networking-echo-test-servers.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/pipelines/libraries/deploy-networking-echo-test-servers.yml b/eng/pipelines/libraries/deploy-networking-echo-test-servers.yml index c99b8f8d99e009..0aa4dd5c580ddc 100644 --- a/eng/pipelines/libraries/deploy-networking-echo-test-servers.yml +++ b/eng/pipelines/libraries/deploy-networking-echo-test-servers.yml @@ -53,7 +53,7 @@ extends: pathToZipFile: 'artifacts\bin\NetCoreServer\Release\$(TargetFramework)\publish.zip' - task: AzureRmWebAppDeployment@4 - displayName: Deploy to corefx-net-http11 + displayName: Deploy to corefx-net-http11-staging inputs: ConnectionType: "AzureRM" azureSubscription: .NET Libraries Network Testing From 6d856fc6f6b12d3427692cd15cb10777ae122691 Mon Sep 17 00:00:00 2001 From: Radek Zikmund Date: Mon, 20 Jan 2025 10:38:48 +0100 Subject: [PATCH 26/27] Add deploy instructions --- .../deploy-networking-echo-test-servers.yml | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/eng/pipelines/libraries/deploy-networking-echo-test-servers.yml b/eng/pipelines/libraries/deploy-networking-echo-test-servers.yml index 0aa4dd5c580ddc..f5f663f025d1be 100644 --- a/eng/pipelines/libraries/deploy-networking-echo-test-servers.yml +++ b/eng/pipelines/libraries/deploy-networking-echo-test-servers.yml @@ -1,3 +1,24 @@ +# This pipeline deploys the test servers we are using to run (outerloop) Functional tests for various functionality in System.Net namespace. +# The pipeline deploys to staging slots, which are available at +# - corefx-net-http11-staging.azurewebsites.net +# - corefx-net-http2-staging.azurewebsites.net +# +# Usage instructions: +# 1) Start pipeline at https://dev.azure.com/dnceng/internal/_build?definitionId=1419, pick the correct branch and start the build. +# 2) After pipeline succeeds, check your changes against the staging slots, two possible ways to do this are: +# - create a no-merge PR where you overwrite the default urls (e.g. https://github.com/dotnet/runtime/pull/111396) +# - test locally, either by same changes as in above PR, or by using the override environment variables +# +# DOTNET_TEST_HTTPHOST=http://corefx-net-http11-staging.azurewebsites.net +# DOTNET_TEST_SECUREHTTPHOST=https://corefx-net-http11-staging.azurewebsites.net +# DOTNET_TEST_WEBSOKETHOST=http://corefx-net-http11-staging.azurewebsites.net +# DOTNET_TEST_SECUREWEBSOKETHOST=http://corefx-net-http11-staging.azurewebsites.net +# +# DOTNET_TEST_HTTP2HOST=http://corefx-net-http2-staging.azurewebsites.net +# 3) If there are no issues, you can swap the staging slots with production slots via the Azure portal. +# Only the members of the .NET Networking team have access to the Azure Subscription which hosts the +# servers. Look for the "Deployment slots" section at corefx-net-http11 and corefx-net-http2 Web Apps + trigger: none resources: From 5e71c95097f32fef1ad1c4e448418db6a2668d42 Mon Sep 17 00:00:00 2001 From: Radek Zikmund <32671551+rzikm@users.noreply.github.com> Date: Mon, 20 Jan 2025 16:34:18 +0100 Subject: [PATCH 27/27] Update eng/pipelines/libraries/deploy-networking-echo-test-servers.yml MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Marie Píchová <11718369+ManickaP@users.noreply.github.com> --- .../libraries/deploy-networking-echo-test-servers.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/eng/pipelines/libraries/deploy-networking-echo-test-servers.yml b/eng/pipelines/libraries/deploy-networking-echo-test-servers.yml index f5f663f025d1be..c1bd5f5ffb4daa 100644 --- a/eng/pipelines/libraries/deploy-networking-echo-test-servers.yml +++ b/eng/pipelines/libraries/deploy-networking-echo-test-servers.yml @@ -4,7 +4,8 @@ # - corefx-net-http2-staging.azurewebsites.net # # Usage instructions: -# 1) Start pipeline at https://dev.azure.com/dnceng/internal/_build?definitionId=1419, pick the correct branch and start the build. +# 1) Start pipeline at https://dev.azure.com/dnceng/internal/_build?definitionId=1419 ( +deploy-networking-echo-test-servers), pick the correct branch and start the build. # 2) After pipeline succeeds, check your changes against the staging slots, two possible ways to do this are: # - create a no-merge PR where you overwrite the default urls (e.g. https://github.com/dotnet/runtime/pull/111396) # - test locally, either by same changes as in above PR, or by using the override environment variables