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 #39 from Azure/next-public-release
Browse files Browse the repository at this point in the history 
Next public release
  • Loading branch information
@xpouyat
xpouyat committed Mar 18, 2015
2 parents 1f83f28 + b934cdc commit ec92a3f
Show file tree
Hide file tree
Showing 27 changed files with 2,944 additions and 965 deletions.
20 changes: 16 additions & 4 deletions AMSExplorer/AMSExplorer.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,9 +88,9 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Microsoft.WindowsAzure.ConfigurationManager.2.0.3\lib\net40\Microsoft.WindowsAzure.Configuration.dll</HintPath>
</Reference>
<Reference Include="Microsoft.WindowsAzure.MediaServices.Client, Version=3.1.0.1, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<Reference Include="Microsoft.WindowsAzure.MediaServices.Client, Version=3.1.0.2, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\windowsazure.mediaservices.3.1.0.1\lib\net45\Microsoft.WindowsAzure.MediaServices.Client.dll</HintPath>
<HintPath>..\packages\windowsazure.mediaservices.3.1.0.2\lib\net45\Microsoft.WindowsAzure.MediaServices.Client.dll</HintPath>
</Reference>
<Reference Include="Microsoft.WindowsAzure.MediaServices.Client.Extensions, Version=3.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
Expand All @@ -109,9 +109,9 @@
<Reference Include="System.Core" />
<Reference Include="System.Data.Services.Client" />
<Reference Include="System.IdentityModel" />
<Reference Include="System.IdentityModel.Tokens.Jwt, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<Reference Include="System.IdentityModel.Tokens.Jwt, Version=4.0.2.28, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\System.IdentityModel.Tokens.Jwt.4.0.1\lib\net45\System.IdentityModel.Tokens.Jwt.dll</HintPath>
<HintPath>..\packages\System.IdentityModel.Tokens.Jwt.4.0.2.202250711\lib\net45\System.IdentityModel.Tokens.Jwt.dll</HintPath>
</Reference>
<Reference Include="System.Net" />
<Reference Include="System.Runtime.Serialization" />
Expand Down Expand Up @@ -146,12 +146,21 @@
<Compile Include="AddDynamicEncryptionFrame2_AESKeyConfig.Designer.cs">
<DependentUpon>AddDynamicEncryptionFrame2_AESKeyConfig.cs</DependentUpon>
</Compile>
<Compile Include="CopyAsset.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="CopyAsset.Designer.cs">
<DependentUpon>CopyAsset.cs</DependentUpon>
</Compile>
<Compile Include="CreateTestToken.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="CreateTestToken.Designer.cs">
<DependentUpon>CreateTestToken.cs</DependentUpon>
</Compile>
<Compile Include="GridTransfer.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="Splash.cs">
<SubType>Form</SubType>
</Compile>
Expand Down Expand Up @@ -392,6 +401,9 @@
<EmbeddedResource Include="AddDynamicEncryptionFrame2_AESKeyConfig.resx">
<DependentUpon>AddDynamicEncryptionFrame2_AESKeyConfig.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="CopyAsset.resx">
<DependentUpon>CopyAsset.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="CreateTestToken.resx">
<DependentUpon>CreateTestToken.cs</DependentUpon>
</EmbeddedResource>
Expand Down
85 changes: 55 additions & 30 deletions AMSExplorer/AMSLogin.Designer.cs
View file

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

Loading

0 comments on commit ec92a3f

Please sign in to comment.