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

Next public release
Azure · Feb 6, 2015 · b0acb0c · b0acb0c
2 parents 0dbc686 + 913c2bf
commit b0acb0c
Show file tree

Hide file tree

Showing 36 changed files with 3,794 additions and 1,370 deletions.
diff --git a/AMSExplorer/AMSExplorer.csproj b/AMSExplorer/AMSExplorer.csproj
@@ -108,6 +108,10 @@
     <Reference Include="System.Configuration" />
     <Reference Include="System.Core" />
     <Reference Include="System.Data.Services.Client" />
+    <Reference Include="System.IdentityModel" />
+    <Reference Include="System.IdentityModel.Tokens.Jwt">
+      <HintPath>..\packages\System.IdentityModel.Tokens.Jwt.4.0.1\lib\net45\System.IdentityModel.Tokens.Jwt.dll</HintPath>
+    </Reference>
     <Reference Include="System.Net" />
     <Reference Include="System.Runtime.Serialization" />
     <Reference Include="System.Security" />
@@ -129,6 +133,18 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="AddDynamicEncryptionFrame2.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="AddDynamicEncryptionFrame2.Designer.cs">
+      <DependentUpon>AddDynamicEncryptionFrame2.cs</DependentUpon>
+    </Compile>
+    <Compile Include="AddDynamicEncryptionFrame3_AESKeyConfig.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="AddDynamicEncryptionFrame3_AESKeyConfig.Designer.cs">
+      <DependentUpon>AddDynamicEncryptionFrame3_AESKeyConfig.cs</DependentUpon>
+    </Compile>
     <Compile Include="Splash.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -192,17 +208,17 @@
       <DependentUpon>ProcessFromJobTemplate.cs</DependentUpon>
     </Compile>
     <Compile Include="ManagementREST.cs" />
-    <Compile Include="PlayReadyLicense.cs">
+    <Compile Include="AddDynamicEncryptionFrame4_PlayReadyLicense.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="PlayReadyLicense.Designer.cs">
-      <DependentUpon>PlayReadyLicense.cs</DependentUpon>
+    <Compile Include="AddDynamicEncryptionFrame4_PlayReadyLicense.Designer.cs">
+      <DependentUpon>AddDynamicEncryptionFrame4_PlayReadyLicense.cs</DependentUpon>
     </Compile>
-    <Compile Include="AddDynamicEncryption.cs">
+    <Compile Include="AddDynamicEncryptionFrame1.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="AddDynamicEncryption.Designer.cs">
-      <DependentUpon>AddDynamicEncryption.cs</DependentUpon>
+    <Compile Include="AddDynamicEncryptionFrame1.Designer.cs">
+      <DependentUpon>AddDynamicEncryptionFrame1.cs</DependentUpon>
     </Compile>
     <Compile Include="CreateStreamingEndpoint.cs">
       <SubType>Form</SubType>
@@ -211,11 +227,11 @@
       <DependentUpon>CreateStreamingEndpoint.cs</DependentUpon>
     </Compile>
     <Compile Include="DynamicEncryption.cs" />
-    <Compile Include="PlayReadyExternalServer.cs">
+    <Compile Include="AddDynamicEncryptionFrame3_PlayReadyKeyConfig.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="PlayReadyExternalServer.Designer.cs">
-      <DependentUpon>PlayReadyExternalServer.cs</DependentUpon>
+    <Compile Include="AddDynamicEncryptionFrame3_PlayReadyKeyConfig.Designer.cs">
+      <DependentUpon>AddDynamicEncryptionFrame3_PlayReadyKeyConfig.cs</DependentUpon>
     </Compile>
     <Compile Include="StreamingEndpointInformation.cs">
       <SubType>Form</SubType>
@@ -363,6 +379,12 @@
     <Compile Include="ImportFromAzureStorage.Designer.cs">
       <DependentUpon>ImportFromAzureStorage.cs</DependentUpon>
     </Compile>
+    <EmbeddedResource Include="AddDynamicEncryptionFrame2.resx">
+      <DependentUpon>AddDynamicEncryptionFrame2.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="AddDynamicEncryptionFrame3_AESKeyConfig.resx">
+      <DependentUpon>AddDynamicEncryptionFrame3_AESKeyConfig.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="Splash.resx">
       <DependentUpon>Splash.cs</DependentUpon>
       <SubType>Designer</SubType>
@@ -397,17 +419,17 @@
     <EmbeddedResource Include="ProcessFromJobTemplate.resx">
       <DependentUpon>ProcessFromJobTemplate.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="PlayReadyLicense.resx">
-      <DependentUpon>PlayReadyLicense.cs</DependentUpon>
+    <EmbeddedResource Include="AddDynamicEncryptionFrame4_PlayReadyLicense.resx">
+      <DependentUpon>AddDynamicEncryptionFrame4_PlayReadyLicense.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="AddDynamicEncryption.resx">
-      <DependentUpon>AddDynamicEncryption.cs</DependentUpon>
+    <EmbeddedResource Include="AddDynamicEncryptionFrame1.resx">
+      <DependentUpon>AddDynamicEncryptionFrame1.cs</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="CreateStreamingEndpoint.resx">
       <DependentUpon>CreateStreamingEndpoint.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="PlayReadyExternalServer.resx">
-      <DependentUpon>PlayReadyExternalServer.cs</DependentUpon>
+    <EmbeddedResource Include="AddDynamicEncryptionFrame3_PlayReadyKeyConfig.resx">
+      <DependentUpon>AddDynamicEncryptionFrame3_PlayReadyKeyConfig.cs</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="StreamingEndpointInformation.resx">
       <DependentUpon>StreamingEndpointInformation.cs</DependentUpon>
@@ -489,6 +511,9 @@
     <Content Include="BitmapsPNG\modetaskjob1.png" />
     <Content Include="BitmapsPNG\modetaskjob2.png" />
     <Content Include="BitmapsPNG\modetaskjob3.png" />
+    <Content Include="Configurations\PlayReadyCustomAttributes.xml">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <Content Include="Configurations\CrossDomainPolicy.xml">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>