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 #43 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 May 14, 2015
2 parents 1b69a6b + 190d308 commit f09eff1
Show file tree
Hide file tree
Showing 45 changed files with 2,698 additions and 876 deletions.
52 changes: 40 additions & 12 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.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<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.3\lib\net40\Microsoft.Data.Edm.dll</HintPath>
<HintPath>..\packages\Microsoft.Data.Edm.5.6.4\lib\net40\Microsoft.Data.Edm.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Data.OData, Version=5.6.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<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.3\lib\net40\Microsoft.Data.OData.dll</HintPath>
<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.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<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.3\lib\net40\Microsoft.Data.Services.Client.dll</HintPath>
<HintPath>..\packages\Microsoft.Data.Services.Client.5.6.4\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 @@ -84,9 +84,9 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\TransientFaultHandling.Core.5.1.1209.1\lib\NET4\Microsoft.Practices.TransientFaultHandling.Core.dll</HintPath>
</Reference>
<Reference Include="Microsoft.WindowsAzure.Configuration, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<Reference Include="Microsoft.WindowsAzure.Configuration, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Microsoft.WindowsAzure.ConfigurationManager.2.0.3\lib\net40\Microsoft.WindowsAzure.Configuration.dll</HintPath>
<HintPath>..\packages\Microsoft.WindowsAzure.ConfigurationManager.3.1.0\lib\net40\Microsoft.WindowsAzure.Configuration.dll</HintPath>
</Reference>
<Reference Include="Microsoft.WindowsAzure.MediaServices.Client, Version=3.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
Expand Down Expand Up @@ -115,17 +115,17 @@
<Reference Include="System.Core" />
<Reference Include="System.Data.Services.Client" />
<Reference Include="System.IdentityModel" />
<Reference Include="System.IdentityModel.Tokens.Jwt, Version=4.0.2.28, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<Reference Include="System.IdentityModel.Tokens.Jwt, Version=4.0.20511.1437, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\System.IdentityModel.Tokens.Jwt.4.0.2.202250711\lib\net45\System.IdentityModel.Tokens.Jwt.dll</HintPath>
<HintPath>..\packages\System.IdentityModel.Tokens.Jwt.4.0.2.205111437\lib\net45\System.IdentityModel.Tokens.Jwt.dll</HintPath>
</Reference>
<Reference Include="System.Net" />
<Reference Include="System.Runtime.Serialization" />
<Reference Include="System.Security" />
<Reference Include="System.ServiceModel" />
<Reference Include="System.Spatial, Version=5.6.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<Reference Include="System.Spatial, Version=5.6.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\System.Spatial.5.6.3\lib\net40\System.Spatial.dll</HintPath>
<HintPath>..\packages\System.Spatial.5.6.4\lib\net40\System.Spatial.dll</HintPath>
</Reference>
<Reference Include="System.Web" />
<Reference Include="System.Web.Extensions" />
Expand Down Expand Up @@ -179,6 +179,19 @@
<Compile Include="GridTransfer.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="JobOptions.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="JobOptions.Designer.cs">
<DependentUpon>JobOptions.cs</DependentUpon>
</Compile>
<Compile Include="Hyperlapse.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="Hyperlapse.Designer.cs">
<DependentUpon>Hyperlapse.cs</DependentUpon>
</Compile>

<Compile Include="IndexerOptions.cs">
<SubType>Form</SubType>
</Compile>
Expand Down Expand Up @@ -419,6 +432,15 @@
<Compile Include="ImportFromAzureStorage.Designer.cs">
<DependentUpon>ImportFromAzureStorage.cs</DependentUpon>
</Compile>
<None Include="BitmapsPNG\hyperlapse-large.png" />
<Content Include="Configurations\Hyperlapse.xml">
<SubType>Designer</SubType>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="IconsPNG\hyperlapse.png" />
<Content Include="SlateJPG\DefaultAzurePortalSlate.jpg">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<EmbeddedResource Include="AddDynamicEncryptionFrame3.resx">
<DependentUpon>AddDynamicEncryptionFrame3.cs</DependentUpon>
</EmbeddedResource>
Expand All @@ -437,6 +459,12 @@
<EmbeddedResource Include="CreateTestToken.resx">
<DependentUpon>CreateTestToken.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="JobOptions.resx">
<DependentUpon>JobOptions.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Hyperlapse.resx">
<DependentUpon>Hyperlapse.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="IndexerOptions.resx">
<DependentUpon>IndexerOptions.cs</DependentUpon>
</EmbeddedResource>
Expand Down
9 changes: 6 additions & 3 deletions AMSExplorer/App.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,19 +19,19 @@
</dependentAssembly>
<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>
<dependentAssembly>
<assemblyIdentity name="Microsoft.WindowsAzure.Storage" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.3.0.0" newVersion="4.3.0.0" />
</dependentAssembly>
<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>
<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>
<dependentAssembly>
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
Expand Down Expand Up @@ -146,6 +146,9 @@
<setting name="DirectShowVideoDevice" serializeAs="String">
<value>Webcam (High Definition Audio Device)</value>
</setting>
<setting name="DefaultSlateCurrentFolder" serializeAs="String">
<value />
</setting>
</AMSExplorer.Properties.Settings>
</userSettings>
</configuration>
32 changes: 31 additions & 1 deletion AMSExplorer/Bitmaps.Designer.cs
View file

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

13 changes: 11 additions & 2 deletions AMSExplorer/Bitmaps.resx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@
<data name="_8_12_2014_13_20_04" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>BitmapsPNG\8-12-2014-13-20-04.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Azure_Explorer" type="System.Resources.ResXFileRef, System.Windows.Forms">
<data name="Azure_Explorer" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>BitmapsPNG\Azure Explorer.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Azure_Explorer_ico" type="System.Resources.ResXFileRef, System.Windows.Forms">
Expand All @@ -265,4 +265,13 @@
<data name="AzureMedia_Full_Color_64_opaque" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>BitmapsPNG\AzureMedia_Full-Color-64-opaque.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
</root>
<data name="DefaultAzurePortalSlate" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>SlateJPG\DefaultAzurePortalSlate.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="hyperlapse" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>IconsPNG\hyperlapse.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="hyperlapse_large" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>BitmapsPNG\hyperlapse-large.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
</root>
Binary file added AMSExplorer/BitmapsPNG/hyperlapse-large.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit f09eff1

Please sign in to comment.