Skip to content

Added Azure Support #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mark-zacharias wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Added Azure Support #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
baa13f8
Update sln and csproj to work with VS 2013
Feb 10, 2014
cae2cd7
added stubs and references for azure support.
Feb 11, 2014
6fc5926
add packages.config for azure nuget package.
Feb 11, 2014
c39c01a
refactor the display to a directorysource class.
Feb 12, 2014
e1b3a6f
refactor existing upload to directory source
Feb 12, 2014
1ed26e3
Complete azure support
Feb 12, 2014
79e42bb
fix issue with azure select link
Feb 12, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ publish/

# NuGet Packages Directory
## TODO: If you have NuGet Package Restore enabled, uncomment the next line
#packages/
packages/

# Windows Azure Build Output
csx
Expand Down
6 changes: 4 additions & 2 deletions TinyFileManager.NET.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@

Microsoft Visual Studio Solution File, Format Version 11.00
# Visual Studio 2010
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2013
VisualStudioVersion = 12.0.30110.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TinyFileManager.NET", "TinyFileManager.NET\TinyFileManager.NET.csproj", "{45332B17-62BE-4E74-B64F-FD35509EA1BD}"
EndProject
Global
Expand Down
2 changes: 1 addition & 1 deletion TinyFileManager.NET/Properties/AssemblyInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,4 @@
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.1.0.0")]
77 changes: 57 additions & 20 deletions TinyFileManager.NET/Properties/Settings.Designer.cs
View file
Open in desktop

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

24 changes: 18 additions & 6 deletions TinyFileManager.NET/Properties/Settings.settings
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,6 @@
<Setting Name="AllowedMiscExtensions" Type="System.String" Scope="Application">
<Value Profile="(Default)" />
</Setting>
<Setting Name="UploadPath" Type="System.String" Scope="Application">
<Value Profile="(Default)">resources\files</Value>
</Setting>
<Setting Name="ThumbPath" Type="System.String" Scope="Application">
<Value Profile="(Default)">resources\thumbs</Value>
</Setting>
<Setting Name="AllowUploadFile" Type="System.Boolean" Scope="Application">
<Value Profile="(Default)">True</Value>
</Setting>
Expand All @@ -38,5 +32,23 @@
<Setting Name="MaxUploadSizeMb" Type="System.Int32" Scope="Application">
<Value Profile="(Default)">100</Value>
</Setting>
<Setting Name="AzureBlobStore" Type="System.String" Scope="Application">
<Value Profile="(Default)">DefaultEndpointsProtocol=https;AccountName=playgroundservice;AccountKey=HCAHx1kCfejMz8/fXP4Dcc6hFG8VMaUR164wv91x9iUXF63cTp4WWb29EPqhdmEasFTq0bMxpiBsnm6EneUQHw==</Value>
</Setting>
<Setting Name="AzureBlobUrl" Type="System.String" Scope="Application">
<Value Profile="(Default)">//playgroundservice.blob.core.windows.net/</Value>
</Setting>
<Setting Name="AzureBlobContainer" Type="System.String" Scope="Application">
<Value Profile="(Default)">tfm</Value>
</Setting>
<Setting Name="StorageMode" Type="System.String" Scope="Application">
<Value Profile="(Default)">Azure</Value>
</Setting>
<Setting Name="UploadPath" Type="System.String" Scope="Application">
<Value Profile="(Default)">resources\files</Value>
</Setting>
<Setting Name="ThumbPath" Type="System.String" Scope="Application">
<Value Profile="(Default)">resources\thumbs</Value>
</Setting>
</Settings>
</SettingsFile>
46 changes: 45 additions & 1 deletion TinyFileManager.NET/TinyFileManager.NET.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
Expand All @@ -14,6 +15,15 @@
<AssemblyName>TinyFileManager</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<UseIISExpress>false</UseIISExpress>
<FileUpgradeFlags>
</FileUpgradeFlags>
<UpgradeBackupLocation>
</UpgradeBackupLocation>
<OldToolsVersion>4.0</OldToolsVersion>
<IISExpressSSLPort />
<IISExpressAnonymousAuthentication />
<IISExpressWindowsAuthentication />
<IISExpressUseClassicPipelineMode />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
Expand All @@ -34,10 +44,34 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="Microsoft.CSharp" />
<Reference Include="Microsoft.Data.Edm, Version=5.6.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Data.Edm.5.6.0\lib\net40\Microsoft.Data.Edm.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Data.OData, Version=5.6.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Data.OData.5.6.0\lib\net40\Microsoft.Data.OData.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Data.Services.Client, Version=5.6.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Data.Services.Client.5.6.0\lib\net40\Microsoft.Data.Services.Client.dll</HintPath>
</Reference>
<Reference Include="Microsoft.WindowsAzure.Configuration, Version=1.8.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Microsoft.WindowsAzure.ConfigurationManager.1.8.0.0\lib\net35-full\Microsoft.WindowsAzure.Configuration.dll</HintPath>
</Reference>
<Reference Include="Microsoft.WindowsAzure.Storage, Version=3.0.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\WindowsAzure.Storage.3.0.3.0\lib\net40\Microsoft.WindowsAzure.Storage.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\packages\Newtonsoft.Json.5.0.8\lib\net40\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Data" />
<Reference Include="System.Core" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="System.Data.Services.Client" />
<Reference Include="System.Spatial, Version=5.6.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\System.Spatial.5.6.0\lib\net40\System.Spatial.dll</HintPath>
</Reference>
<Reference Include="System.Web.Extensions" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Drawing" />
Expand Down Expand Up @@ -188,12 +222,16 @@
</Content>
</ItemGroup>
<ItemGroup>
<Compile Include="classes\AzureSource.cs" />
<Compile Include="classes\clsConfig.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="classes\clsFileItem.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="classes\DirectorySource.cs" />
<Compile Include="classes\Helper.cs" />
<Compile Include="classes\Source.cs" />
<Compile Include="dialog.aspx.cs">
<DependentUpon>dialog.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
Expand All @@ -210,13 +248,19 @@
</ItemGroup>
<ItemGroup />
<ItemGroup>
<Content Include="packages.config" />
<None Include="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator>
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
</None>
</ItemGroup>
<PropertyGroup>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
</PropertyGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" />
<Import Project="$(VSToolsPath)\WebApplications\Microsoft.WebApplication.targets" Condition="'$(VSToolsPath)' != ''" />
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" Condition="false" />
<ProjectExtensions>
<VisualStudio>
<FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
Expand Down
24 changes: 18 additions & 6 deletions TinyFileManager.NET/Web.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,6 @@
<setting name="AllowedMiscExtensions" serializeAs="String">
<value />
</setting>
<setting name="UploadPath" serializeAs="String">
<value>resources\files</value>
</setting>
<setting name="ThumbPath" serializeAs="String">
<value>resources\thumbs</value>
</setting>
<setting name="AllowUploadFile" serializeAs="String">
<value>True</value>
</setting>
Expand All @@ -59,6 +53,24 @@
<setting name="MaxUploadSizeMb" serializeAs="String">
<value>100</value>
</setting>
<setting name="StorageMode" serializeAs="String">
<value>Azure</value>
</setting>
<setting name="AzureBlobStore" serializeAs="String">
<value>DefaultEndpointsProtocol=https;AccountName=example;AccountKey=somekey</value>
</setting>
<setting name="AzureBlobUrl" serializeAs="String">
<value>//example.blob.core.windows.net/</value>
</setting>
<setting name="AzureBlobContainer" serializeAs="String">
<value>tfm</value>
</setting>
<setting name="UploadPath" serializeAs="String">
<value>resources\files</value>
</setting>
<setting name="ThumbPath" serializeAs="String">
<value>resources\thumbs</value>
</setting>
</TinyFileManager.NET.Properties.Settings>
<TinyFileManager.Properties.Settings>
<setting name="Message_UploadTooBig" serializeAs="String">
Expand Down
Binary file added TinyFileManager.NET/bin/Microsoft.Data.Edm.dll
View file
Open in desktop
Binary file not shown.
Loading