Merge pull request #166 from Azure/dev

Dev
Azure · Apr 4, 2023 · ed4182e · ed4182e
2 parents 0efb6da + 3b94940
commit ed4182e
Show file tree

Hide file tree

Showing 27 changed files with 2,764 additions and 2,558 deletions.
diff --git a/AMSExplorer/AMSClient/AMSClientV3.cs b/AMSExplorer/AMSClient/AMSClientV3.cs
@@ -63,7 +63,7 @@ public AMSClientV3(AzureEnvironment myEnvironment, string azureSubscriptionId, C
                   .WithAuthority(environment.AADSettings.AuthenticationEndpoint + string.Format("{0}", credentialsEntry.AadTenantId ?? "common"))
                   .WithDefaultRedirectUri()
                   //.WithRedirectUri("http://localhost")
-                  .WithBrokerPreview(true)
+                  .WithBroker(true)
                   .Build();
             }
             else // SP

diff --git a/AMSExplorer/AMSExplorer.csproj b/AMSExplorer/AMSExplorer.csproj
@@ -5,13 +5,13 @@
     <TargetFramework>net7.0-windows</TargetFramework>
     <UseWindowsForms>true</UseWindowsForms>
     <StartupObject>AMSExplorer.Program</StartupObject>
-    <Version>5.5.2.0</Version>
+    <Version>5.7.1.0</Version>
     <ApplicationIcon>Azure Explorer_ico.ico</ApplicationIcon>
     <Description></Description>
     <Copyright>Copyright © 2023</Copyright>
     <Company>$(Authors)Microsoft</Company>
-    <AssemblyVersion>5.7.0.0</AssemblyVersion>
-    <FileVersion>5.7.0.0</FileVersion>
+    <AssemblyVersion>5.7.1.0</AssemblyVersion>
+    <FileVersion>5.7.1.0</FileVersion>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <PackageIcon>Azure Explorer.png</PackageIcon>
     <PackageIconUrl />
@@ -90,7 +90,7 @@
   <ItemGroup>
     <PackageReference Include="Azure.Monitor.Query" Version="1.1.0" />
     <PackageReference Include="Azure.ResourceManager" Version="1.4.0" />
-    <PackageReference Include="Azure.ResourceManager.Media" Version="1.1.0" />
+    <PackageReference Include="Azure.ResourceManager.Media" Version="1.2.0" />
     <PackageReference Include="Azure.ResourceManager.Resources" Version="1.4.0" />
     <PackageReference Include="Azure.ResourceManager.Storage" Version="1.1.1" />
     <PackageReference Include="DocumentFormat.OpenXml" Version="2.19.0" />
@@ -100,11 +100,10 @@
     <PackageReference Include="Microsoft.Azure.Storage.DataMovement" Version="2.0.4" />
     <PackageReference Include="Microsoft.Extensions.Configuration" Version="7.0.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="7.0.0" />
-    <PackageReference Include="Microsoft.Identity.Client.Broker" Version="4.50.0-preview" />
-    <PackageReference Include="Microsoft.Identity.Client.NativeInterop" Version="0.13.6" />
+    <PackageReference Include="Microsoft.Identity.Client.Broker" Version="4.52.0" />
     <PackageReference Include="Microsoft.Rest.ClientRuntime" Version="2.3.24" />
     <PackageReference Include="Microsoft.Rest.ClientRuntime.Azure.Authentication" Version="2.4.1" />
-    <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.1587.40" />
+    <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.1661.34" />
     <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.27.0" />
     <PackageReference Include="System.Linq.Async.Queryable" Version="6.0.1" />
   </ItemGroup>

diff --git a/AMSExplorer/AssetInformation.cs b/AMSExplorer/AssetInformation.cs
@@ -2629,7 +2629,7 @@ private async Task DoCreateTexttrackFromBlobAsync()
                                     {
                                         // TODO2023
                                         // this properties should be written but v1 of the SDK has this constraint
-                                        //LanguageCode = form.LanguageCode,
+                                        // LanguageCode = form.LanguageCode,
                                         DisplayName = form.LanguageDisplayName,
                                         FileName = bl.Name,
                                         PlayerVisibility = form.VisibleInPlayer ? PlayerVisibility.Visible : PlayerVisibility.Hidden,

diff --git a/AMSExplorer/BatchUploadFrame2.Designer.cs b/AMSExplorer/BatchUploadFrame2.Designer.cs
diff --git a/AMSExplorer/BatchUploadFrame2.cs b/AMSExplorer/BatchUploadFrame2.cs
@@ -119,7 +119,7 @@ public BatchUploadFrame2(string BatchFolderPath, bool BatchProcessFiles, bool Ba
             }
         }
 
-        private async void BathUploadFrame2_LoadAsync(object sender, EventArgs e)
+        private void BathUploadFrame2_Load(object sender, EventArgs e)
         {
             // DpiUtils.InitPerMonitorDpi(this);
 

diff --git a/AMSExplorer/Constants.cs b/AMSExplorer/Constants.cs
@@ -25,7 +25,7 @@ public static class Constants
         public const string Webview2Installer = "https://go.microsoft.com/fwlink/p/?LinkId=2124703";
         public const string Webview2RegPath64 = "SOFTWARE\\WOW6432Node\\Microsoft\\EdgeUpdate\\Clients\\{F3017226-FE2A-4295-8BDF-00C3A9A7E4C5}";
         public const string Webview2RegPath32 = "SOFTWARE\\Microsoft\\EdgeUpdate\\Clients\\{F3017226-FE2A-4295-8BDF-00C3A9A7E4C5}";
-        public const string Webview2MinVersion = "110.0.1587.40";
+        public const string Webview2MinVersion = "111.0.1661.34";
 
         public const string GitHubAMSEVersionPrimaryV3 = "https://raw.githubusercontent.com/Azure/Azure-Media-Services-Explorer/main/versionv3.json";
         public const string GitHubAMSEVersionSecondaryV3 = "https://amsexplorer.azureedge.net/release/versionv3.json";

diff --git a/AMSExplorer/DataGrid/DataGridViewAssets.cs b/AMSExplorer/DataGrid/DataGridViewAssets.cs
@@ -18,7 +18,6 @@
 using Azure;
 using Azure.ResourceManager.Media;
 using Azure.ResourceManager.Media.Models;
-using Microsoft.Rest.Azure;
 using Microsoft.Rest.Azure.OData;
 using System;
 using System.Collections.Generic;
@@ -64,7 +63,6 @@ public class DataGridViewAssets : DataGridView
         private static readonly Bitmap Bluestreamimage = Program.MakeBlue(Streaminglocatorimage);
         private static readonly Bitmap BitmapCancel = Program.MakeRed(Bitmaps.cancel);
         private static BindingList<AssetEntry> _MyObservAssetV3;
-        private IPage<MediaAssetResource> firstpage;
         private SynchronizationContext _syncontext;
 
         public int CurrentPage => _currentPageNumber;
@@ -83,7 +81,6 @@ public SearchObject SearchInName
             set => _searchinname = value;
         }
 
-
         public string StateFilter
         {
             get => _statefilter;
@@ -618,8 +615,6 @@ Equals	Greater than	Less Than	Ascending	Descending
             BeginInvoke(new Action(() => FindForm().Cursor = Cursors.Default));
         }
 
-
-
         /// <summary>
         /// Returns a bitmap for publication
         /// </summary>
-Original file line number
+Diff line change
@@ Expand Up @@
                 }
             }
-            private async void BathUploadFrame2_LoadAsync(object sender, EventArgs e)
+            private void BathUploadFrame2_Load(object sender, EventArgs e)
             {
                 // DpiUtils.InitPerMonitorDpi(this);
@@ Expand Down @@