Skip to content

Commit 053290d

Browse files
cobyaCoby Allredembetten
authored
Test release 2.0.0-beta in CI (#613)
- Testing install scripts against 2.0.0-beta pre-release assets - Merge: install script yml validation changes needed for upcoming 2.0.0 release (reverting version back to latest) --------- Co-authored-by: Coby Allred <coallred@microsoft.com> Co-authored-by: Emily Bettencourt <embetten@microsoft.com>
1 parent 2e4e512 commit 053290d

File tree

2 files changed

+21
-21
lines changed

2 files changed

+21
-21
lines changed

build/validate-install-release-script.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ jobs:
77
parameters:
88
repo: self
99
scriptInputs: ''
10-
expectedCredentialProviderVersion: 'Microsoft.Net6.NuGet.CredentialProvider' # Temporary, will be updated to Net8 once the 2.x release is available
10+
expectedCredentialProviderVersion: 'Microsoft.win-x64.NuGet.CredentialProvider'
1111
releaseVersion: 'latest'
1212

1313
- job: WindowsReleaseInstallNet8
@@ -18,7 +18,7 @@ jobs:
1818
parameters:
1919
repo: self
2020
scriptInputs: '-InstallNet8'
21-
expectedCredentialProviderVersion: 'Microsoft.Net8.NuGet.CredentialProvider'
21+
expectedCredentialProviderVersion: 'Microsoft.win-x64.NuGet.CredentialProvider'
2222
releaseVersion: 'latest'
2323

2424
- job: WindowsReleaseInstallNet8winx64
@@ -51,7 +51,7 @@ jobs:
5151
parameters:
5252
repo: self
5353
scriptInputs: '-AddNetfx'
54-
expectedCredentialProviderVersion: 'Microsoft.NuGet.CredentialProvider'
54+
expectedCredentialProviderVersion: 'Microsoft.NetFx48.NuGet.CredentialProvider'
5555
releaseVersion: 'latest'
5656

5757
- job: LinuxReleaseInstallDefault
@@ -62,7 +62,7 @@ jobs:
6262
parameters:
6363
repo: self
6464
scriptEnvVariables: ''
65-
expectedCredentialProviderVersion: 'Microsoft.Net6.NuGet.CredentialProvider'
65+
expectedCredentialProviderVersion: 'Microsoft.linux-x64.NuGet.CredentialProvider'
6666
releaseVersion: 'latest'
6767

6868
- job: LinuxReleaseInstallNet8
@@ -75,7 +75,7 @@ jobs:
7575
scriptEnvVariables: |
7676
export USE_NET6_ARTIFACTS_CREDENTIAL_PROVIDER=false
7777
export USE_NET8_ARTIFACTS_CREDENTIAL_PROVIDER=true
78-
expectedCredentialProviderVersion: 'Microsoft.Net8.NuGet.CredentialProvider'
78+
expectedCredentialProviderVersion: 'Microsoft.linux-x64.NuGet.CredentialProvider'
7979
releaseVersion: 'latest'
8080

8181
- job: LinuxReleaseInstallNet8Net6Param
@@ -88,7 +88,7 @@ jobs:
8888
scriptEnvVariables: |
8989
export USE_NET6_ARTIFACTS_CREDENTIAL_PROVIDER=true
9090
export USE_NET8_ARTIFACTS_CREDENTIAL_PROVIDER=true
91-
expectedCredentialProviderVersion: 'Microsoft.Net8.NuGet.CredentialProvider'
91+
expectedCredentialProviderVersion: 'Microsoft.linux-x64.NuGet.CredentialProvider'
9292
releaseVersion: 'latest'
9393

9494
- job: LinuxReleaseInstallNetFx
@@ -101,7 +101,7 @@ jobs:
101101
scriptEnvVariables: |
102102
export USE_NET6_ARTIFACTS_CREDENTIAL_PROVIDER=false
103103
export USE_NET8_ARTIFACTS_CREDENTIAL_PROVIDER=false
104-
expectedCredentialProviderVersion: 'Microsoft.NuGet.CredentialProvider'
104+
expectedCredentialProviderVersion: 'Microsoft.NetFx48.NuGet.CredentialProvider'
105105
releaseVersion: 'latest'
106106

107107
- job: LinuxReleaseInstallNet8linuxx64

build/validate-install-script.yml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ jobs:
6060
- template: validate-install-script-powershell.yml@self
6161
parameters:
6262
repo: self
63-
scriptInputs: '-InstallNet6 -RuntimeIdentifier win-x64'
63+
scriptInputs: ' -InstallNet6 -RuntimeIdentifier win-x64'
6464
expectedCredentialProviderVersion: 'Microsoft.win-x64.NuGet.CredentialProvider'
6565
- job: WindowsInstallNetfxDefault
6666
pool:
@@ -69,7 +69,7 @@ jobs:
6969
- template: validate-install-script-powershell.yml@self
7070
parameters:
7171
repo: self
72-
scriptInputs: '-AddNetfx'
72+
scriptInputs: ' -AddNetfx'
7373
expectedCredentialProviderVersion: 'Microsoft.NetFx48.NuGet.CredentialProvider'
7474
- job: WindowsInstallNetfx48
7575
pool:
@@ -78,7 +78,7 @@ jobs:
7878
- template: validate-install-script-powershell.yml@self
7979
parameters:
8080
repo: self
81-
scriptInputs: '-AddNetfx48'
81+
scriptInputs: ' -AddNetfx48'
8282
expectedCredentialProviderVersion: 'Microsoft.NetFx48.NuGet.CredentialProvider'
8383
- job: LinuxInstallDefault
8484
pool:
@@ -98,7 +98,7 @@ jobs:
9898
repo: self
9999
scriptEnvVariables: |
100100
export USE_NET6_ARTIFACTS_CREDENTIAL_PROVIDER=false
101-
export USE_NET8_ARTIFACTS_CREDENTIAL_PROVIDER=true
101+
export USE_NET8_ARTIFACTS_CREDENTIAL_PROVIDER=true
102102
expectedCredentialProviderVersion: 'Microsoft.linux-x64.NuGet.CredentialProvider'
103103
- job: LinuxInstallNet8NonSC
104104
pool:
@@ -108,7 +108,7 @@ jobs:
108108
parameters:
109109
repo: self
110110
scriptEnvVariables: |
111-
export ARTIFACTS_CREDENTIAL_PROVIDER_NON_SC=true
111+
export ARTIFACTS_CREDENTIAL_PROVIDER_NON_SC=true
112112
expectedCredentialProviderVersion: 'Microsoft.Net8.NuGet.CredentialProvider'
113113
- job: LinuxInstallNet6
114114
pool:
@@ -119,7 +119,7 @@ jobs:
119119
repo: self
120120
scriptEnvVariables: |
121121
export USE_NET6_ARTIFACTS_CREDENTIAL_PROVIDER=true
122-
export USE_NET8_ARTIFACTS_CREDENTIAL_PROVIDER=false
122+
export USE_NET8_ARTIFACTS_CREDENTIAL_PROVIDER=false
123123
expectedCredentialProviderVersion: 'Microsoft.Net6.NuGet.CredentialProvider'
124124
- job: LinuxInstallNet8Net6Param
125125
pool:
@@ -130,7 +130,7 @@ jobs:
130130
repo: self
131131
scriptEnvVariables: |
132132
export USE_NET6_ARTIFACTS_CREDENTIAL_PROVIDER=true
133-
export USE_NET8_ARTIFACTS_CREDENTIAL_PROVIDER=true
133+
export USE_NET8_ARTIFACTS_CREDENTIAL_PROVIDER=true
134134
expectedCredentialProviderVersion: 'Microsoft.linux-x64.NuGet.CredentialProvider'
135135
- job: LinuxInstallNetFx
136136
pool:
@@ -141,7 +141,7 @@ jobs:
141141
repo: self
142142
scriptEnvVariables: |
143143
export USE_NET6_ARTIFACTS_CREDENTIAL_PROVIDER=false
144-
export USE_NET8_ARTIFACTS_CREDENTIAL_PROVIDER=false
144+
export USE_NET8_ARTIFACTS_CREDENTIAL_PROVIDER=false
145145
expectedCredentialProviderVersion: 'Microsoft.NetFx48.NuGet.CredentialProvider'
146146
- job: LinuxInstallNet8linuxx64
147147
pool:
@@ -153,7 +153,7 @@ jobs:
153153
scriptEnvVariables: |
154154
export USE_NET6_ARTIFACTS_CREDENTIAL_PROVIDER=false
155155
export USE_NET8_ARTIFACTS_CREDENTIAL_PROVIDER=true
156-
export ARTIFACTS_CREDENTIAL_PROVIDER_RID=linux-x64
156+
export ARTIFACTS_CREDENTIAL_PROVIDER_RID=linux-x64
157157
expectedCredentialProviderVersion: 'Microsoft.linux-x64.NuGet.CredentialProvider'
158158
- job: LinuxInstallNet8Auto
159159
pool:
@@ -162,7 +162,7 @@ jobs:
162162
- template: validate-install-script-bash.yml@self
163163
parameters:
164164
repo: self
165-
scriptEnvVariables: ''
165+
scriptEnvVariables: |
166166
expectedCredentialProviderVersion: 'Microsoft.linux-x64.NuGet.CredentialProvider'
167167
- job: LinuxInstallNet8linuxarm64
168168
pool:
@@ -174,7 +174,7 @@ jobs:
174174
scriptEnvVariables: |
175175
export USE_NET6_ARTIFACTS_CREDENTIAL_PROVIDER=false
176176
export USE_NET8_ARTIFACTS_CREDENTIAL_PROVIDER=true
177-
export ARTIFACTS_CREDENTIAL_PROVIDER_RID=linux-arm64
177+
export ARTIFACTS_CREDENTIAL_PROVIDER_RID=linux-arm64
178178
expectedCredentialProviderVersion: 'Microsoft.linux-arm64.NuGet.CredentialProvider'
179179
- job: macOSInstallNet8osxarm64
180180
pool:
@@ -186,7 +186,7 @@ jobs:
186186
scriptEnvVariables: |
187187
export USE_NET6_ARTIFACTS_CREDENTIAL_PROVIDER=false
188188
export USE_NET8_ARTIFACTS_CREDENTIAL_PROVIDER=true
189-
export ARTIFACTS_CREDENTIAL_PROVIDER_RID=osx-arm64
189+
export ARTIFACTS_CREDENTIAL_PROVIDER_RID=osx-arm64
190190
expectedCredentialProviderVersion: 'Microsoft.osx-arm64.NuGet.CredentialProvider'
191191
- job: macOSnstallNet8osxx64
192192
pool:
@@ -198,7 +198,7 @@ jobs:
198198
scriptEnvVariables: |
199199
export USE_NET6_ARTIFACTS_CREDENTIAL_PROVIDER=false
200200
export USE_NET8_ARTIFACTS_CREDENTIAL_PROVIDER=true
201-
export ARTIFACTS_CREDENTIAL_PROVIDER_RID=osx-x64
201+
export ARTIFACTS_CREDENTIAL_PROVIDER_RID=osx-x64
202202
expectedCredentialProviderVersion: 'Microsoft.osx-x64.NuGet.CredentialProvider'
203203
- job: macOSInstallNet8Auto
204204
pool:
@@ -207,7 +207,7 @@ jobs:
207207
- template: validate-install-script-bash.yml@self
208208
parameters:
209209
repo: self
210-
scriptEnvVariables: ''
210+
scriptEnvVariables: ''
211211
expectedCredentialProviderVersion: 'Microsoft.osx-x64.NuGet.CredentialProvider'
212212
- job: macOSInstallNet8osxx64NoParams
213213
pool:

0 commit comments

Comments
 (0)