Skip to content

Commit a15fd60

Browse files
authored
Merge pull request #18166 from mhutch/workload-redirects
Implement workload redirects
2 parents 239cfd8 + 88fc6b4 commit a15fd60

File tree

102 files changed

+1505
-451
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

102 files changed

+1505
-451
lines changed

src/Cli/dotnet/Installer/Windows/WorkloadPackRecord.cs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@
33
#nullable disable
44

55
using System;
6+
7+
using Microsoft.NET.Sdk.WorkloadManifestReader;
8+
69
using NuGet.Versioning;
710

811
namespace Microsoft.DotNet.Installer.Windows
@@ -25,7 +28,7 @@ public string ProviderKeyName
2528
/// <summary>
2629
/// The ID of the workload pack.
2730
/// </summary>
28-
public string PackId
31+
public WorkloadPackId PackId
2932
{
3033
get;
3134
set;

src/Cli/dotnet/commands/dotnet-sdk/check/LocalizableStrings.resx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@
132132
<data name="BundleUpToDateMessage" xml:space="preserve">
133133
<value>Up to date.</value>
134134
</data>
135-
<data name="NewPatchAvaliableMessage" xml:space="preserve">
135+
<data name="NewPatchAvailableMessage" xml:space="preserve">
136136
<value>Patch {0} is available.</value>
137137
</data>
138138
<data name="OutOfSupportMessage" xml:space="preserve">

src/Cli/dotnet/commands/dotnet-sdk/check/RuntimeOutputWriter.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ private string GetRuntimeStatusMessage(NetRuntimeInfo runtime)
4949
}
5050
else if (NewerRuntimePatchExists(runtime))
5151
{
52-
return string.Format(LocalizableStrings.NewPatchAvaliableMessage, NewestRuntimePatchVersion(runtime));
52+
return string.Format(LocalizableStrings.NewPatchAvailableMessage, NewestRuntimePatchVersion(runtime));
5353
}
5454
else
5555
{

src/Cli/dotnet/commands/dotnet-sdk/check/SdkOutputWriter.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,10 @@ public void PrintSdkInfo()
3333

3434
table.PrintRows(_sdkInfo.OrderBy(sdk => sdk.Version), l => _reporter.WriteLine(l));
3535

36-
if (NewFeatureBandAvaliable())
36+
if (NewFeatureBandAvailable())
3737
{
3838
_reporter.WriteLine();
39-
_reporter.WriteLine(string.Format(LocalizableStrings.NewFeatureBandMessage, NewestFeatureBandAvaliable()));
39+
_reporter.WriteLine(string.Format(LocalizableStrings.NewFeatureBandMessage, NewestFeatureBandAvailable()));
4040
}
4141
}
4242

@@ -52,7 +52,7 @@ private string GetSdkStatusMessage(NetSdkInfo sdk)
5252
}
5353
else if (NewerSdkPatchExists(sdk))
5454
{
55-
return string.Format(LocalizableStrings.NewPatchAvaliableMessage, NewestSdkPatchVersion(sdk));
55+
return string.Format(LocalizableStrings.NewPatchAvailableMessage, NewestSdkPatchVersion(sdk));
5656
}
5757
else
5858
{
@@ -86,12 +86,12 @@ private ReleaseVersion NewestSdkPatchVersion(NetSdkInfo bundle)
8686
}
8787
}
8888

89-
private bool NewFeatureBandAvaliable()
89+
private bool NewFeatureBandAvailable()
9090
{
91-
return NewestFeatureBandAvaliable() > _sdkInfo.Select(sdk => sdk.Version).Max();
91+
return NewestFeatureBandAvailable() > _sdkInfo.Select(sdk => sdk.Version).Max();
9292
}
9393

94-
private ReleaseVersion NewestFeatureBandAvaliable()
94+
private ReleaseVersion NewestFeatureBandAvailable()
9595
{
9696
return _productCollection.OrderByDescending(product => product.ProductVersion).First().LatestSdkVersion;
9797
}

src/Cli/dotnet/commands/dotnet-sdk/check/xlf/LocalizableStrings.cs.xlf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
<target state="new">Try out the newest .NET SDK features with .NET {0}.</target>
3838
<note />
3939
</trans-unit>
40-
<trans-unit id="NewPatchAvaliableMessage">
40+
<trans-unit id="NewPatchAvailableMessage">
4141
<source>Patch {0} is available.</source>
4242
<target state="new">Patch {0} is available.</target>
4343
<note />

src/Cli/dotnet/commands/dotnet-sdk/check/xlf/LocalizableStrings.de.xlf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
<target state="new">Try out the newest .NET SDK features with .NET {0}.</target>
3838
<note />
3939
</trans-unit>
40-
<trans-unit id="NewPatchAvaliableMessage">
40+
<trans-unit id="NewPatchAvailableMessage">
4141
<source>Patch {0} is available.</source>
4242
<target state="new">Patch {0} is available.</target>
4343
<note />

src/Cli/dotnet/commands/dotnet-sdk/check/xlf/LocalizableStrings.es.xlf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
<target state="new">Try out the newest .NET SDK features with .NET {0}.</target>
3838
<note />
3939
</trans-unit>
40-
<trans-unit id="NewPatchAvaliableMessage">
40+
<trans-unit id="NewPatchAvailableMessage">
4141
<source>Patch {0} is available.</source>
4242
<target state="new">Patch {0} is available.</target>
4343
<note />

src/Cli/dotnet/commands/dotnet-sdk/check/xlf/LocalizableStrings.fr.xlf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
<target state="new">Try out the newest .NET SDK features with .NET {0}.</target>
3838
<note />
3939
</trans-unit>
40-
<trans-unit id="NewPatchAvaliableMessage">
40+
<trans-unit id="NewPatchAvailableMessage">
4141
<source>Patch {0} is available.</source>
4242
<target state="new">Patch {0} is available.</target>
4343
<note />

src/Cli/dotnet/commands/dotnet-sdk/check/xlf/LocalizableStrings.it.xlf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
<target state="new">Try out the newest .NET SDK features with .NET {0}.</target>
3838
<note />
3939
</trans-unit>
40-
<trans-unit id="NewPatchAvaliableMessage">
40+
<trans-unit id="NewPatchAvailableMessage">
4141
<source>Patch {0} is available.</source>
4242
<target state="new">Patch {0} is available.</target>
4343
<note />

src/Cli/dotnet/commands/dotnet-sdk/check/xlf/LocalizableStrings.ja.xlf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
<target state="new">Try out the newest .NET SDK features with .NET {0}.</target>
3838
<note />
3939
</trans-unit>
40-
<trans-unit id="NewPatchAvaliableMessage">
40+
<trans-unit id="NewPatchAvailableMessage">
4141
<source>Patch {0} is available.</source>
4242
<target state="new">Patch {0} is available.</target>
4343
<note />

0 commit comments

Comments
 (0)