From 6cfe098dd49e3f5a15dd031854079a8c462efbc5 Mon Sep 17 00:00:00 2001 From: yophilav Date: Fri, 23 Aug 2024 12:04:06 -0700 Subject: [PATCH 1/6] nuget.config --- nuget.config | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 nuget.config diff --git a/nuget.config b/nuget.config new file mode 100644 index 00000000000..37e97e87e55 --- /dev/null +++ b/nuget.config @@ -0,0 +1,7 @@ + + + + + + + From 0fad994ec6890a7b9086d7b90f771cab1dc51769 Mon Sep 17 00:00:00 2001 From: yophilav Date: Fri, 23 Aug 2024 14:51:21 -0700 Subject: [PATCH 2/6] NuGetAuthenticate --- builds/checkin/dotnet.yaml | 1 + builds/checkin/e2e-checkin.yaml | 1 + builds/ci/dotnet.yaml | 1 + builds/misc/addons-release.yaml | 1 + builds/misc/ci-build.yaml | 1 + builds/misc/templates/build-images.yaml | 24 ++++++++++++++++++++++++ 6 files changed, 29 insertions(+) diff --git a/builds/checkin/dotnet.yaml b/builds/checkin/dotnet.yaml index 928560cb89a..686ad789b7d 100644 --- a/builds/checkin/dotnet.yaml +++ b/builds/checkin/dotnet.yaml @@ -37,6 +37,7 @@ jobs: steps: - script: scripts/linux/installPrereqs.sh displayName: Install Prerequisites + - task: NuGetAuthenticate@1 - script: | dotnet test \ --configuration $(configuration) \ diff --git a/builds/checkin/e2e-checkin.yaml b/builds/checkin/e2e-checkin.yaml index b232457e4e5..0e61f741a0d 100644 --- a/builds/checkin/e2e-checkin.yaml +++ b/builds/checkin/e2e-checkin.yaml @@ -24,6 +24,7 @@ resources: branch: 'main' stages: + - task: NuGetAuthenticate@1 - template: ../misc/templates/build-images.yaml parameters: diff --git a/builds/ci/dotnet.yaml b/builds/ci/dotnet.yaml index 12d9cdb37c1..f92e4810859 100644 --- a/builds/ci/dotnet.yaml +++ b/builds/ci/dotnet.yaml @@ -47,6 +47,7 @@ jobs: displayName: Install protocol head certificate # Needed for integration tests env: CERT_VALUE: $(IotHubMqttHeadCert) + - task: NuGetAuthenticate@1 - script: scripts/linux/buildBranch.sh -c $(Build.Configuration) --no-rocksdb-bin --skip-quickstart displayName: Build - script: sudo -E bash -c './scripts/linux/runTests.sh "$(test.filter)" "$(Build.Configuration)"' diff --git a/builds/misc/addons-release.yaml b/builds/misc/addons-release.yaml index e8534a4bdfb..5d1d76c1f34 100644 --- a/builds/misc/addons-release.yaml +++ b/builds/misc/addons-release.yaml @@ -88,6 +88,7 @@ stages: jobs: - job: BuildImageApiProxy steps: + - task: NuGetAuthenticate@1 - bash: | if [ -z '$(version)' ]; then echo '##vso[task.setvariable variable=buildVersion]$(Build.BuildNumber)' diff --git a/builds/misc/ci-build.yaml b/builds/misc/ci-build.yaml index 331f8650046..a7d64e85750 100644 --- a/builds/misc/ci-build.yaml +++ b/builds/misc/ci-build.yaml @@ -21,5 +21,6 @@ variables: DisableDockerDetector: true stages: + - task: NuGetAuthenticate@1 - template: templates/build-images.yaml - template: templates/build-packages.yaml diff --git a/builds/misc/templates/build-images.yaml b/builds/misc/templates/build-images.yaml index 6e38c1b3675..8b719927af9 100644 --- a/builds/misc/templates/build-images.yaml +++ b/builds/misc/templates/build-images.yaml @@ -57,6 +57,7 @@ stages: variables: Codeql.Enabled: true steps: + - task: NuGetAuthenticate@1 - script: scripts/linux/buildBranch.sh -c $(Build.Configuration) --no-rocksdb-bin name: build displayName: Build ($(Build.Configuration)) dotnet artifacts @@ -159,6 +160,7 @@ stages: # Product images - job: BuildImageEdgeAgent steps: + - task: NuGetAuthenticate@1 - template: image-linux.yaml parameters: displayName: Edge Agent @@ -169,6 +171,7 @@ stages: - job: BuildImageEdgeHub steps: + - task: NuGetAuthenticate@1 - template: image-linux.yaml parameters: displayName: Edge Hub @@ -179,6 +182,7 @@ stages: - job: BuildImageTemperatureSensor steps: + - task: NuGetAuthenticate@1 - template: image-linux.yaml parameters: displayName: Temperature Sensor @@ -188,6 +192,7 @@ stages: - job: BuildImageDiagnostics steps: + - task: NuGetAuthenticate@1 - template: image-linux.yaml parameters: displayName: Diagnostics @@ -197,6 +202,7 @@ stages: - job: BuildImageMetricsCollector steps: + - task: NuGetAuthenticate@1 - template: image-linux.yaml parameters: displayName: Metrics Collector @@ -206,6 +212,7 @@ stages: - job: BuildImageApiProxy steps: + - task: NuGetAuthenticate@1 - template: image-linux.yaml parameters: displayName: API Proxy @@ -220,6 +227,7 @@ stages: # Test images - job: BuildImageTemperatureFilter steps: + - task: NuGetAuthenticate@1 - template: image-linux.yaml parameters: displayName: Temperature Filter @@ -229,6 +237,7 @@ stages: - job: BuildImageLoadGen steps: + - task: NuGetAuthenticate@1 - template: image-linux.yaml parameters: displayName: Load Gen @@ -238,6 +247,7 @@ stages: - job: BuildImageTestAnalyzer steps: + - task: NuGetAuthenticate@1 - template: image-linux.yaml parameters: displayName: Test Analyzer @@ -249,6 +259,7 @@ stages: # Functions Sample - Only supported on amd64 - job: BuildImageFunctionsSample steps: + - task: NuGetAuthenticate@1 - template: image-linux.yaml parameters: displayName: Functions Sample @@ -259,6 +270,7 @@ stages: - job: BuildImageDirectMethodSender steps: + - task: NuGetAuthenticate@1 - template: image-linux.yaml parameters: displayName: Direct Method Sender @@ -268,6 +280,7 @@ stages: - job: BuildImageDirectMethodReceiver steps: + - task: NuGetAuthenticate@1 - template: image-linux.yaml parameters: displayName: Direct Method Receiver @@ -277,6 +290,7 @@ stages: - job: BuildImageMetricsValidator steps: + - task: NuGetAuthenticate@1 - template: image-linux.yaml parameters: displayName: Metrics Validator @@ -286,6 +300,7 @@ stages: - job: BuildImageNumberLogger steps: + - task: NuGetAuthenticate@1 - template: image-linux.yaml parameters: displayName: Number Logger @@ -295,6 +310,7 @@ stages: - job: BuildImageModuleRestarter steps: + - task: NuGetAuthenticate@1 - template: image-linux.yaml parameters: displayName: Module Restarter @@ -304,6 +320,7 @@ stages: - job: BuildImageTwinTester steps: + - task: NuGetAuthenticate@1 - template: image-linux.yaml parameters: displayName: TwinTester @@ -314,6 +331,7 @@ stages: - job: BuildImageRelayer steps: + - task: NuGetAuthenticate@1 - template: image-linux.yaml parameters: displayName: Relayer @@ -323,6 +341,7 @@ stages: - job: BuildImageNetworkController steps: + - task: NuGetAuthenticate@1 - template: image-linux.yaml parameters: displayName: Network Controller @@ -333,6 +352,7 @@ stages: - job: BuildImageTestResultCoordinator steps: + - task: NuGetAuthenticate@1 - template: image-linux.yaml parameters: displayName: TestResultCoordinator @@ -343,6 +363,7 @@ stages: - job: BuildImageTestMetricsCollector steps: + - task: NuGetAuthenticate@1 - template: image-linux.yaml parameters: displayName: Test Metrics Collector @@ -352,6 +373,7 @@ stages: - job: BuildImageDeploymentTester steps: + - task: NuGetAuthenticate@1 - template: image-linux.yaml parameters: displayName: DeploymentTester @@ -361,6 +383,7 @@ stages: - job: BuildImageEdgeHubRestartTester steps: + - task: NuGetAuthenticate@1 - template: image-linux.yaml parameters: displayName: EdgeHubRestartTester @@ -370,6 +393,7 @@ stages: - job: BuildImageCloudToDeviceMessageTester steps: + - task: NuGetAuthenticate@1 - template: image-linux.yaml parameters: displayName: Cloud To Device Message Tester From 1dbc5a886db2db6660a893b9b9c296e03a29147a Mon Sep 17 00:00:00 2001 From: yophilav Date: Thu, 5 Sep 2024 16:37:09 -0700 Subject: [PATCH 3/6] iotedge_PublicPackages --- nuget.config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nuget.config b/nuget.config index 37e97e87e55..7e550a1e916 100644 --- a/nuget.config +++ b/nuget.config @@ -2,6 +2,6 @@ - + From d74ec6832a375725da0568b5bca8696567ddefce Mon Sep 17 00:00:00 2001 From: yophilav Date: Thu, 5 Sep 2024 16:44:44 -0700 Subject: [PATCH 4/6] Correction --- builds/checkin/e2e-checkin.yaml | 2 -- builds/misc/ci-build.yaml | 1 - 2 files changed, 3 deletions(-) diff --git a/builds/checkin/e2e-checkin.yaml b/builds/checkin/e2e-checkin.yaml index 0e61f741a0d..6f8dd9dc719 100644 --- a/builds/checkin/e2e-checkin.yaml +++ b/builds/checkin/e2e-checkin.yaml @@ -24,8 +24,6 @@ resources: branch: 'main' stages: - - task: NuGetAuthenticate@1 - - template: ../misc/templates/build-images.yaml parameters: E2EBuild : true diff --git a/builds/misc/ci-build.yaml b/builds/misc/ci-build.yaml index a7d64e85750..331f8650046 100644 --- a/builds/misc/ci-build.yaml +++ b/builds/misc/ci-build.yaml @@ -21,6 +21,5 @@ variables: DisableDockerDetector: true stages: - - task: NuGetAuthenticate@1 - template: templates/build-images.yaml - template: templates/build-packages.yaml From 8b8bbcac75abe142e774f5280aa4e2e22c7503bd Mon Sep 17 00:00:00 2001 From: yophilav Date: Thu, 5 Sep 2024 16:57:57 -0700 Subject: [PATCH 5/6] Auth code coverage task --- builds/checkin/dotnet.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/builds/checkin/dotnet.yaml b/builds/checkin/dotnet.yaml index 686ad789b7d..813f954b108 100644 --- a/builds/checkin/dotnet.yaml +++ b/builds/checkin/dotnet.yaml @@ -66,6 +66,7 @@ jobs: steps: - script: scripts/linux/installPrereqs.sh displayName: Install Prerequisites + - task: NuGetAuthenticate@1 - script: | dotnet test \ --logger trx \ From 469a35e7e495a1e64e5e856c041bec7a59c80f66 Mon Sep 17 00:00:00 2001 From: yophilav Date: Fri, 6 Sep 2024 10:34:34 -0700 Subject: [PATCH 6/6] RestorePackagesWithLockFile --- netcoreappVersion.props | 1 + 1 file changed, 1 insertion(+) diff --git a/netcoreappVersion.props b/netcoreappVersion.props index fa67997ec8e..26704a354f0 100644 --- a/netcoreappVersion.props +++ b/netcoreappVersion.props @@ -1,5 +1,6 @@ net8.0 + true \ No newline at end of file