Skip to content

Commit

Permalink
Merge pull request #119 from Azure/dev
Browse files Browse the repository at this point in the history
3.3.0.0
  • Loading branch information
gtrifonov committed Jun 5, 2015
2 parents 33d336a + 07a536c commit 783bb8a
Show file tree
Hide file tree
Showing 60 changed files with 1,475 additions and 373 deletions.
15 changes: 8 additions & 7 deletions .nuget/windowsazure.mediaservices.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
<metadata>
<id>windowsazure.mediaservices</id>
<version>3.2.0.0</version>
<version>3.3.0.0</version>
<title>Windows Azure Media Services .NET SDK</title>
<authors>Microsoft Corporation</authors>
<owners>Microsoft Corporation</owners>
<licenseUrl>http://go.microsoft.com/fwlink/?LinkID=272666&amp;clcid=0x409</licenseUrl>
<projectUrl>http://aka.ms/wamsmsdn</projectUrl>
<iconUrl>http://nimbuspmteam.blob.core.windows.net/nuget/Media Services 150.png</iconUrl>
<requireLicenseAcceptance>true</requireLicenseAcceptance>
<description>This package contains Windows Azure Media Service library 3.2.0.0 for .NET.</description>
<description>This package contains Windows Azure Media Service library 3.3.0.0 for .NET.</description>
<releaseNotes>For more information, please check our forum: http://social.msdn.microsoft.com/Forums/en-US/MediaServices/threads

For MSDN documentation please visit http://aka.ms/wamsmsdn
Expand All @@ -20,13 +20,14 @@ Source in GitHub at https://github.com/WindowsAzure/azure-sdk-for-media-services
<language>en-US</language>
<tags>windowsazureofficial, WindowsAzure, MediaServices, Microsoft,</tags>
<dependencies>
<dependency id="Microsoft.Data.OData" version="5.6.3" />
<dependency id="Microsoft.Data.Edm" version="5.6.3" />
<dependency id="Microsoft.Data.Services.Client" version="5.6.3" />
<dependency id="System.Spatial" version="5.6.3" />
<dependency id="Microsoft.Data.OData" version="5.6.4" />
<dependency id="Microsoft.Data.Edm" version="5.6.4" />
<dependency id="Microsoft.Data.Services.Client" version="5.6.4" />
<dependency id="System.Spatial" version="5.6.4" />
<dependency id="TransientFaultHandling.Core" version="5.1.1209.1" />
<dependency id="WindowsAzure.Storage" version="4.3.0.0" />
<dependency id="Newtonsoft.Json" version="6.0.6.0" />
<dependency id="Newtonsoft.Json" version="6.0.8" />
<dependency id="System.IdentityModel.Tokens.Jwt" version="4.0.2.205111437" />
</dependencies>
<references>
<reference file="Microsoft.WindowsAzure.MediaServices.Client.dll" />
Expand Down
97 changes: 49 additions & 48 deletions Readme.md
Original file line number Diff line number Diff line change
@@ -1,53 +1,54 @@
# Windows Azure Media Services SDK .NET 4.5

Windows Azure Media Services allows you to build a media distribution solution that can stream audio and video to Windows, iOS, Android, and other devices and platforms.To learn more, visit our [Developer Center](http://www.windowsazure.com/en-us/develop/media-services/).



Windows Azure Media Services allows you to build a media distribution solution that can stream audio and video to Windows, iOS, Android, and other devices and platforms.To learn more, visit our [Developer Center](http://www.windowsazure.com/en-us/develop/media-services/).

## Release Notes

Please read the latest note here: https://github.com/Azure/azure-sdk-for-media-services/releases.

## Getting Started

If you are new to Media Services, you can get started by following our [tutorials](http://www.windowsazure.com/en-us/develop/media-services/tutorials/get-started/). You could be able to bring media into Azure, encoded it, package it into stream-able format and make it available for streaming.

## Download Source Code

To get the source code of our SDKs and samples via **git** just type:

git clone https://github.com/WindowsAzure/azure-sdk-for-media-services.git
cd ./azure-sdk-for-media-services/

## .NET SDK

### Prerequisites

1. A Media Services account in a new or existing Windows Azure subscription. See the topic [How to Create a Media Services Account](http://www.windowsazure.com/en-us/manage/services/media-services/how-to-create-a-media-services-account/).
2. Operating Systems: Windows 7, Windows 2008 R2, or Windows 8.
3. .NET Framework 4.5.
4. Visual Studio 2012 or Visual Studio 2010 SP1 (Professional, Premium, Ultimate, or Express).

### Building and Referencing the SDK

To build sdk sources and tests type following commands:

cd ./azure-sdk-for-media-services/
msbuild ./SDK.Client.sln


### Running the Tests

This set of test allows you to verify Windows Azure Media Services .Net SDK functionality using your existing Windows Azure Media Services account. Please check out [Test instruction](https://github.com/WindowsAzure/azure-sdk-for-media-services/tree/master/test) on how to use it.


## Need Help?

Be sure to check out the Mobile Services [Developer Forum](http://social.msdn.microsoft.com/Forums/en-US/MediaServices/threads) if you are having trouble. The Media Services product team actively monitors the forum and will be more than happy to assist you.

## Contribute Code or Provide Feedback

If you would like to become an active contributor to this project please follow the instructions provided in [Windows Azure Projects Contribution Guidelines](http://windowsazure.github.com/guidelines.html).

If you encounter any bugs with the library please file an issue in the [Issues](https://github.com/WindowsAzure/azure-media-services/issues) section of the project.

## Learn More
[Windows Azure Media Services Developer Center](http://www.windowsazure.com/en-us/develop/media-services/)
## Getting Started

If you are new to Media Services, you can get started by following our [tutorials](http://www.windowsazure.com/en-us/develop/media-services/tutorials/get-started/). You could be able to bring media into Azure, encoded it, package it into stream-able format and make it available for streaming.

## Download Source Code

To get the source code of our SDKs and samples via **git** just type:

git clone https://github.com/WindowsAzure/azure-sdk-for-media-services.git
cd ./azure-sdk-for-media-services/

## .NET SDK

### Prerequisites

1. A Media Services account in a new or existing Windows Azure subscription. See the topic [How to Create a Media Services Account](http://www.windowsazure.com/en-us/manage/services/media-services/how-to-create-a-media-services-account/).
2. Operating Systems: Windows 7, Windows 2008 R2, or Windows 8.
3. .NET Framework 4.5.
4. Visual Studio 2012 or Visual Studio 2010 SP1 (Professional, Premium, Ultimate, or Express).

### Building and Referencing the SDK

To build sdk sources and tests type following commands:

cd ./azure-sdk-for-media-services/
msbuild ./SDK.Client.sln


### Running the Tests

This set of test allows you to verify Windows Azure Media Services .Net SDK functionality using your existing Windows Azure Media Services account. Please check out [Test instruction](https://github.com/WindowsAzure/azure-sdk-for-media-services/tree/master/test) on how to use it.


## Need Help?

Be sure to check out the Mobile Services [Developer Forum](http://social.msdn.microsoft.com/Forums/en-US/MediaServices/threads) if you are having trouble. The Media Services product team actively monitors the forum and will be more than happy to assist you.

## Contribute Code or Provide Feedback

If you would like to become an active contributor to this project please follow the instructions provided in [Windows Azure Projects Contribution Guidelines](http://windowsazure.github.com/guidelines.html).

If you encounter any bugs with the library please file an issue in the [Issues](https://github.com/WindowsAzure/azure-media-services/issues) section of the project.

## Learn More
[Windows Azure Media Services Developer Center](http://www.windowsazure.com/en-us/develop/media-services/)
3 changes: 2 additions & 1 deletion SDK.Client.sln
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2013
VisualStudioVersion = 12.0.30723.0
VisualStudioVersion = 12.0.31101.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SDK.Client", "src\net\Client\SDK.Client.csproj", "{E194B46E-9063-4CFA-85FC-51E5AAD55586}"
EndProject
Expand All @@ -12,6 +12,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{ECC37A
.nuget\NuGet.Config = .nuget\NuGet.Config
.nuget\NuGet.exe = .nuget\NuGet.exe
.nuget\NuGet.targets = .nuget\NuGet.targets
.nuget\windowsazure.mediaservices.nuspec = .nuget\windowsazure.mediaservices.nuspec
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SDK.Client.Tests.Unit", "test\net\unit\SDK.Client.Tests.Unit.csproj", "{19DA48B7-6C3C-4B2C-8789-1CC9CCBDA4C7}"
Expand Down
4 changes: 2 additions & 2 deletions ci/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@
//
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
[assembly: AssemblyVersion("3.2.0.0")]
[assembly: AssemblyFileVersion("3.2.0.0")]
[assembly: AssemblyVersion("3.3.0.0")]
[assembly: AssemblyFileVersion("3.3.0.0")]
[assembly: NeutralResourcesLanguage("en-US")]

//For delay signing specify PublicKey for each friendly assembly
Expand Down
18 changes: 18 additions & 0 deletions ci/SignMedia.bat
Original file line number Diff line number Diff line change
@@ -1,6 +1,24 @@
@echo off

echo Cleaning signed and packages directories
del /q c:\signing\signed\*.*
del /q c:\packages\*.*

echo Copying managed desktop library DLLs to signing source directory
copy /y .\Publish\Build\Release\Microsoft.WindowsAzure.MediaServices.Client.dll c:\signing\tosign\
copy /y .\Publish\Build\Release\Microsoft.WindowsAzure.MediaServices.Client.Common.FileEncryption.dll c:\signing\tosign\
copy /y .\Publish\Build\Release\Microsoft.WindowsAzure.MediaServices.Client.Common.BlobTransfer.dll c:\signing\tosign\
if %ERRORLEVEL% neq 0 goto copyfailed
echo OK

echo Signing managed desktop library DLLs...
%CI_SIGNING%\CodeSignUtility\csu.exe /c1=72 /c2=10006 "/d=.NET SDK" "/kw=MediaServices"
if %ERRORLEVEL% neq 0 goto signfailed
echo OK

echo Removing all unsigned files from \\adksdksign\unsigned...
del /q c:\signing\tosign\*.*
echo OK

echo Copying Media SDK signed managed DLLs and the pdbs to the final drop location...
echo Creating \drop\WAMSSDK\lib\net45
Expand Down
10 changes: 7 additions & 3 deletions src/net/Client/App.config
Original file line number Diff line number Diff line change
Expand Up @@ -10,23 +10,27 @@
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.IdentityModel.Tokens.Jwt" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.20511.1437" newVersion="4.0.20511.1437" />
</dependentAssembly>
</assemblyBinding>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="Microsoft.Data.OData" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-5.6.3.0" newVersion="5.6.3.0" />
<bindingRedirect oldVersion="0.0.0.0-5.6.4.0" newVersion="5.6.4.0" />
</dependentAssembly>
</assemblyBinding>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="Microsoft.Data.Edm" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-5.6.3.0" newVersion="5.6.3.0" />
<bindingRedirect oldVersion="0.0.0.0-5.6.4.0" newVersion="5.6.4.0" />
</dependentAssembly>
</assemblyBinding>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="Microsoft.Data.Services.Client" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-5.6.3.0" newVersion="5.6.3.0" />
<bindingRedirect oldVersion="0.0.0.0-5.6.4.0" newVersion="5.6.4.0" />
</dependentAssembly>
</assemblyBinding>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("3.2.0.0")]
[assembly: AssemblyFileVersion("3.2.0.0")]
[assembly: AssemblyVersion("3.3.0.0")]
[assembly: AssemblyFileVersion("3.3.0.0")]
[assembly: InternalsVisibleTo("Microsoft.WindowsAzure.MediaServices.Client.Tests.Scenario")]
[assembly: InternalsVisibleTo("Microsoft.WindowsAzure.MediaServices.Client.Tests.Unit")]
[assembly: InternalsVisibleTo("Microsoft.WindowsAzure.MediaServices.Client.Tests.Common")]
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("3.2.0.0")]
[assembly: AssemblyFileVersion("3.2.0.0")]
[assembly: AssemblyVersion("3.3.0.0")]
[assembly: AssemblyFileVersion("3.3.0.0")]
//For delay signing specify PublicKey for each friendly assembly
[assembly: System.Runtime.CompilerServices.InternalsVisibleTo("Microsoft.WindowsAzure.MediaServices.Client.Tests.Scenario, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9")]
[assembly: System.Runtime.CompilerServices.InternalsVisibleTo("Microsoft.WindowsAzure.MediaServices.Client.Tests.Unit, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9")]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile />
<SigningFlag Condition="$(SigningFlag) == '' Or $(SigningFlag) == '*Undefined*'">NOTSIGNED</SigningFlag>
<SigningFlag Condition="$(SigningFlag) == '' Or $(SigningFlag) == '*Undefined*'">NOTSIGNED</SigningFlag>
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\..\..\..\</SolutionDir>
<RestorePackages>true</RestorePackages>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
Expand All @@ -39,19 +41,30 @@
<DelaySign>true</DelaySign>
<AssemblyOriginatorKeyFile>..\..\..\..\..\MSSharedLibSN1024.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>

<ItemGroup>
<Reference Include="Microsoft.Data.Edm, Version=5.6.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\..\..\packages\Microsoft.Data.Edm.5.6.4\lib\net40\Microsoft.Data.Edm.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Data.OData, Version=5.6.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\..\..\packages\Microsoft.Data.OData.5.6.4\lib\net40\Microsoft.Data.OData.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Data.Services.Client, Version=5.6.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\..\..\packages\Microsoft.Data.Services.Client.5.6.4\lib\net40\Microsoft.Data.Services.Client.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Spatial, Version=5.6.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\..\..\packages\System.Spatial.5.6.4\lib\net40\System.Spatial.dll</HintPath>
</Reference>
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Data" />
<Reference Include="System.Xml" />
<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.3\lib\net40\Microsoft.Data.Services.Client.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>
Expand All @@ -74,8 +87,8 @@
</Compile>
<Compile Include="MemoryManager.cs" />
<Compile Include="MemoryManagerFactory.cs" />
<Compile Include="Properties\AssemblyInfo.cs" Condition=" '$(SigningFlag)' == 'NOTSIGNED' " />
<Compile Include="Properties\DelaySign_AssemblyInfo.cs" Condition=" '$(SigningFlag)' == 'DELAYSIGNED' "/>
<Compile Include="Properties\AssemblyInfo.cs" Condition=" '$(SigningFlag)' == 'NOTSIGNED' " />
<Compile Include="Properties\DelaySign_AssemblyInfo.cs" Condition=" '$(SigningFlag)' == 'DELAYSIGNED' " />
<Compile Include="ServicePointModifier.cs" />
</ItemGroup>
<ItemGroup>
Expand All @@ -90,7 +103,20 @@
<Name>SDK.Client.Common.FileEncryption</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<None Include="app.config">
<SubType>Designer</SubType>
</None>
<None Include="packages.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
</Target>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
Expand Down
19 changes: 19 additions & 0 deletions src/net/Client/Common/Common.BlobTransfer/app.config
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="Microsoft.Data.Edm" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-5.6.4.0" newVersion="5.6.4.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.Data.Services.Client" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-5.6.4.0" newVersion="5.6.4.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.Data.OData" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-5.6.4.0" newVersion="5.6.4.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>
7 changes: 7 additions & 0 deletions src/net/Client/Common/Common.BlobTransfer/packages.config
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Microsoft.Data.Edm" version="5.6.4" targetFramework="net40" />
<package id="Microsoft.Data.OData" version="5.6.4" targetFramework="net40" />
<package id="Microsoft.Data.Services.Client" version="5.6.4" targetFramework="net40" />
<package id="System.Spatial" version="5.6.4" targetFramework="net40" />
</packages>
Loading

0 comments on commit 783bb8a

Please sign in to comment.