Skip to content

Commit

Permalink
Release commit created with Cranko.
Browse files Browse the repository at this point in the history
+++ cranko-release-info-v1
[[projects]]
qnames = ["MakeDataCabinetFile", "csproj"]
version = "1.0.1.0"
age = 6

[[projects]]
qnames = ["WWTCore", "csproj"]
version = "6.0.14.0"
age = 6

[[projects]]
qnames = ["WWTCoreUWP", "csproj"]
version = "6.0.2.0"
age = 6

[[projects]]
qnames = ["UwpRenderEngine", "csproj"]
version = "6.0.2.0"
age = 6

[[projects]]
qnames = ["WWTHolographic", "csproj"]
version = "6.0.2.0"
age = 6

[[projects]]
qnames = ["WorldWideTelescope", "csproj"]
version = "6.0.2.0"
age = 6

[[projects]]
qnames = ["OculusWrap", "csproj"]
version = "2.3.5.0"
age = 7

[[projects]]
qnames = ["WWTExplorer", "csproj"]
version = "6.0.905.0"
age = 0

+++
  • Loading branch information
cranko committed Jan 6, 2022
2 parents 98c0075 + ed4734c commit 1887188
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 9 deletions.
6 changes: 3 additions & 3 deletions Setup1/Setup1.vdproj
Original file line number Diff line number Diff line change
Expand Up @@ -1976,15 +1976,15 @@
{
"Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:AAS WorldWide Telescope"
"ProductCode" = "8:{88C61DCA-577B-4E9F-A652-3B1E06746C0B}"
"PackageCode" = "8:{7DEE0FFB-5A15-40D5-81E0-8CC58567A981}"
"ProductCode" = "8:{1440C31A-618F-4CCF-BE33-C2BFE9C31FC2}"
"PackageCode" = "8:{1440C31A-618F-4CCF-BE33-C2BFE9C31FC2}"
"UpgradeCode" = "8:{543D9051-C7F5-4C6B-BEA5-6CA148C8487F}"
"AspNetVersion" = "8:4.0.30319.0"
"RestartWWWService" = "11:FALSE"
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:TRUE"
"ProductVersion" = "8:6.0.904"
"ProductVersion" = "8:6.0.905"
"Manufacturer" = "8:American Astronomical Society"
"ARPHELPTELEPHONE" = "8:"
"ARPHELPLINK" = "8:"
Expand Down
8 changes: 4 additions & 4 deletions WWTExplorer3d/3dWindow.cs
Original file line number Diff line number Diff line change
Expand Up @@ -7813,11 +7813,11 @@ private static bool CheckForUpdates(bool interactive)

if (RenderEngine.multiMonClient)
{
System.Diagnostics.Process.Start(@"msiexec.exe", string.Format(@"/fvomus {0}\wwtsetup.msi /q", Path.GetTempPath()));
System.Diagnostics.Process.Start(@"msiexec.exe", string.Format(@"/i {0}\wwtsetup.msi /l*vx {0}\wwtupdate.log /q", Path.GetTempPath()));
}
else
{
System.Diagnostics.Process.Start(@"msiexec.exe", string.Format(@"/fvomus {0}\wwtsetup.msi", Path.GetTempPath()));
System.Diagnostics.Process.Start(@"msiexec.exe", string.Format(@"/i {0}\wwtsetup.msi /l*vx {0}\wwtupdate.log", Path.GetTempPath()));
}

return false;
Expand Down Expand Up @@ -7849,11 +7849,11 @@ private static bool CheckForUpdates(bool interactive)

if (RenderEngine.multiMonClient)
{
System.Diagnostics.Process.Start(@"msiexec.exe", string.Format(@"/fvomus {0}\wwtsetup.msi /q", Path.GetTempPath()));
System.Diagnostics.Process.Start(@"msiexec.exe", string.Format(@"/i {0}\wwtsetup.msi /l*vx {0}\wwtupdate.log /q", Path.GetTempPath()));
}
else
{
System.Diagnostics.Process.Start(@"msiexec.exe", string.Format(@"/fvomus {0}\wwtsetup.msi", Path.GetTempPath()));
System.Diagnostics.Process.Start(@"msiexec.exe", string.Format(@"/i {0}\wwtsetup.msi /l*vx {0}\wwtupdate.log", Path.GetTempPath()));
}

return false;
Expand Down
12 changes: 12 additions & 0 deletions WWTExplorer3d/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,15 @@
# WWTExplorer 6.0.905.0 (2022-01-06)

- This is why we have the betas: the previous couple of releases didn't get the
auto-update functionality right. In this iteration, we revert the `msiexec`
changes but use a newer version of Cranko that ought to (more) correctly
update some of the installer metadata when making releases, which I believe
will fix auto-update. With these changes the auto-update user experience isn't
as smooth as it could be, since you have to go through steps like to
re-confirming the installation directory, but it seems that there are
significant limitations to getting the "smoother" mode to work reliably.


# WWTExplorer 6.0.904.0 (2022-01-05)

No code changes from the previous release. Making a new release so that the
Expand Down
4 changes: 2 additions & 2 deletions WWTExplorer3d/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@
// Build Number
// Revision
//
[assembly: AssemblyVersion("6.0.904.0")]
[assembly: AssemblyFileVersion("6.0.904.0")]
[assembly: AssemblyVersion("6.0.905.0")]
[assembly: AssemblyFileVersion("6.0.905.0")]
[assembly: NeutralResourcesLanguageAttribute("en-US")]
[assembly: System.Windows.Media.DisableDpiAwareness]

0 comments on commit 1887188

Please sign in to comment.