Skip to content
This repository has been archived by the owner on Jan 23, 2025. It is now read-only.

Commit

Permalink
Merge pull request #156 from Azure/netcore6
Browse files Browse the repository at this point in the history
AMSE Update to v 5.5.0.0
  • Loading branch information
xpouyat authored Jun 3, 2022
2 parents 5f36a26 + 139f0df commit da06245
Show file tree
Hide file tree
Showing 31 changed files with 4,904 additions and 3,223 deletions.
1 change: 0 additions & 1 deletion AMSExplorer/AMSClient/AMSClientV3.cs
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,6 @@ public async Task<AzureMediaServicesClient> ConnectAndGetNewClientV3Async(Form c
.ConfigureAwait(false);

}

credentials = new TokenCredentials(authResult.AccessToken, "Bearer");

// Getting Media Services account...
Expand Down
28 changes: 17 additions & 11 deletions AMSExplorer/AMSExplorer.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,16 @@

<PropertyGroup>
<OutputType>WinExe</OutputType>
<TargetFrameworks>net5.0-windows</TargetFrameworks>
<TargetFramework>net6.0-windows</TargetFramework>
<UseWindowsForms>true</UseWindowsForms>
<StartupObject>AMSExplorer.Program</StartupObject>
<Version>5.4.6.0</Version>
<Version>5.5.0.0</Version>
<ApplicationIcon>Azure Explorer_ico.ico</ApplicationIcon>
<Description></Description>
<Copyright>Copyright © 2022</Copyright>
<Company>$(Authors)Microsoft</Company>
<AssemblyVersion>5.4.7.0</AssemblyVersion>
<FileVersion>5.4.7.0</FileVersion>
<AssemblyVersion>5.5.0.0</AssemblyVersion>
<FileVersion>5.5.0.0</FileVersion>
<AppDesignerFolder>Properties</AppDesignerFolder>
<PackageIcon>Azure Explorer.png</PackageIcon>
<PackageIconUrl />
Expand Down Expand Up @@ -88,21 +88,24 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="DocumentFormat.OpenXml" Version="2.15.0" />
<PackageReference Include="DocumentFormat.OpenXml" Version="2.16.0" />
<PackageReference Include="Microsoft.ApplicationInsights" Version="2.20.0" />
<PackageReference Include="Microsoft.ApplicationInsights.WindowsServer" Version="2.20.0" />
<PackageReference Include="Microsoft.Azure.Management.Media" Version="5.0.0" />
<PackageReference Include="Microsoft.Azure.Management.Media" Version="6.0.0" />
<PackageReference Include="Microsoft.Azure.Management.ResourceManager" Version="3.15.1-preview" />
<PackageReference Include="Microsoft.Azure.Management.Storage" Version="23.1.0" />
<PackageReference Include="Microsoft.Azure.Management.Storage" Version="24.0.0" />
<PackageReference Include="Microsoft.Azure.Storage.DataMovement" Version="2.0.4" />
<PackageReference Include="Microsoft.Identity.Client" Version="4.40.0" />
<PackageReference Include="Microsoft.Rest.ClientRuntime" Version="2.3.23" />
<PackageReference Include="Microsoft.Identity.Client" Version="4.44.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.1072.54" />
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.15.1" />
<PackageReference Include="Microsoft.Web.WebView2" Version="1.0.1210.39" />
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.18.0" />
</ItemGroup>

<ItemGroup>
<Compile Update="Forms-DynamicEncryption\DRM_CreateOrSelectCKPolicy.cs">
<SubType>Form</SubType>
</Compile>
<Compile Update="Forms-Login\CreateAccount.cs">
<SubType>Form</SubType>
</Compile>
Expand All @@ -114,6 +117,9 @@
<AutoGen>True</AutoGen>
<DependentUpon>Bitmaps.resx</DependentUpon>
</Compile>
<Compile Update="ListViews\ListViewContentKeyPolicies.cs">
<SubType>Component</SubType>
</Compile>
<Compile Update="Properties\Resources.Designer.cs">
<DesignTime>True</DesignTime>
<AutoGen>True</AutoGen>
Expand Down
2 changes: 1 addition & 1 deletion AMSExplorer/Constants.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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 = "97.0.1072.54";
public const string Webview2MinVersion = "101.0.1210.39";

public const string GitHubAMSEVersionPrimaryV3 = "https://amsexplorer.azureedge.net/release/versionv3.json";
public const string GitHubAMSEVersionSecondaryV3 = "https://raw.githubusercontent.com/Azure/Azure-Media-Services-Explorer/main/versionv3.json";
Expand Down
94 changes: 94 additions & 0 deletions AMSExplorer/Forms-DynamicEncryption/DRM_CreateOrSelectCKPolicy.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,94 @@
//----------------------------------------------------------------------------------------------
// Copyright 2022 Microsoft Corporation
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
//---------------------------------------------------------------------------------------------

using System;
using System.Windows.Forms;

namespace AMSExplorer
{
public partial class DRM_CreateOrSelectCKPolicy : Form
{
private AMSClientV3 _client;

public bool CreateNewPolicy => radioButtonCreate.Checked;

public string PolicyNameToUse
{
get
{
if (!CreateNewPolicy)
return listViewContentKeyPolicies.GetSelectedContentKeyPolicy.Name;
else
return textBoxPolicyName.Text;
}
}


public DRM_CreateOrSelectCKPolicy(AMSClientV3 client)
{
InitializeComponent();
Icon = Bitmaps.Azure_Explorer_ico;
_client = client;

}

private void DRM_CreateOrSelectCKPolicy_Load(object sender, EventArgs e)
{
// DpiUtils.InitPerMonitorDpi(this);
}


private void DRM_CreateOrSelectCKPolicy_DpiChanged(object sender, DpiChangedEventArgs e)
{
// DpiUtils.UpdatedSizeFontAfterDPIChange(labelstep, e);
}

private void DRM_CreateOrSelectCKPolicy_Shown(object sender, EventArgs e)
{
Telemetry.TrackPageView(this.Name);
UpdateStatusButtonOk();

textBoxPolicyName.Text = "keypolicy-" + Program.GetUniqueness();
}

private async void radioButtonSelect_CheckedChanged(object sender, EventArgs e)
{
listViewContentKeyPolicies.Enabled = radioButtonSelect.Checked;
textBoxPolicyName.Enabled = !radioButtonSelect.Checked;

if (radioButtonSelect.Checked)
{
// let's list the asset
await listViewContentKeyPolicies.LoadContentKeyPoliciesAsync(_client);
}
else
{
}
UpdateStatusButtonOk();
}

private void listViewContentKeyPolicies_SelectedIndexChanged(object sender, EventArgs e)
{
UpdateStatusButtonOk();
}


private void UpdateStatusButtonOk(bool additionalCondition = true)
{
buttonOk.Enabled = (radioButtonCreate.Checked || (radioButtonSelect.Checked && listViewContentKeyPolicies.SelectedItems.Count > 0)) && additionalCondition;
}
}
}

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit da06245

Please sign in to comment.