Merge pull request #35 from Azure/next-public-release

Next public release

AMSExplorer.sln

@@ -1,14 +1,11 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 2013
-VisualStudioVersion = 12.0.30501.0
+VisualStudioVersion = 12.0.31101.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AMSExplorer", "AMSExplorer\AMSExplorer.csproj", "{67573AA5-0316-4C90-8CE4-93A950CD0A86}"
 EndProject
 Project("{6141683F-8A12-4E36-9623-2EB02B2C2303}") = "SetupAMSExplorer", "SetupAMSExplorer\SetupAMSExplorer.isproj", "{FEC674B1-FBE6-4D9B-8F5E-7AE13F881F37}"
-	ProjectSection(ProjectDependencies) = postProject
-		{67573AA5-0316-4C90-8CE4-93A950CD0A86} = {67573AA5-0316-4C90-8CE4-93A950CD0A86}
-	EndProjectSection
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

AMSExplorer/AMSExplorer.csproj

@@ -109,7 +109,8 @@
     <Reference Include="System.Core" />
     <Reference Include="System.Data.Services.Client" />
     <Reference Include="System.IdentityModel" />
-    <Reference Include="System.IdentityModel.Tokens.Jwt">
+    <Reference Include="System.IdentityModel.Tokens.Jwt, Version=4.0.0.0, 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>
     </Reference>
     <Reference Include="System.Net" />
@@ -133,17 +134,23 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="AddDynamicEncryptionFrame2.cs">
+    <Compile Include="AddDynamicEncryptionFrame3.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="AddDynamicEncryptionFrame2.Designer.cs">
-      <DependentUpon>AddDynamicEncryptionFrame2.cs</DependentUpon>
+    <Compile Include="AddDynamicEncryptionFrame3.Designer.cs">
+      <DependentUpon>AddDynamicEncryptionFrame3.cs</DependentUpon>
     </Compile>
-    <Compile Include="AddDynamicEncryptionFrame3_AESKeyConfig.cs">
+    <Compile Include="AddDynamicEncryptionFrame2_AESKeyConfig.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="AddDynamicEncryptionFrame3_AESKeyConfig.Designer.cs">
-      <DependentUpon>AddDynamicEncryptionFrame3_AESKeyConfig.cs</DependentUpon>
+    <Compile Include="AddDynamicEncryptionFrame2_AESKeyConfig.Designer.cs">
+      <DependentUpon>AddDynamicEncryptionFrame2_AESKeyConfig.cs</DependentUpon>
+    </Compile>
+    <Compile Include="CreateTestToken.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="CreateTestToken.Designer.cs">
+      <DependentUpon>CreateTestToken.cs</DependentUpon>
     </Compile>
     <Compile Include="Splash.cs">
       <SubType>Form</SubType>
@@ -227,11 +234,11 @@
       <DependentUpon>CreateStreamingEndpoint.cs</DependentUpon>
     </Compile>
     <Compile Include="DynamicEncryption.cs" />
-    <Compile Include="AddDynamicEncryptionFrame3_PlayReadyKeyConfig.cs">
+    <Compile Include="AddDynamicEncryptionFrame2_PlayReadyKeyConfig.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="AddDynamicEncryptionFrame3_PlayReadyKeyConfig.Designer.cs">
-      <DependentUpon>AddDynamicEncryptionFrame3_PlayReadyKeyConfig.cs</DependentUpon>
+    <Compile Include="AddDynamicEncryptionFrame2_PlayReadyKeyConfig.Designer.cs">
+      <DependentUpon>AddDynamicEncryptionFrame2_PlayReadyKeyConfig.cs</DependentUpon>
     </Compile>
     <Compile Include="StreamingEndpointInformation.cs">
       <SubType>Form</SubType>
@@ -379,11 +386,14 @@
     <Compile Include="ImportFromAzureStorage.Designer.cs">
       <DependentUpon>ImportFromAzureStorage.cs</DependentUpon>
     </Compile>
-    <EmbeddedResource Include="AddDynamicEncryptionFrame2.resx">
-      <DependentUpon>AddDynamicEncryptionFrame2.cs</DependentUpon>
+    <EmbeddedResource Include="AddDynamicEncryptionFrame3.resx">
+      <DependentUpon>AddDynamicEncryptionFrame3.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="AddDynamicEncryptionFrame2_AESKeyConfig.resx">
+      <DependentUpon>AddDynamicEncryptionFrame2_AESKeyConfig.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="AddDynamicEncryptionFrame3_AESKeyConfig.resx">
-      <DependentUpon>AddDynamicEncryptionFrame3_AESKeyConfig.cs</DependentUpon>
+    <EmbeddedResource Include="CreateTestToken.resx">
+      <DependentUpon>CreateTestToken.cs</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="Splash.resx">
       <DependentUpon>Splash.cs</DependentUpon>
@@ -428,8 +438,8 @@
     <EmbeddedResource Include="CreateStreamingEndpoint.resx">
       <DependentUpon>CreateStreamingEndpoint.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="AddDynamicEncryptionFrame3_PlayReadyKeyConfig.resx">
-      <DependentUpon>AddDynamicEncryptionFrame3_PlayReadyKeyConfig.cs</DependentUpon>
+    <EmbeddedResource Include="AddDynamicEncryptionFrame2_PlayReadyKeyConfig.resx">
+      <DependentUpon>AddDynamicEncryptionFrame2_PlayReadyKeyConfig.cs</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="StreamingEndpointInformation.resx">
       <DependentUpon>StreamingEndpointInformation.cs</DependentUpon>