Commitf7ec679

authored

Merge pull request#150 from SixParQuatre/master

Alpha Release Notes: Add support for 6000.0f version and fix bugs in comparison.

2 parents8056e1e +bbf6a64 commitf7ec679Copy full SHA for f7ec679

File tree

+17

-6

lines changed

+17

-6

lines changed

Lines changed: 6 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -44,8 +44,12 @@ public static async Task<string> Scan()`
`44`	`44`	`returnresult;`
`45`	`45`	`}`
`46`	`46`
`47`		`-publicstaticUpdates[]Parse(stringitems)`
	`47`	`+publicstaticUpdates[]Parse(stringitems,refList<string>updatesAsString)`
`48`	`48`	`{`
	`49`	`+if(updatesAsString==null)`
	`50`	`+updatesAsString=newList<string>();`
	`51`	`+updatesAsString.Clear();`
	`52`	`+`
`49`	`53`	`isDownloadingUnityList=false;`
`50`	`54`	`//SetStatus("Downloading list of Unity versions ... done");`
`51`	`55`	`varreceivedList=items.Split(new[]{Environment.NewLine},StringSplitOptions.None);`
`@@ -68,6 +72,7 @@ public static Updates[] Parse(string items)`
`68`	`72`	`u.ReleaseDate=DateTime.ParseExact(row[3],"MM/dd/yyyy",CultureInfo.InvariantCulture);`
`69`	`73`	`u.Version=versionTemp;`
`70`	`74`	`releases.Add(versionTemp,u);`
	`75`	`+updatesAsString.Add(versionTemp);`
`71`	`76`	`}`
`72`	`77`
`73`	`78`	`prevVersion=versionTemp;`

Lines changed: 3 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -46,6 +46,7 @@ public partial class MainWindow : Window`
`46`	`46`	`System.Windows.Forms.NotifyIconnotifyIcon;`
`47`	`47`
`48`	`48`	`Updates[]updatesSource;`
	`49`	`+publicstaticList<string>updatesAsStrings;`
`49`	`50`
`50`	`51`	`string_filterString=null;`
`51`	`52`	`boolmultiWordSearch=false;`
`@@ -744,7 +745,7 @@ async Task CallGetUnityUpdates()`
`744`	`745`	`varitems=awaittask;`
`745`	`746`	`//Console.WriteLine("CallGetUnityUpdates=" + items == null);`
`746`	`747`	`if(items==null)return;`
`747`		`-updatesSource=GetUnityUpdates.Parse(items);`
	`748`	`+updatesSource=GetUnityUpdates.Parse(items,refupdatesAsStrings);`
`748`	`749`	`if(updatesSource==null)return;`
`749`	`750`	`dataGridUpdates.ItemsSource=updatesSource;`
`750`	`751`	`}`
`@@ -1034,7 +1035,7 @@ private async void OnTabSelectionChanged(object sender, SelectionChangedEventArg`
`1034`	`1035`	`varitems=awaittask;`
`1035`	`1036`	`if(task.IsCompleted==false\|\|task.IsFaulted==true)return;`
`1036`	`1037`	`if(items==null)return;`
`1037`		`-updatesSource=GetUnityUpdates.Parse(items);`
	`1038`	`+updatesSource=GetUnityUpdates.Parse(items,refupdatesAsStrings);`
`1038`	`1039`	`if(updatesSource==null)return;`
`1039`	`1040`	`dataGridUpdates.ItemsSource=updatesSource;`
`1040`	`1041`	`}`

Lines changed: 8 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -593,12 +593,17 @@ public static bool OpenReleaseNotes(string version)`
`593`	`593`
`594`	`594`	`//var url = Tools.GetUnityReleaseURL(version);`
`595`	`595`	`stringurl=null;`
`596`		`-if(Properties.Settings.Default.useAlphaReleaseNotes&&!version.Contains("6000"))`
	`596`	`+boolnoAlphaReleaseNotesPage=version.Contains("6000")&&!version.Contains("f");`
	`597`	`+if(Properties.Settings.Default.useAlphaReleaseNotes&&!noAlphaReleaseNotesPage)`
`597`	`598`	`{`
	`599`	`+//with the alpha release notes, we want a diff between the 2 versions, but the site just shows all the changes inclusive of from`
	`600`	`+// so we need to compare the currently selected version to the one right after it that is available (installed or not)`
	`601`	`+`
`598`	`602`	`varclosestVersion=Tools.FindNearestVersion(version,MainWindow.unityInstalledVersions.Keys.ToList(),true);`
`599`		`-if(closestVersion==null)closestVersion=version;`
	`603`	`+vargetNextVersionToClosest=closestVersion==null?null:Tools.FindNearestVersion(version,MainWindow.updatesAsStrings);`
	`604`	`+if(getNextVersionToClosest==null)getNextVersionToClosest=version;`
`600`	`605`
`601`		`-url="https://alpha.release-notes.ds.unity3d.com/search?fromVersion="+closestVersion+"&toVersion="+version;`
	`606`	`+url="https://alpha.release-notes.ds.unity3d.com/search?fromVersion="+getNextVersionToClosest+"&toVersion="+version;`
`602`	`607`	`}`
`603`	`608`	`else`
`604`	`609`	`{`

Comments

(0)