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 #24 from Azure/dev
Browse files Browse the repository at this point in the history 
Dev
  • Loading branch information
@xpouyat
xpouyat committed Oct 30, 2014
2 parents 8e268b2 + 6605fbe commit 16b7d38
Show file tree
Hide file tree
Showing 244 changed files with 26,025 additions and 2,219,300 deletions.
51 changes: 36 additions & 15 deletions AMSExplorer/AMSExplorer.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,17 +65,17 @@
<Prefer32Bit>true</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="Microsoft.Data.Edm, Version=5.6.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<Reference Include="Microsoft.Data.Edm, Version=5.6.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Microsoft.Data.Edm.5.6.2\lib\net40\Microsoft.Data.Edm.dll</HintPath>
<HintPath>..\packages\Microsoft.Data.Edm.5.6.3\lib\net40\Microsoft.Data.Edm.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Data.OData, Version=5.6.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<Reference Include="Microsoft.Data.OData, Version=5.6.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Microsoft.Data.OData.5.6.2\lib\net40\Microsoft.Data.OData.dll</HintPath>
<HintPath>..\packages\Microsoft.Data.OData.5.6.3\lib\net40\Microsoft.Data.OData.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Data.Services.Client, Version=5.6.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<Reference Include="Microsoft.Data.Services.Client, Version=5.6.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Microsoft.Data.Services.Client.5.6.2\lib\net40\Microsoft.Data.Services.Client.dll</HintPath>
<HintPath>..\packages\Microsoft.Data.Services.Client.5.6.3\lib\net40\Microsoft.Data.Services.Client.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Office.Interop.Outlook, Version=15.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c, processorArchitecture=MSIL">
<EmbedInteropTypes>True</EmbedInteropTypes>
Expand All @@ -100,21 +100,21 @@
<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.0.0.7, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<Reference Include="Microsoft.WindowsAzure.MediaServices.Client, Version=3.0.0.8, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\windowsazure.mediaservices.3.0.0.7\lib\net40\Microsoft.WindowsAzure.MediaServices.Client.dll</HintPath>
<HintPath>..\packages\windowsazure.mediaservices.3.0.0.8\lib\net40\Microsoft.WindowsAzure.MediaServices.Client.dll</HintPath>
</Reference>
<Reference Include="Microsoft.WindowsAzure.MediaServices.Client.Extensions, Version=2.0.0.2, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<Reference Include="Microsoft.WindowsAzure.MediaServices.Client.Extensions, Version=2.0.0.3, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\windowsazure.mediaservices.extensions.2.0.0.2\lib\net40\Microsoft.WindowsAzure.MediaServices.Client.Extensions.dll</HintPath>
<HintPath>..\packages\windowsazure.mediaservices.extensions.2.0.0.3\lib\net40\Microsoft.WindowsAzure.MediaServices.Client.Extensions.dll</HintPath>
</Reference>
<Reference Include="Microsoft.WindowsAzure.Storage, Version=4.3.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\WindowsAzure.Storage.4.3.0\lib\net40\Microsoft.WindowsAzure.Storage.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Newtonsoft.Json.6.0.5\lib\net45\Newtonsoft.Json.dll</HintPath>
<HintPath>..\packages\Newtonsoft.Json.6.0.6\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Configuration" />
Expand All @@ -124,9 +124,9 @@
<Reference Include="System.Runtime.Serialization" />
<Reference Include="System.Security" />
<Reference Include="System.ServiceModel" />
<Reference Include="System.Spatial, Version=5.6.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<Reference Include="System.Spatial, Version=5.6.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\System.Spatial.5.6.2\lib\net40\System.Spatial.dll</HintPath>
<HintPath>..\packages\System.Spatial.5.6.3\lib\net40\System.Spatial.dll</HintPath>
</Reference>
<Reference Include="System.Web" />
<Reference Include="System.Web.Extensions" />
Expand All @@ -153,6 +153,12 @@
<Compile Include="AMSLogin.Designer.cs">
<DependentUpon>AMSLogin.cs</DependentUpon>
</Compile>
<Compile Include="ChangeEncodingRU.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="ChangeEncodingRU.Designer.cs">
<DependentUpon>ChangeEncodingRU.cs</DependentUpon>
</Compile>
<Compile Include="BatchUploadFrame2.cs">
<SubType>Form</SubType>
</Compile>
Expand All @@ -176,6 +182,13 @@
<Compile Include="DeleteProgram.Designer.cs">
<DependentUpon>DeleteProgram.cs</DependentUpon>
</Compile>
<Compile Include="AttachStorage.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="AttachStorage.Designer.cs">
<DependentUpon>AttachStorage.cs</DependentUpon>
</Compile>
<Compile Include="ManagementREST.cs" />
<Compile Include="PlayReadyLicense.cs">
<SubType>Form</SubType>
</Compile>
Expand All @@ -201,7 +214,7 @@
<Compile Include="StreamingEndpointInformation.Designer.cs">
<DependentUpon>StreamingEndpointInformation.cs</DependentUpon>
</Compile>
<Compile Include="origin.cs">
<Compile Include="StreamingEndpoint.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="Indexer.cs">
Expand Down Expand Up @@ -348,6 +361,9 @@
<EmbeddedResource Include="AMSLogin.resx">
<DependentUpon>AMSLogin.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="ChangeEncodingRU.resx">
<DependentUpon>ChangeEncodingRU.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="BatchUploadFrame2.resx">
<DependentUpon>BatchUploadFrame2.cs</DependentUpon>
</EmbeddedResource>
Expand All @@ -361,6 +377,9 @@
<EmbeddedResource Include="DeleteProgram.resx">
<DependentUpon>DeleteProgram.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="AttachStorage.resx">
<DependentUpon>AttachStorage.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="PlayReadyLicense.resx">
<DependentUpon>PlayReadyLicense.cs</DependentUpon>
</EmbeddedResource>
Expand Down Expand Up @@ -439,6 +458,8 @@
<EmbeddedResource Include="ImportFromAzureStorage.resx">
<DependentUpon>ImportFromAzureStorage.cs</DependentUpon>
</EmbeddedResource>
<Content Include="BitmapsPNG\8-12-2014-13-20-04.png" />
<Content Include="BitmapsPNG\Imagine.PNG" />
<Content Include="BitmapsPNG\media2.ico" />
<Content Include="BitmapsPNG\media2.png" />
<None Include="BitmapsPNG\MediaNew.png" />
Expand All @@ -447,7 +468,6 @@
<Content Include="BitmapsPNG\modetaskjob1.png" />
<Content Include="BitmapsPNG\modetaskjob2.png" />
<Content Include="BitmapsPNG\modetaskjob3.png" />
<Content Include="BitmapsPNG\xenio.png" />
<Content Include="Configurations\CrossDomainPolicy.xml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
Expand Down Expand Up @@ -523,6 +543,7 @@
<ItemGroup>
<Content Include="media2.ico" />
<Content Include="MediaNew.ico" />
<None Include="Resources\%24this.Icon.ico" />
<Content Include="WAMEPresetFiles\AAC Good Quality Audio.xml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
Expand Down
Loading

0 comments on commit 16b7d38

Please sign in to comment.