Skip to content
This repository has been archived by the owner on Aug 1, 2024. It is now read-only.

Commit

Permalink
Merge pull request #88 from Azure/dev_k
Browse files Browse the repository at this point in the history
Storage Client Library - 4.3.1 Preview
  • Loading branch information
pemari-msft committed Nov 12, 2014
2 parents a898a82 + 2edb0ab commit 65f4e55
Show file tree
Hide file tree
Showing 166 changed files with 10,079 additions and 377 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -117,3 +117,6 @@ TestResults/

# Mac development
.DS_Store

#VS14 sln.ide files
*.sln.ide/
49 changes: 49 additions & 0 deletions AspNet_k.sln
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.22122.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Lib", "Lib", "{0F3C778A-0BBD-4318-A8EE-A7C015C309B2}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Test", "Test", "{DFD3BE24-FF81-4B3F-9956-EA431C1D18A4}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{B7E0612E-6504-48C6-B46A-B96876BB4DA2}"
ProjectSection(SolutionItems) = preProject
global.json = global.json
Nuget.config = Nuget.config
EndProjectSection
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.WindowsAzure.Storage", "Lib\AspNet\Microsoft.WindowsAzure.Storage\Microsoft.WindowsAzure.Storage.kproj", "{10851280-F6EA-4988-80B0-4B0CAEE23196}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.WindowsAzure.Storage.Test", "Test\AspNet\Microsoft.WindowsAzure.Storage.Test\Microsoft.WindowsAzure.Storage.Test.kproj", "{4A6F2277-85AA-47D3-ACBA-25E256DEBDA9}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "XUnitForMsTest", "Test\AspNet\XUnitForMsTest\XUnitForMsTest.kproj", "{C5B83A60-C8D9-425B-BB44-2E878CF8A1C4}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{10851280-F6EA-4988-80B0-4B0CAEE23196}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{10851280-F6EA-4988-80B0-4B0CAEE23196}.Debug|Any CPU.Build.0 = Debug|Any CPU
{10851280-F6EA-4988-80B0-4B0CAEE23196}.Release|Any CPU.ActiveCfg = Release|Any CPU
{10851280-F6EA-4988-80B0-4B0CAEE23196}.Release|Any CPU.Build.0 = Release|Any CPU
{4A6F2277-85AA-47D3-ACBA-25E256DEBDA9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{4A6F2277-85AA-47D3-ACBA-25E256DEBDA9}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4A6F2277-85AA-47D3-ACBA-25E256DEBDA9}.Release|Any CPU.ActiveCfg = Release|Any CPU
{4A6F2277-85AA-47D3-ACBA-25E256DEBDA9}.Release|Any CPU.Build.0 = Release|Any CPU
{C5B83A60-C8D9-425B-BB44-2E878CF8A1C4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{C5B83A60-C8D9-425B-BB44-2E878CF8A1C4}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C5B83A60-C8D9-425B-BB44-2E878CF8A1C4}.Release|Any CPU.ActiveCfg = Release|Any CPU
{C5B83A60-C8D9-425B-BB44-2E878CF8A1C4}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{10851280-F6EA-4988-80B0-4B0CAEE23196} = {0F3C778A-0BBD-4318-A8EE-A7C015C309B2}
{4A6F2277-85AA-47D3-ACBA-25E256DEBDA9} = {DFD3BE24-FF81-4B3F-9956-EA431C1D18A4}
{C5B83A60-C8D9-425B-BB44-2E878CF8A1C4} = {DFD3BE24-FF81-4B3F-9956-EA431C1D18A4}
EndGlobalSection
EndGlobal
10 changes: 10 additions & 0 deletions BuildAspNetK.cmd
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
pushd %~dp0
@powershell -NoProfile -ExecutionPolicy unrestricted -Command "iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/aspnet/Home/release/kvminstall.ps1'))"
call %userprofile%\.kre\bin\kvm.cmd upgrade -x86 -r CoreCLR
call %userprofile%\.kre\bin\kvm.cmd upgrade -x86 -r CLR
call %userprofile%\.kre\bin\kvm.cmd use 1.0.0-beta1-10674 -r CLR
call kpm restore
call %userprofile%\.kre\bin\kvm.cmd use 1.0.0-beta1-10674 -r CoreCLR
cd Lib\AspNet\Microsoft.WindowsAzure.Storage
call kpm build --configuration release
popd
40 changes: 40 additions & 0 deletions Lib/AspNet/Microsoft.WindowsAzure.Storage/AssemblyInfo.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
using System;
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;

// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyTitle("Microsoft.WindowsAzure.Storage.dll")]
[assembly: AssemblyDescription("Azure Storage SDK for ASP.NET 5 Preview")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("Microsoft")]
[assembly: AssemblyProduct("Microsoft Azure Storage")]
[assembly: AssemblyCopyright("Copyright © 2014 Microsoft Corp.")]
[assembly: AssemblyTrademark("Microsoft ® is a registered trademark of Microsoft Corporation.")]
[assembly: AssemblyCulture("")]

// Setting ComVisible to false makes the types in this assembly not visible
// to COM components. If you need to access a type in this assembly from
// COM, set the ComVisible attribute to true on that type.
[assembly: ComVisible(false)]

// The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: Guid("a89a167c-9cc6-46b5-a50b-697b69bfe078")]

// Version information for an assembly consists of the following four values:
//
// Major Version
// Minor Version
// Build Number
// Revision
//
// 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("4.3.1.0")]
[assembly: AssemblyFileVersion("4.3.1.0")]
[assembly: AssemblyInformationalVersion("4.3.1.0-preview")]

[assembly: InternalsVisibleTo("Microsoft.WindowsAzure.Storage.Test")]
Original file line number Diff line number Diff line change
@@ -0,0 +1,90 @@
// -----------------------------------------------------------------------------------------
// <copyright file="StreamExtensinon.cs" company="Microsoft">
// Copyright 2013 Microsoft Corporation
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
// </copyright>
// -----------------------------------------------------------------------------------------

namespace Microsoft.WindowsAzure.Storage
{
using System.IO;
using System.Threading.Tasks;

/// <summary>
/// Stream extension to share code with WinRT calls
/// </summary>
internal static class StreamExtensinon
{
/// <summary>
/// Return input stream itself.
/// </summary>
/// <param name="stream">input stream</param>
/// <returns>the input stream</returns>
public static Stream AsInputStream(this Stream stream)
{
return stream;
}

/// <summary>
/// Return input stream itself.
/// </summary>
/// <param name="stream">input stream</param>
/// <returns>the input stream</returns>
public static Stream AsOutputStream(this Stream stream)
{
return stream;
}

/// <summary>
/// Return input stream itself.
/// </summary>
/// <param name="stream">input stream</param>
/// <returns>the input stream</returns>
public static Stream AsStreamForRead(this Stream stream)
{
return stream;
}

/// <summary>
/// Return input stream itself.
/// </summary>
/// <param name="stream">input stream</param>
/// <returns>the input stream</returns>
public static Stream AsStreamForWrite(this Stream stream)
{
return stream;
}

/// <summary>
/// Write buffer to the stream.
/// </summary>
/// <param name="stream">input stream</param>
/// <param name="buffer">buffer to write to the stream</param>
/// <returns>Async task</returns>
public static async Task WriteAsync(this Stream stream, byte[] buffer)
{
await stream.WriteAsync(buffer, 0, buffer.Length);
}

/// <summary>
/// Position the stream with offset from beginning.
/// </summary>
/// <param name="stream">input stream</param>
/// <param name="offset">offset from beginning</param>
/// <returns>stream position</returns>
public static long Seek(this Stream stream, ulong offset)
{
return stream.Seek((long)offset, SeekOrigin.Begin);
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
// -----------------------------------------------------------------------------------------
// <copyright file="TaskExtensinon.cs" company="Microsoft">
// Copyright 2013 Microsoft Corporation
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
// </copyright>
// -----------------------------------------------------------------------------------------

namespace Microsoft.WindowsAzure.Storage
{
using System.Threading.Tasks;

/// <summary>
/// Task Extension to share code with WinRT calls
/// </summary>
internal static class TaskExtensinon
{
/// <summary>
/// Return task itself
/// </summary>
/// <param name="task">input task.</param>
/// <returns>The input task.</returns>
public static Task AsTask(this Task task)
{
return task;
}

/// <summary>
/// Return input task itself
/// </summary>
/// <typeparam name="TResult">The type of object that returns the result of the asynchronous operation.</typeparam>
/// <param name="task">input task.</param>
/// <returns>The input task.</returns>
public static Task<TResult> AsTask<TResult>(this Task<TResult> task)
{
return task;
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">12.0</VisualStudioVersion>
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
</PropertyGroup>
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
</PropertyGroup>
<Import Project="$(VSToolsPath)\AspNet\Microsoft.Web.AspNet.Props" Condition="'$(VSToolsPath)' != ''" />
<PropertyGroup Label="Globals">
<ProjectGuid>10851280-f6ea-4988-80b0-4b0caee23196</ProjectGuid>
<OutputType>Library</OutputType>
<RootNamespace>Microsoft.WindowsAzure.Storage</RootNamespace>
</PropertyGroup>
<PropertyGroup Condition="$(OutputType) == 'Console'">
<DebuggerFlavor>ConsoleDebugger</DebuggerFlavor>
</PropertyGroup>
<PropertyGroup Condition="$(OutputType) == 'Web'">
<DebuggerFlavor>WebDebugger</DebuggerFlavor>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'" Label="Configuration">
</PropertyGroup>
<PropertyGroup>
<SchemaVersion>2.0</SchemaVersion>
</PropertyGroup>
<ItemGroup>
<Compile Include="..\..\WindowsRuntime\**\*.cs" />
<Compile Include="..\..\Common\**\*.cs" />
</ItemGroup>
<ItemGroup>
<CodeAnalysisDictionary Include="..\..\..\CustomDictionary.xml" />
</ItemGroup>
<Import Project="$(VSToolsPath)\AspNet\Microsoft.Web.AspNet.targets" Condition="'$(VSToolsPath)' != ''" />
<ProjectExtensions>
<VisualStudio>
<UserProperties project_1json__JSONSchema="http://www.asp.net/media/4878834/project.json" />
</VisualStudio>
</ProjectExtensions>
</Project>
Loading

0 comments on commit 65f4e55

Please sign in to comment.