Skip to content

Commit 2d1e2e7

Browse files
mmitchemmitche
authored
Remove support for Signed and Validated qualities (#593)
1 parent a0b8385 commit 2d1e2e7

File tree

5 files changed

+9
-44
lines changed

5 files changed

+9
-44
lines changed

‎src/dotnet-install.ps1‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
Warning: Value "Current" is deprecated for the Channel parameter. Use "STS" instead.
2929
Note: The version parameter overrides the channel parameter when any version other than 'latest' is used.
3030
.PARAMETER Quality
31-
Download the latest build of specified quality in the channel. The possible values are: daily, signed, validated, preview, GA.
31+
Download the latest build of specified quality in the channel. The possible values are: daily, preview, GA.
3232
Works only in combination with channel. Not applicable for STS and LTS channels and will be ignored if those channels are used.
3333
For SDK use channel in A.B.Cxx format: using quality together with channel in A.B format is not supported.
3434
Supported since 5.0 release.
@@ -300,10 +300,10 @@ function Get-NormalizedQuality([string]$Quality) {
300300
}
301301

302302
switch ($Quality) {
303-
{ @("daily", "signed", "validated", "preview") -contains $_ } { return $Quality.ToLowerInvariant() }
303+
{ @("daily", "preview") -contains $_ } { return $Quality.ToLowerInvariant() }
304304
#ga quality is available without specifying quality, so normalizing it to empty
305305
{ $_ -eq "ga" } { return "" }
306-
default { throw "'$Quality' is not a supported value for -Quality option. Supported values are: daily, signed, validated, preview, ga. If you think this is a bug, report it at https://github.com/dotnet/install-scripts/issues." }
306+
default { throw "'$Quality' is not a supported value for -Quality option. Supported values are: daily, preview, ga. If you think this is a bug, report it at https://github.com/dotnet/install-scripts/issues." }
307307
}
308308
}
309309

‎src/dotnet-install.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -477,7 +477,7 @@ get_normalized_quality() {
477477
local quality="$(to_lowercase "$1")"
478478
if [ ! -z "$quality" ]; then
479479
case "$quality" in
480-
daily | signed | validated | preview)
480+
daily | preview)
481481
echo "$quality"
482482
return 0
483483
;;
@@ -486,7 +486,7 @@ get_normalized_quality() {
486486
return 0
487487
;;
488488
*)
489-
say_err "'$quality' is not a supported value for --quality option. Supported values are: daily, signed, validated, preview, ga. If you think this is a bug, report it at https://github.com/dotnet/install-scripts/issues."
489+
say_err "'$quality' is not a supported value for --quality option. Supported values are: daily, preview, ga. If you think this is a bug, report it at https://github.com/dotnet/install-scripts/issues."
490490
return 1
491491
;;
492492
esac
@@ -1788,7 +1788,7 @@ do
17881788
echo " examples: 2.0.0-preview2-006120; 1.1.0"
17891789
echo " -q,--quality <quality> Download the latest build of specified quality in the channel."
17901790
echo " -Quality"
1791-
echo " The possible values are: daily, signed, validated, preview, GA."
1791+
echo " The possible values are: daily, preview, GA."
17921792
echo " Works only in combination with channel. Not applicable for STS and LTS channels and will be ignored if those channels are used."
17931793
echo " For SDK use channel in A.B.Cxx format. Using quality for SDK together with channel in A.B format is not supported."
17941794
echo " Supported since 5.0 release."

‎tests/Install-Scripts.Test/AkaMsLinksTests.cs‎

Lines changed: 2 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,10 @@ public class AkaMsLinksTests
2727
//[InlineData("5.0.2xx", null, @"https://aka.ms/dotnet/5.0.2xx/dotnet-sdk-")]
2828
//[InlineData("STS", null, @"https://aka.ms/dotnet/STS/dotnet-sdk-")]
2929
//[InlineData("LTS", null, @"https://aka.ms/dotnet/LTS/dotnet-sdk-")]
30-
//[InlineData("5.0.2xx", "signed", @"https://aka.ms/dotnet/5.0.2xx/signed/dotnet-sdk-")]
3130
//[InlineData("5.0.2xx", "daily", @"https://aka.ms/dotnet/5.0.2xx/daily/dotnet-sdk-")]
32-
//[InlineData("5.0.2xx", "validated", @"https://aka.ms/dotnet/5.0.2xx/validated/dotnet-sdk-")]
3331
//[InlineData("5.0.2xx", "preview", @"https://aka.ms/dotnet/5.0.2xx/preview/dotnet-sdk-")]
3432
//[InlineData("5.0.2xx", "ga", @"https://aka.ms/dotnet/5.0.2xx/dotnet-sdk-")]
3533

36-
// 6.0 doesn't have a signed. validated, preview or ga build yet.
37-
// [InlineData("6.0", "signed", @"https://aka.ms/dotnet/6.0/signed/dotnet-sdk-")]
38-
//[InlineData("6.0", "validated", @"https://aka.ms/dotnet/6.0/validated/dotnet-sdk-")]
3934
//[InlineData("6.0", "preview", @"https://aka.ms/dotnet/6.0/preview/dotnet-sdk-")]
4035
//[InlineData("6.0", "ga", @"https://aka.ms/dotnet/6.0/dotnet-sdk-")]
4136

@@ -91,9 +86,7 @@ public void SDK_IntegrationTest(string channel, string quality, string expectedL
9186
//[InlineData("5.0", "dotnet", null, @"https://aka.ms/dotnet/5.0/dotnet-runtime-")]
9287
//[InlineData("STS", "dotnet", null, @"https://aka.ms/dotnet/STS/dotnet-runtime-")]
9388
//[InlineData("LTS", "dotnet", null, @"https://aka.ms/dotnet/LTS/dotnet-runtime-")]
94-
//[InlineData("5.0", "dotnet", "signed", @"https://aka.ms/dotnet/5.0/signed/dotnet-runtime-")]
9589
//[InlineData("5.0", "dotnet", "daily", @"https://aka.ms/dotnet/5.0/daily/dotnet-runtime-")]
96-
//[InlineData("5.0", "dotnet", "validated", @"https://aka.ms/dotnet/5.0/validated/dotnet-runtime-")]
9790
//[InlineData("5.0", "dotnet", "preview", @"https://aka.ms/dotnet/5.0/preview/dotnet-runtime-")]
9891
//[InlineData("5.0", "dotnet", "ga", @"https://aka.ms/dotnet/5.0/dotnet-runtime-")]
9992
//[InlineData("2.0", "aspnetcore", null, @"https://aka.ms/dotnet/2.0/aspnetcore-runtime-")]
@@ -103,25 +96,18 @@ public void SDK_IntegrationTest(string channel, string quality, string expectedL
10396
//[InlineData("5.0", "aspnetcore", null, @"https://aka.ms/dotnet/5.0/aspnetcore-runtime-")]
10497
//[InlineData("STS", "aspnetcore", null, @"https://aka.ms/dotnet/STS/aspnetcore-runtime-")]
10598
//[InlineData("LTS", "aspnetcore", null, @"https://aka.ms/dotnet/LTS/aspnetcore-runtime-")]
106-
//[InlineData("5.0", "aspnetcore", "signed", @"https://aka.ms/dotnet/5.0/signed/aspnetcore-runtime-")]
10799
//[InlineData("5.0", "aspnetcore", "daily", @"https://aka.ms/dotnet/5.0/daily/aspnetcore-runtime-")]
108-
//[InlineData("5.0", "aspnetcore", "validated", @"https://aka.ms/dotnet/5.0/validated/aspnetcore-runtime-")]
109100
//[InlineData("5.0", "aspnetcore", "preview", @"https://aka.ms/dotnet/5.0/preview/aspnetcore-runtime-")]
110101
//[InlineData("5.0", "aspnetcore", "ga", @"https://aka.ms/dotnet/5.0/aspnetcore-runtime-")]
111102
//[InlineData("3.0", "windowsdesktop", null, @"https://aka.ms/dotnet/3.0/windowsdesktop-runtime-")]
112103
//[InlineData("3.1", "windowsdesktop", null, @"https://aka.ms/dotnet/3.1/windowsdesktop-runtime-")]
113104
//[InlineData("5.0", "windowsdesktop", null, @"https://aka.ms/dotnet/5.0/windowsdesktop-runtime-")]
114105
//[InlineData("STS", "windowsdesktop", null, @"https://aka.ms/dotnet/STS/windowsdesktop-runtime-")]
115106
//[InlineData("LTS", "windowsdesktop", null, @"https://aka.ms/dotnet/LTS/windowsdesktop-runtime-")]
116-
//[InlineData("5.0", "windowsdesktop", "signed", @"https://aka.ms/dotnet/5.0/signed/windowsdesktop-runtime-")]
117107
//[InlineData("5.0", "windowsdesktop", "daily", @"https://aka.ms/dotnet/5.0/daily/windowsdesktop-runtime-")]
118-
//[InlineData("5.0", "windowsdesktop", "validated", @"https://aka.ms/dotnet/5.0/validated/windowsdesktop-runtime-")]
119108
//[InlineData("5.0", "windowsdesktop", "preview", @"https://aka.ms/dotnet/5.0/preview/windowsdesktop-runtime-")]
120109
//[InlineData("5.0", "windowsdesktop", "ga", @"https://aka.ms/dotnet/5.0/windowsdesktop-runtime-")]
121110

122-
// 6.0 doesn't have a signed. validated, preview or ga build yet.
123-
// [InlineData("6.0", "windowsdesktop", "signed", @"https://aka.ms/dotnet/6.0/signed/windowsdesktop-runtime-")]
124-
// [InlineData("6.0", "windowsdesktop", "validated", @"https://aka.ms/dotnet/6.0/validated/windowsdesktop-runtime-")]
125111
// [InlineData("6.0", "windowsdesktop", "preview", @"https://aka.ms/dotnet/6.0/preview/windowsdesktop-runtime-")]
126112
// [InlineData("6.0", "windowsdesktop", "ga", @"https://aka.ms/dotnet/6.0/windowsdesktop-runtime-")]
127113

@@ -175,20 +161,13 @@ public void Runtime_IntegrationTest(string channel, string runtime, string quali
175161
[InlineData("5.0.2xx", null, false, @"https://aka.ms/dotnet/5.0.2xx/dotnet-sdk-")]
176162
[InlineData("STS", null, false, @"https://aka.ms/dotnet/STS/dotnet-sdk-")]
177163
[InlineData("LTS", null, false, @"https://aka.ms/dotnet/LTS/dotnet-sdk-")]
178-
[InlineData("5.0.2xx", "signed", false, @"https://aka.ms/dotnet/5.0.2xx/signed/dotnet-sdk-")]
179164
[InlineData("5.0.2xx", "daily", false, @"https://aka.ms/dotnet/5.0.2xx/daily/dotnet-sdk-")]
180-
[InlineData("5.0.2xx", "validated", false, @"https://aka.ms/dotnet/5.0.2xx/validated/dotnet-sdk-")]
181165
[InlineData("5.0.2xx", "preview", false, @"https://aka.ms/dotnet/5.0.2xx/preview/dotnet-sdk-")]
182166
[InlineData("5.0.2xx", "ga", false, @"https://aka.ms/dotnet/5.0.2xx/dotnet-sdk-")]
183167
[InlineData("3.1", null, true, @"https://aka.ms/dotnet/internal/3.1/dotnet-sdk-")]
184168
[InlineData("5.0.2xx", null, true, @"https://aka.ms/dotnet/internal/5.0.2xx/dotnet-sdk-")]
185169
[InlineData("STS", null, true, @"https://aka.ms/dotnet/internal/STS/dotnet-sdk-")]
186170
[InlineData("LTS", null, true, @"https://aka.ms/dotnet/internal/LTS/dotnet-sdk-")]
187-
[InlineData("5.0.2xx", "validated", true, @"https://aka.ms/dotnet/internal/5.0.2xx/validated/dotnet-sdk-")]
188-
[InlineData("6.0.2xx", "validated", true, @"https://aka.ms/dotnet/internal/6.0.2xx/validated/dotnet-sdk-")]
189-
[InlineData("7.0.1xx", "validated", true, @"https://aka.ms/dotnet/internal/7.0.1xx/validated/dotnet-sdk-")]
190-
[InlineData("8.0.3xx", "validated", true, @"https://aka.ms/dotnet/internal/8.0.3xx/validated/dotnet-sdk-")]
191-
[InlineData("9.0.1xx", "validated", true, @"https://aka.ms/dotnet/internal/9.0.1xx/validated/dotnet-sdk-")]
192171
public void LinkCanBeCreatedForSdk(string channel, string quality, bool isInternal, string expectedLink)
193172
{
194173
string expectedLinkPattern = Regex.Escape(expectedLink);
@@ -236,28 +215,22 @@ public void LinkCanBeCreatedForSdk(string channel, string quality, bool isIntern
236215
[InlineData("5.0", "dotnet", null, false, @"https://aka.ms/dotnet/5.0/dotnet-runtime-")]
237216
[InlineData("STS", "dotnet", null, false, @"https://aka.ms/dotnet/STS/dotnet-runtime-")]
238217
[InlineData("LTS", "dotnet", null, false, @"https://aka.ms/dotnet/LTS/dotnet-runtime-")]
239-
[InlineData("5.0", "dotnet", "signed", false, @"https://aka.ms/dotnet/5.0/signed/dotnet-runtime-")]
240218
[InlineData("5.0", "dotnet", "daily", false, @"https://aka.ms/dotnet/5.0/daily/dotnet-runtime-")]
241-
[InlineData("5.0", "dotnet", "validated", false, @"https://aka.ms/dotnet/5.0/validated/dotnet-runtime-")]
242219
[InlineData("5.0", "dotnet", "preview", false, @"https://aka.ms/dotnet/5.0/preview/dotnet-runtime-")]
243220
[InlineData("5.0", "dotnet", "ga", false, @"https://aka.ms/dotnet/5.0/dotnet-runtime-")]
244221
[InlineData("2.1", "aspnetcore", null, false, @"https://aka.ms/dotnet/2.1/aspnetcore-runtime-")]
245222
[InlineData("3.1", "aspnetcore", null, false, @"https://aka.ms/dotnet/3.1/aspnetcore-runtime-")]
246223
[InlineData("5.0", "aspnetcore", null, false, @"https://aka.ms/dotnet/5.0/aspnetcore-runtime-")]
247224
[InlineData("STS", "aspnetcore", null, false, @"https://aka.ms/dotnet/STS/aspnetcore-runtime-")]
248225
[InlineData("LTS", "aspnetcore", null, false, @"https://aka.ms/dotnet/LTS/aspnetcore-runtime-")]
249-
[InlineData("5.0", "aspnetcore", "signed", false, @"https://aka.ms/dotnet/5.0/signed/aspnetcore-runtime-")]
250226
[InlineData("5.0", "aspnetcore", "daily", false, @"https://aka.ms/dotnet/5.0/daily/aspnetcore-runtime-")]
251-
[InlineData("5.0", "aspnetcore", "validated", false, @"https://aka.ms/dotnet/5.0/validated/aspnetcore-runtime-")]
252227
[InlineData("5.0", "aspnetcore", "preview", false, @"https://aka.ms/dotnet/5.0/preview/aspnetcore-runtime-")]
253228
[InlineData("5.0", "aspnetcore", "ga", false, @"https://aka.ms/dotnet/5.0/aspnetcore-runtime-")]
254229
[InlineData("3.1", "windowsdesktop", null, false, @"https://aka.ms/dotnet/3.1/windowsdesktop-runtime-")]
255230
[InlineData("5.0", "windowsdesktop", null, false, @"https://aka.ms/dotnet/5.0/windowsdesktop-runtime-")]
256231
[InlineData("STS", "windowsdesktop", null, false, @"https://aka.ms/dotnet/STS/windowsdesktop-runtime-")]
257232
[InlineData("LTS", "windowsdesktop", null, false, @"https://aka.ms/dotnet/LTS/windowsdesktop-runtime-")]
258-
[InlineData("5.0", "windowsdesktop", "signed", false, @"https://aka.ms/dotnet/5.0/signed/windowsdesktop-runtime-")]
259233
[InlineData("5.0", "windowsdesktop", "daily", false, @"https://aka.ms/dotnet/5.0/daily/windowsdesktop-runtime-")]
260-
[InlineData("5.0", "windowsdesktop", "validated", false, @"https://aka.ms/dotnet/5.0/validated/windowsdesktop-runtime-")]
261234
[InlineData("5.0", "windowsdesktop", "preview", false, @"https://aka.ms/dotnet/5.0/preview/windowsdesktop-runtime-")]
262235
[InlineData("5.0", "windowsdesktop", "ga", false, @"https://aka.ms/dotnet/5.0/windowsdesktop-runtime-")]
263236
[InlineData("LTS", "dotnet", null, true, @"https://aka.ms/dotnet/internal/LTS/dotnet-runtime-")]
@@ -319,12 +292,8 @@ public void LinkCanBeCreatedForGivenRuntime(string channel, string runtime, stri
319292

320293
[Theory]
321294
[InlineData("STS", null, "daily", @"https://aka.ms/dotnet/STS/dotnet-sdk-")]
322-
[InlineData("LTS", null, "signed", @"https://aka.ms/dotnet/LTS/dotnet-sdk-")]
323-
[InlineData("STS", "dotnet", "validated", @"https://aka.ms/dotnet/STS/dotnet-runtime-")]
324295
[InlineData("LTS", "dotnet", "preview", @"https://aka.ms/dotnet/LTS/dotnet-runtime-")]
325296
[InlineData("STS", "aspnetcore", "daily", @"https://aka.ms/dotnet/STS/aspnetcore-runtime-")]
326-
[InlineData("LTS", "aspnetcore", "signed", @"https://aka.ms/dotnet/LTS/aspnetcore-runtime-")]
327-
[InlineData("STS", "windowsdesktop", "validated", @"https://aka.ms/dotnet/STS/windowsdesktop-runtime-")]
328297
[InlineData("LTS", "windowsdesktop", "preview", @"https://aka.ms/dotnet/LTS/windowsdesktop-runtime-")]
329298
public void QualityIsSkippedForLTSAndCurrentChannel(string channel, string runtime, string quality, string expectedLink)
330299
{
@@ -362,9 +331,9 @@ public void QualityIsSkippedForLTSAndCurrentChannel(string channel, string runti
362331

363332
[Theory]
364333
[InlineData("Fake", null, "daily")]
365-
[InlineData("Fake", "dotnet", "validated")]
334+
[InlineData("Fake", "dotnet", "daily")]
366335
[InlineData("Fake", "aspnetcore", "daily")]
367-
[InlineData("Fake", "windowsdesktop", "validated")]
336+
[InlineData("Fake", "windowsdesktop", "daily")]
368337
public void NoFallbackIfQualityIsGiven(string channel, string runtime, string quality)
369338
{
370339
if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows) && runtime == "windowsdesktop")

‎tests/Install-Scripts.Test/GivenThatIWantToInstallDotnetFromAScript.cs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -547,7 +547,6 @@ public void WhenFailingToInstallWithFeedCredentials(string? runtime, string chan
547547

548548
[Theory]
549549
[InlineData("8.0.303", Quality.Daily)]
550-
[InlineData("9.0.100", Quality.Signed)]
551550
public void WhenBothVersionAndQualityWereSpecified(string version, Quality quality)
552551
{
553552
var args = GetInstallScriptArgs(null, null, quality.ToString(), _sdkInstallationDirectory, version: version);
@@ -560,7 +559,6 @@ public void WhenBothVersionAndQualityWereSpecified(string version, Quality quali
560559
}
561560

562561
[Theory]
563-
[InlineData(null, Quality.Signed)]
564562
[InlineData("8.0.303", null)]
565563
public void WhenEitherVersionOrQualityWasSpecified(string? version, Quality? quality)
566564
{

‎tests/Install-Scripts.Test/Utils/Quality.cs‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,8 @@ public enum Quality
99
{
1010
None = 0,
1111
Daily = 1,
12-
Signed = 2,
13-
Validated = 4,
1412
Preview = 8,
1513
Ga = 16,
16-
All = Daily | Signed | Validated | Preview | Ga,
14+
All = Daily | Preview | Ga,
1715
}
1816
}

0 commit comments

Comments
 (0)