Merge pull request #188 from Azure/dev

New version 5.8.3

AMSExplorer/AMSExplorer.csproj

@@ -7,13 +7,13 @@
 	<ApplicationHighDpiMode>SystemAware</ApplicationHighDpiMode>
 	<ForceDesignerDpiUnaware>true</ForceDesignerDpiUnaware>
     <StartupObject>AMSExplorer.Program</StartupObject>
-    <Version>5.8.2.0</Version>
+    <Version>5.8.3.0</Version>
     <ApplicationIcon>Azure Explorer_ico.ico</ApplicationIcon>
     <Description></Description>
     <Copyright>Copyright © 2023</Copyright>
     <Company>$(Authors)Microsoft</Company>
-    <AssemblyVersion>5.8.2.0</AssemblyVersion>
-    <FileVersion>5.8.2.0</FileVersion>
+    <AssemblyVersion>5.8.3.0</AssemblyVersion>
+    <FileVersion>5.8.3.0</FileVersion>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <PackageIcon>Azure Explorer.png</PackageIcon>
     <PackageIconUrl />

AMSExplorer/Mainform.cs

@@ -45,6 +45,7 @@
 using System.Reflection;
 using System.Security.Cryptography.X509Certificates;
 using System.Text;
+using System.Text.RegularExpressions;
 using System.Threading;
 using System.Threading.Tasks;
 using System.Timers;
@@ -192,6 +193,7 @@ public Mainform(string[] args)
             // MKIO Connection            
             MKIOclient = null;
 
+            dictionary.Add("UseMKIOConnection", _amsClient.useMKIOConnection.ToString());
             if (_amsClient.useMKIOConnection)
             {
                 try
@@ -311,47 +313,59 @@ public Mainform(string[] args)
                 {
                     // no extension but account still active
                     MessageBox.Show($"Your account will expire on {retirementDate.ToString("D", culture)}.\r\n\r\nAll live events and streaming endpoints will be stopped. After this date, no new content can be created.\r\nMigrate to another service as soon as possible.\r\nYour account will be read-only after this date and will be deleted 90 days after.", "Account active BUT", MessageBoxButtons.OK, MessageBoxIcon.Warning);
+                    Telemetry.TrackEvent("Retirement_Account_Enabled");
                 }
                 else
                 {
                     // account is disabled
                     var dif = retirementDate.AddDays(90) - DateTime.Now;
                     MessageBox.Show($"Your account was deactivated on {retirementDate.ToString("D", culture)}.\r\n\r\nNo new content can be created.\r\nMigrate to another service as soon as possible.\r\nYour account is read-only and will be deleted in {dif.Days} days.", "Account disabled", MessageBoxButtons.OK, MessageBoxIcon.Warning);
+                    Telemetry.TrackEvent("Retirement_Account_Disabled");
                 }
 
-                if (retirementDate < new DateTime(2024, 8, 1))
+                if (retirementDate < new DateTime(2024, 7, 31))
                 {
                     // we can propose an extension
+                    Telemetry.TrackEvent("Retirement_Extension_Proposed");
                     if (MessageBox.Show($"Your AMS account is eligible to a one-time extension.\r\n\r\nIf your account is still active, extend now to avoid interruptions.\r\nIf your account is already deactivated, you will need to manually start your streaming endpoints if they are stopped. It may take up to an hour before you can stream your content again and see the new account expiration time.\r\n\r\nDo you want to extend your account for an additional 30 days?", "One time extension", MessageBoxButtons.YesNo, MessageBoxIcon.Question)
                     == DialogResult.Yes)
                     {
+                        Telemetry.TrackEvent("Retirement_Extension_AcceptedByUser");
                         try
                         {
                             var returnCode = restTransformClient.ExtendAccount();
                             if (returnCode == HttpStatusCode.Accepted)
                             {
                                 MessageBox.Show("Account extended for 30 days.", "Account extended", MessageBoxButtons.OK, MessageBoxIcon.Information);
+                                Telemetry.TrackEvent("Retirement_Extension_Execution_Success");
                                 retirementDate = (DateTime)restTransformClient.GetAccountRetirementDate();
                             }
                             else
                             {
+                                Dictionary<string, string> dictionaryError = new()
+                                {
+                                    { "Error_code", returnCode.ToString() }
+                                };
+                                Telemetry.TrackEvent("Retirement_Extension_Execution_Error", dictionaryError);
                                 MessageBox.Show($"Account extension error code {returnCode.ToString()}.", "Account extension", MessageBoxButtons.OK, MessageBoxIcon.Warning);
                             }
                         }
 
                         catch (Exception ex)
                         {
                             MessageBox.Show("Account extension error : " + ex.Message, "Account extension", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                            Telemetry.TrackException(ex);
                         }
 
                     }
                 }
                 TextBoxLogWriteLine("The retirement date for this account is {0}.", retirementDate.ToString("d"), true); // Warning
+                dictionary.Add("RetirementAccountDate", retirementDate.ToString("d", culture));
             }
 
-            catch
+            catch (Exception ex)
             {
-
+                Telemetry.TrackException(ex);
             }
 
             string mes = @"To use Azure CLI with this account, use a syntax like : ""az ams asset list -g {0} -a {1}""";

AllReleaseNotes.md

@@ -1,11 +1,10 @@
 # AMSE release notes history
 
-## Version 5.8.2.0 (June 13th, 2024) brings the following features and improvements
+## Version 5.8.3.0 (June 14th, 2024) brings the following features and improvements
 
 * Support for AMS account expiration date display. User can request a one month extension
 * Updates to MK.IO (SDK, endpoint, name, logo...)
 * Nugget packages and documentation update
-* Note : the MSI is not signed as the process for the signature of binaries has changed at Microsoft
 
 ## Version 5.8.1.0 (December 8th, 2023) brings the following features and improvements
 

ReleaseNotes.md

@@ -1,6 +1,5 @@
-# Version 5.8.2.0 (June 13th, 2024) brings the following features and improvements
+# Version 5.8.3.0 (June 14th, 2024) brings the following features and improvements
 
 * Support for AMS account expiration date display. User can request a one month extension
 * Updates to MK.IO (SDK, endpoint, name, logo...)
 * Nugget packages and documentation update
-* Note : the MSI is not signed as the process for the signature of binaries has changed at Microsoft

Setup/Setup.vdproj

@@ -229,15 +229,15 @@
         {
         "Name" = "8:Microsoft Visual Studio"
         "ProductName" = "8:Azure Media Services Explorer"
-        "ProductCode" = "8:{90D16C3D-D2C3-4B21-9B0C-F352D14A9A95}"
-        "PackageCode" = "8:{1482EF6F-2B62-4CAB-9ACA-6D1B613401C8}"
+        "ProductCode" = "8:{08CB3739-9C90-4F41-B3F2-A44DA8228ACE}"
+        "PackageCode" = "8:{D79154E0-33F3-49FC-A5BE-FBFE34BA35D4}"
         "UpgradeCode" = "8:{5145C7B3-B64F-42CA-A111-45E636E02027}"
         "AspNetVersion" = "8:4.0.30319.0"
         "RestartWWWService" = "11:FALSE"
         "RemovePreviousVersions" = "11:TRUE"
         "DetectNewerInstalledVersion" = "11:TRUE"
         "InstallAllUsers" = "11:TRUE"
-        "ProductVersion" = "8:5.8.2"
+        "ProductVersion" = "8:5.8.3"
         "Manufacturer" = "8:Microsoft Corporation"
         "ARPHELPTELEPHONE" = "8:"
         "ARPHELPLINK" = "8:"

winget/1-update.cmd

@@ -0,0 +1 @@
+wingetcreate update --urls https://github.com/Azure/Azure-Media-Services-Explorer/releases/download/v5.8.2.0/AMSExplorerSetup_v5.8.2.msi --version 5.8.2 Microsoft.AzureMediaServicesExplorer

winget/2-validate.cmd

@@ -0,0 +1 @@
+winget validate --manifest C:\Repos\Azure-Media-Services-Explorer\winget\manifests\m\Microsoft\AzureMediaServicesExplorer\5.8.2

winget/3-testpackage.cmd

@@ -0,0 +1 @@
+winget install -m C:\Repos\Azure-Media-Services-Explorer\winget\manifests\m\Microsoft\AzureMediaServicesExplorer\5.8.2

winget/3-winget-submit.cmd → winget/4-submit.cmd

@@ -1 +1 @@
-wingetcreate submit C:\Repos\Azure-Media-Services-Explorer\winget\manifests\m\Microsoft\AzureMediaServicesExplorer\5.8.1
+wingetcreate submit C:\Repos\Azure-Media-Services-Explorer\winget\manifests\m\Microsoft\AzureMediaServicesExplorer\5.8.2

winget/manifests/m/Microsoft/AzureMediaServicesExplorer/5.8.2/Microsoft.AzureMediaServicesExplorer.installer.yaml

@@ -0,0 +1,18 @@
+# Created using wingetcreate 1.6.1.0
+# yaml-language-server: $schema=https://aka.ms/winget-manifest.installer.1.6.0.schema.json
+
+PackageIdentifier: Microsoft.AzureMediaServicesExplorer
+PackageVersion: 5.8.2
+InstallerLocale: en-US
+InstallerType: msi
+Dependencies:
+  PackageDependencies:
+  - PackageIdentifier: Microsoft.DotNet.DesktopRuntime.7
+  - PackageIdentifier: Microsoft.EdgeWebView2Runtime
+ProductCode: '{90D16C3D-D2C3-4B21-9B0C-F352D14A9A95}'
+Installers:
+- Architecture: x64
+  InstallerUrl: https://github.com/Azure/Azure-Media-Services-Explorer/releases/download/v5.8.2.0/AMSExplorerSetup_v5.8.2.msi
+  InstallerSha256: 1AA368B1B223C8E680C5E0477D78BA8292AD75ECB8FC501CD569A3628D36AD36
+ManifestType: installer
+ManifestVersion: 1.6.0

winget/manifests/m/Microsoft/AzureMediaServicesExplorer/5.8.2/Microsoft.AzureMediaServicesExplorer.locale.en-US.yaml

@@ -0,0 +1,13 @@
+# Created using wingetcreate 1.6.1.0
+# yaml-language-server: $schema=https://aka.ms/winget-manifest.defaultLocale.1.6.0.schema.json
+
+PackageIdentifier: Microsoft.AzureMediaServicesExplorer
+PackageVersion: 5.8.2
+PackageLocale: en-US
+Publisher: Microsoft
+PublisherSupportUrl: https://github.com/Azure/Azure-Media-Services-Explorer/issues
+PackageName: Azure Media Services Explorer
+License: Apache License
+ShortDescription: Azure Media Services Explorer is a test tool for Windows that provides upload, download, process, encode, package, and stream assets and live events with Azure Media Services using the AMS .Net SDK and the REST API. Source code is also provided on GitHub.
+ManifestType: defaultLocale
+ManifestVersion: 1.6.0

winget/manifests/m/Microsoft/AzureMediaServicesExplorer/5.8.2/Microsoft.AzureMediaServicesExplorer.yaml

@@ -0,0 +1,8 @@
+# Created using wingetcreate 1.6.1.0
+# yaml-language-server: $schema=https://aka.ms/winget-manifest.version.1.6.0.schema.json
+
+PackageIdentifier: Microsoft.AzureMediaServicesExplorer
+PackageVersion: 5.8.2
+DefaultLocale: en-US
+ManifestType: version
+ManifestVersion: 1.6.0