Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit128fe50

Browse files
committed
Increase the upper limit to allow for .net 9 uninstall
1 parent0d48c70 commit128fe50

File tree

3 files changed

+18
-15
lines changed

3 files changed

+18
-15
lines changed

‎src/dotnet-core-uninstall/Shared/VSVersioning/VisualStudioSafeVersionsExtractor.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ namespace Microsoft.DotNet.Tools.Uninstall.Shared.VSVersioning
1313
internalstaticclassVisualStudioSafeVersionsExtractor
1414
{
1515
// The tool should not be used to uninstall any more recent versions of the sdk
16-
publicstaticreadonlySemanticVersionUpperLimit=newSemanticVersion(9,0,0);
16+
publicstaticreadonlySemanticVersionUpperLimit=newSemanticVersion(10,0,0);
1717

1818
// Must keep one of each of these divisions to ensure Visual Studio works.
1919
// Pairs are [inclusive, exclusive)
@@ -29,7 +29,8 @@ internal static class VisualStudioSafeVersionsExtractor
2929
{(newSemanticVersion(5,0,100),newSemanticVersion(5,0,600)),string.Format(LocalizableStrings.WindowsRequirementExplanationString," 2019")},
3030
{(newSemanticVersion(6,0,100),newSemanticVersion(6,0,500)),string.Format(LocalizableStrings.WindowsRequirementExplanationString," 2022")},
3131
{(newSemanticVersion(7,0,100),newSemanticVersion(7,0,500)),string.Format(LocalizableStrings.WindowsRequirementExplanationString," 2022")},
32-
{(newSemanticVersion(8,0,100),UpperLimit),string.Format(LocalizableStrings.WindowsRequirementExplanationString,"")}
32+
{(newSemanticVersion(8,0,100),newSemanticVersion(8,0,500)),string.Format(LocalizableStrings.WindowsRequirementExplanationString," 2022")},
33+
{(newSemanticVersion(9,0,100),UpperLimit),string.Format(LocalizableStrings.WindowsRequirementExplanationString,"")}
3334
};
3435

3536
privatestatic(IDictionary<IEnumerable<Bundle>,string>,IEnumerable<Bundle>)ApplyWindowsVersionDivisions(IEnumerable<Bundle>bundleList)

‎test/dotnet-core-uninstall.Tests/Shared/Commands/CommandBundleFilterTests.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ namespace Microsoft.DotNet.Tools.Uninstall.Tests.Shared.Commands
2020
{
2121
publicclassCommandBundleFilterTests
2222
{
23-
privatestaticreadonlystring[]versions={"1.0.0","1.0.1","1.1.0","2.1.0","2.1.500","2.1.600","2.2.100","2.2.200","5.0.100","6.0.100","7.0.100","8.0.100","9.0.100","10.10.10"};
23+
privatestaticreadonlystring[]versions={"1.0.0","1.0.1","1.1.0","2.1.0","2.1.500","2.1.600","2.2.100","2.2.200","5.0.100","6.0.100","7.0.100","8.0.100","9.0.100","10.0.100","11.11.11"};
2424
privateDictionary<string,BundleArch>versionsWithArch=newDictionary<string,BundleArch>
2525
{
2626
{"3.0.0",BundleArch.X64},
@@ -131,10 +131,10 @@ internal void TestRequiredUninstallableWhenExplicitlyAdded(IEnumerable<Bundle> b
131131
}
132132

133133
[Theory]
134-
[InlineData("remove {0}9.0.100")]
135-
[InlineData("remove {0}10.10.10")]
134+
[InlineData("remove {0}10.0.100")]
135+
[InlineData("remove {0}11.11.11")]
136136
[InlineData("remove {0} --all --force")]
137-
[InlineData("remove {0} 1.0.0 1.0.1 1.1.0 2.1.0 2.1.500 2.1.600 2.2.100 2.2.200 5.0.100 7.0.10010.10.10")]
137+
[InlineData("remove {0} 1.0.0 1.0.1 1.1.0 2.1.0 2.1.500 2.1.600 2.2.100 2.2.200 5.0.100 7.0.10011.11.11")]
138138
internalvoidTestUpperLimitAlwaysRequired(stringcommand)
139139
{
140140
varsdkBundles=newList<Bundle<SdkVersion>>();

‎test/dotnet-core-uninstall.Tests/Shared/VSVersioning/VSVersionTests.cs

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@ public class VSVersionTests
2929
[InlineData(newstring[]{"3.0.100","3.1.201","5.0.100"},newbool[]{true,false,false})]
3030
[InlineData(newstring[]{"6.0.100","6.0.101","7.0.100"},newbool[]{true,false,false})]
3131
[InlineData(newstring[]{"7.0.100","7.0.101","8.0.100"},newbool[]{true,false,false})]
32-
[InlineData(newstring[]{"9.0.100","9.0.101","10.100.100"},newbool[]{false,false,false})]
32+
[InlineData(newstring[]{"8.0.100","8.0.101","9.0.100"},newbool[]{true,false,false})]
33+
[InlineData(newstring[]{"10.0.100","10.0.101","11.100.100"},newbool[]{false,false,false})]
3334
internalvoidTestGetUninstallableWindows(string[]versions,bool[]allowed)
3435
{
3536
varbundles=newList<Bundle>();
@@ -52,7 +53,7 @@ internal void TestGetUninstallableWindows(string[] versions, bool[] allowed)
5253
[InlineData(newstring[]{"2.1.0","1.0.1"},newbool[]{false,true},newstring[]{"1.0.0","1.1.0"},newbool[]{false,false})]
5354
[InlineData(newstring[]{"3.0.0","7.0.100"},newbool[]{true,false},newstring[]{"1.0.0","1.1.0","1.0.1","1.0.2","1.1.3"},newbool[]{true,true,true,false,false})]
5455
[InlineData(newstring[]{"3.0.0","5.0.100"},newbool[]{true,false},newstring[]{"1.0.0","1.1.0","1.0.1","5.0.100"},newbool[]{true,false,false,false})]
55-
[InlineData(newstring[]{"5.0.100","5.0.101","10.100.100"},newbool[]{true,false,false},newstring[]{"5.0.100","10.0.0"},newbool[]{false,false})]
56+
[InlineData(newstring[]{"5.0.100","5.0.101","11.100.100"},newbool[]{true,false,false},newstring[]{"5.0.100","11.0.0"},newbool[]{false,false})]
5657
[InlineData(newstring[]{"5.0.100","6.0.100","6.0.101"},newbool[]{true,true,false},newstring[]{"5.0.100"},newbool[]{false})]
5758
internalvoidTestGetUninstallableMac(string[]sdkVersions,bool[]sdkAllowed,string[]runtimeVersions,bool[]runtimeAllowed)
5859
{
@@ -80,7 +81,8 @@ internal void TestGetUninstallableMac(string[] sdkVersions, bool[] sdkAllowed, s
8081
[InlineData(newstring[]{"2.2.100","2.2.200","2.2.300"},newbool[]{false,true,false})]
8182
[InlineData(newstring[]{"5.0.100","5.0.101","10.0.1"},newbool[]{true,false,false})]
8283
[InlineData(newstring[]{"6.0.100","7.0.100","7.0.101"},newbool[]{false,true,false})]
83-
[InlineData(newstring[]{"9.0.100","9.0.101","10.100.100"},newbool[]{false,false,false})]
84+
[InlineData(newstring[]{"9.0.100","9.0.101","10.100.100"},newbool[]{true,false,false})]
85+
[InlineData(newstring[]{"10.0.100","10.0.101","11.100.100"},newbool[]{false,false,false})]
8486
internalvoidTestGetUninstallableNonSdkVersionsWindows(string[]versions,bool[]allowed)
8587
{
8688
varbundles=newList<Bundle>();
@@ -117,9 +119,9 @@ internal void TestGetUninstallableNonSdkVersions(IEnumerable<Bundle> bundles, bo
117119
bundles=bundles.Concat(newList<Bundle>
118120
{
119121
newBundle<AspNetRuntimeVersion>(newAspNetRuntimeVersion("1.0.0"),newBundleArch(),string.Empty,"AspNetVersion"),
120-
newBundle<AspNetRuntimeVersion>(newAspNetRuntimeVersion("10.0.0"),newBundleArch(),string.Empty,"AspNetVersion"),
122+
newBundle<AspNetRuntimeVersion>(newAspNetRuntimeVersion("11.0.0"),newBundleArch(),string.Empty,"AspNetVersion"),
121123
newBundle<HostingBundleVersion>(newHostingBundleVersion("1.0.0"),newBundleArch(),string.Empty,"HostingBundleVersion"),
122-
newBundle<HostingBundleVersion>(newHostingBundleVersion("10.0.0"),newBundleArch(),string.Empty,"HostingBundleVersion")
124+
newBundle<HostingBundleVersion>(newHostingBundleVersion("11.0.0"),newBundleArch(),string.Empty,"HostingBundleVersion")
123125
});
124126

125127
varuninstallable=VisualStudioSafeVersionsExtractor.GetUninstallableBundles(bundles);
@@ -203,8 +205,8 @@ internal void TestGetListCommandUninstallableStringsWindows(string[] versions, s
203205
[InlineData(newstring[]{"1.0.0","1.0.1"},newstring[]{"None","SDK"},newstring[]{"1.0.0","1.0.1"},newstring[]{"None","Runtime"})]
204206
[InlineData(newstring[]{"2.1.0","1.0.1"},newstring[]{"SDK","None"},newstring[]{"2.0.0","1.1.0"},newstring[]{"Runtime","Runtime"})]
205207
[InlineData(newstring[]{"3.0.100","5.0.100"},newstring[]{"None","SDK"},newstring[]{"1.0.0","1.1.0","1.0.1","1.0.2","1.1.3"},newstring[]{"None","None","None","Runtime","Runtime"})]
206-
[InlineData(newstring[]{"3.0.100","5.0.100"},newstring[]{"None","SDK"},newstring[]{"1.0.0","1.1.0","1.0.1","9.0.100"},newstring[]{"None","Runtime","Runtime","UpperLimit"})]
207-
[InlineData(newstring[]{"5.0.100","5.0.101","10.100.100"},newstring[]{"None","SDK","UpperLimit"},newstring[]{"5.0.100","10.0.0"},newstring[]{"Runtime","UpperLimit"})]
208+
[InlineData(newstring[]{"3.0.100","5.0.100"},newstring[]{"None","SDK"},newstring[]{"1.0.0","1.1.0","1.0.1","10.0.100"},newstring[]{"None","Runtime","Runtime","UpperLimit"})]
209+
[InlineData(newstring[]{"5.0.100","5.0.101","11.100.100"},newstring[]{"None","SDK","UpperLimit"},newstring[]{"5.0.100","11.0.0"},newstring[]{"Runtime","UpperLimit"})]
208210
internalvoidTestGetListCommandUninstallableStringsMac(string[]sdkVersions,string[]sdkExpected,string[]runtimeVersions,string[]runtimeExpected)
209211
{
210212
sdkExpected=sdkExpected.Select(s=>s.Equals("UpperLimit")?VisualStudioSafeVersionsExtractor.UpperLimit.ToNormalizedString():s).ToArray();
@@ -228,9 +230,9 @@ internal void TestGetListCommandUninstallableStrings(IEnumerable<Bundle> bundles
228230
bundles=bundles.Concat(newList<Bundle>
229231
{
230232
newBundle<AspNetRuntimeVersion>(newAspNetRuntimeVersion("1.0.0"),newBundleArch(),string.Empty,"AspNetVersion"),
231-
newBundle<AspNetRuntimeVersion>(newAspNetRuntimeVersion("10.0.0"),newBundleArch(),string.Empty,"AspNetVersion"),
233+
newBundle<AspNetRuntimeVersion>(newAspNetRuntimeVersion("11.0.0"),newBundleArch(),string.Empty,"AspNetVersion"),
232234
newBundle<HostingBundleVersion>(newHostingBundleVersion("1.0.0"),newBundleArch(),string.Empty,"HostingBundleVersion"),
233-
newBundle<HostingBundleVersion>(newHostingBundleVersion("10.0.0"),newBundleArch(),string.Empty,"HostingBundleVersion")
235+
newBundle<HostingBundleVersion>(newHostingBundleVersion("11.0.0"),newBundleArch(),string.Empty,"HostingBundleVersion")
234236
});
235237

236238
varstrings=VisualStudioSafeVersionsExtractor.GetReasonRequiredStrings(bundles);

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp