NotificationsYou must be signed in to change notification settings
Fork62
Star683

Commit7aa3dc8

authored

Merge pull request#208 from sfoslund/FixSpecifiedVersionBug

Ignore bundles with invalid version strings

2 parents126cb23 +bba800e commit7aa3dc8Copy full SHA for 7aa3dc8

File tree

2 files changed

+37

-19

lines changed

src/dotnet-core-uninstall/Windows
- RegistryQuery.cs
test/dotnet-core-uninstall.Tests/Windows
- RegistryQueryTests.cs

2 files changed

+37

-19

lines changed

`‎src/dotnet-core-uninstall/Windows/RegistryQuery.cs`

Lines changed: 27 additions & 19 deletions

Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,7 @@ private static Bundle WrapRegistryKey(RegistryKey registryKey)`
`100`	`100`	`returnBundle.From(version,arch,uninstallCommand,displayName);`
`101`	`101`	`}`
`102`	`102`
`103`		`-privatestaticBundleVersionGetBundleVersion(stringdisplayName,stringuninstallString,stringbundleCachePath)`
	`103`	`+publicstaticBundleVersionGetBundleVersion(stringdisplayName,stringuninstallString,stringbundleCachePath)`
`104`	`104`	`{`
`105`	`105`	`varversionString=Regexes.VersionDisplayNameRegex.Match(displayName)?.Value??string.Empty;`
`106`	`106`	`varcachePathMatch=Regexes.BundleCachePathRegex.Match(bundleCachePath);`
`@@ -109,27 +109,35 @@ private static BundleVersion GetBundleVersion(string displayName, string uninsta`
`109`	`109`	`string.Format(LocalizableStrings.HostingBundleFootnoteFormat,displayName,versionString):`
`110`	`110`	`null;`
`111`	`111`
`112`		`-// Classify the bundle type`
`113`		`-if(displayName.IndexOf("Windows Server",StringComparison.OrdinalIgnoreCase)>=0)`
	`112`	`+try`
`114`	`113`	`{`
`115`		`-returnnewHostingBundleVersion(versionString,footnote);`
	`114`	`+// Classify the bundle type`
	`115`	`+if(displayName.IndexOf("Windows Server",StringComparison.OrdinalIgnoreCase)>=0)`
	`116`	`+{`
	`117`	`+returnnewHostingBundleVersion(versionString,footnote);`
	`118`	`+}`
	`119`	`+elseif(displayName.IndexOf("ASP.NET",StringComparison.OrdinalIgnoreCase)>=0)`
	`120`	`+{`
	`121`	`+returnnewAspNetRuntimeVersion(versionString);`
	`122`	`+}`
	`123`	`+elseif((displayName.IndexOf(".NET Core SDK",StringComparison.OrdinalIgnoreCase)>=0)\|\|`
	`124`	`+(displayName.IndexOf("Microsoft .NET SDK",StringComparison.OrdinalIgnoreCase)>=0)\|\|`
	`125`	`+uninstallString.IndexOf("dotnet-dev-win")>=0)`
	`126`	`+{`
	`127`	`+returnnewSdkVersion(versionString);`
	`128`	`+}`
	`129`	`+elseif(displayName.IndexOf(".NET Core Runtime",StringComparison.OrdinalIgnoreCase)>=0\|\|Regex.IsMatch(displayName,@".\.NET Core.Runtime")\|\|`
	`130`	`+displayName.IndexOf(".NET Runtime",StringComparison.OrdinalIgnoreCase)>=0)`
	`131`	`+{`
	`132`	`+returnnewRuntimeVersion(versionString);`
	`133`	`+}`
	`134`	`+else`
	`135`	`+{`
	`136`	`+returnnull;`
	`137`	`+}`
`116`	`138`	`}`
`117`		`-elseif(displayName.IndexOf("ASP.NET",StringComparison.OrdinalIgnoreCase)>=0)`
	`139`	`+catch`
`118`	`140`	`{`
`119`		`-returnnewAspNetRuntimeVersion(versionString);`
`120`		`-}`
`121`		`-elseif((displayName.IndexOf(".NET Core SDK",StringComparison.OrdinalIgnoreCase)>=0)\|\|`
`122`		`-(displayName.IndexOf("Microsoft .NET SDK",StringComparison.OrdinalIgnoreCase)>=0)\|\|`
`123`		`-uninstallString.IndexOf("dotnet-dev-win")>=0)`
`124`		`-{`
`125`		`-returnnewSdkVersion(versionString);`
`126`		`-}`
`127`		`-elseif(displayName.IndexOf(".NET Core Runtime",StringComparison.OrdinalIgnoreCase)>=0\|\|Regex.IsMatch(displayName,@".\.NET Core.Runtime")\|\|`
`128`		`-displayName.IndexOf(".NET Runtime",StringComparison.OrdinalIgnoreCase)>=0)`
`129`		`-{`
`130`		`-returnnewRuntimeVersion(versionString);`
`131`		`-}`
`132`		`-else{`
`133`	`141`	`returnnull;`
`134`	`142`	`}`
`135`	`143`	`}`

`‎test/dotnet-core-uninstall.Tests/Windows/RegistryQueryTests.cs`

Lines changed: 10 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -51,5 +51,15 @@ internal void TestIsNetCoreBundleAccept(string input)`
`51`	`51`	`.Should()`
`52`	`52`	`.BeTrue();`
`53`	`53`	`}`
	`54`	`+`
	`55`	`+[WindowsOnlyTheory]`
	`56`	`+[InlineData("Microsoft ASP.NET Web Frameworks and Tools VS2015")]`
	`57`	`+[InlineData("Microsoft .NET Core SDK - rc1 (x86)")]`
	`58`	`+internalvoidTestGetBundleVersionReturnsNullOnInvalidDisplayNames(stringdisplayName)`
	`59`	`+{`
	`60`	`+RegistryQuery.GetBundleVersion(displayName,string.Empty,string.Empty)`
	`61`	`+.Should()`
	`62`	`+.BeNull();`
	`63`	`+}`
`54`	`64`	`}`
`55`	`65`	`}`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit7aa3dc8

File tree

2 files changed

2 files changed

`‎src/dotnet-core-uninstall/Windows/RegistryQuery.cs`

`‎test/dotnet-core-uninstall.Tests/Windows/RegistryQueryTests.cs`

0 commit comments