Merge pull request #24 from dstuckims/dstucki_coreclr1

Migrate to From DNX RC1 to .NET Core RC2 (in develop branch).
This commit is contained in:
Xin Chen 2016-05-26 17:40:56 -07:00
Родитель a924ee96de 4738c88e08
Коммит db822c41d3
9 изменённых файлов: 116 добавлений и 12951 удалений

Просмотреть файл

@ -4,18 +4,23 @@
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
</PropertyGroup>
<Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.Props" Condition="'$(VSToolsPath)' != ''" />
<Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.Props" Condition="'$(VSToolsPath)' != ''" />
<PropertyGroup Label="Globals">
<ProjectGuid>1de15f9c-7cc5-472f-906c-11669436e5ae</ProjectGuid>
<ProjectGuid>ff1beb0a-a683-43ec-a378-e0cec55c8d7a</ProjectGuid>
<RootNamespace>Microsoft.Azure.Amqp</RootNamespace>
<BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\bin\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
<OutputPath Condition="'$(OutputPath)'=='' ">..\bin\artifacts\$(MSBuildProjectName)\</OutputPath>
<BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\obj</BaseIntermediateOutputPath>
<OutputPath Condition="'$(OutputPath)'=='' ">..\bin\</OutputPath>
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
</PropertyGroup>
<PropertyGroup>
<SchemaVersion>2.0</SchemaVersion>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
<ProduceOutputsOnBuild>True</ProduceOutputsOnBuild>
</PropertyGroup>
<Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.targets" Condition="'$(VSToolsPath)' != ''" />
</Project>
<Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
<Target Name="AfterBuild">
<Message Text="Generating nuget package..." Importance="High" />
<Exec Command="dotnet.exe pack -o ..\bin\packages\"/>
</Target>
</Project>

Просмотреть файл

@ -5,14 +5,10 @@ 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.Azure.Amqp.Dnx")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("Microsoft.Azure.Amqp.Dnx")]
[assembly: AssemblyCopyright("Copyright © 2016")]
[assembly: AssemblyProduct("Microsoft.Azure.Amqp.Core")]
[assembly: AssemblyTrademark("")]
[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
@ -20,4 +16,4 @@ using System.Runtime.InteropServices;
[assembly: ComVisible(false)]
// The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: Guid("1de15f9c-7cc5-472f-906c-11669436e5ae")]
[assembly: Guid("ff1beb0a-a683-43ec-a378-e0cec55c8d7a")]

Просмотреть файл

@ -0,0 +1,72 @@
{
"version": "1.1.0-*",
"description": "Microsoft.Azure.Amqp .NET Core Class Library",
"authors": [ "microsoft" ],
"packOptions": {
"tags": [ "AMQP coreclr .net core Azure" ],
"projectUrl": "https://github.com/Azure/azure-amqp",
"licenseUrl": "https://github.com/Azure/azure-amqp/blob/master/LICENSE.txt"
},
"buildOptions": {
"allowUnsafe": true,
"xmlDoc": false,
"embed": {
"mappings": {
"Microsoft.Azure.Amqp.ResourcesGeneric": "../Microsoft.Azure.Amqp/ResourcesGeneric.resx",
"Microsoft.Azure.Amqp.Amqp.Resources": "../Microsoft.Azure.Amqp/Amqp/Resources.resx"
}
},
"compile": [
"../Microsoft.Azure.Amqp/*.cs",
"../Microsoft.Azure.Amqp/Amqp/*.cs",
"../Microsoft.Azure.Amqp/Amqp/Encoding/*.cs",
"../Microsoft.Azure.Amqp/Amqp/Framing/*.cs",
"../Microsoft.Azure.Amqp/Amqp/Sasl/*.cs",
"../Microsoft.Azure.Amqp/Amqp/Serialization/*.cs",
"../Microsoft.Azure.Amqp/Amqp/Transaction/*.cs",
"../Microsoft.Azure.Amqp/Amqp/Transport/*.cs",
"../Microsoft.Azure.Amqp/Amqp/X509/*.cs",
"../Microsoft.Azure.Amqp/Exceptions/*.cs",
"../Microsoft.Azure.Amqp/Extensions/*.cs",
"../Microsoft.Azure.Amqp/Interop/*.cs",
"../Microsoft.Azure.Amqp/Tracing/*.cs"
]
},
"configurations": {
"Debug": {
"buildOptions": {
"define": [ "DEBUG", "TRACE" ]
}
},
"Release": {
"buildOptions": {
"define": [ "RELEASE", "TRACE" ],
"optimize": true
}
}
},
"frameworks": {
"netstandard1.3": {
"imports": [ "net46", "dnxcore50", "portable-net45+win8" ],
"buildOptions": {
"define": [ "DNXCORE" ]
}
}
},
"dependencies": {
"NETStandard.Library": "1.5.0-rc2-24027",
"System.Diagnostics.Process": "4.1.0-rc2-24027",
"System.Net.NameResolution": "4.0.0-rc2-24027",
"System.Net.Security": "4.0.0-rc2-24027",
"System.Runtime.Serialization.Primitives": "4.1.1-rc2-24027",
"System.Runtime.Serialization.Xml": "4.1.1-rc2-24027",
"System.Security.Claims": "4.0.1-rc2-24027",
"System.Threading.Thread": "4.0.0-rc2-24027",
"System.Threading.ThreadPool": "4.0.10-rc2-24027"
}
}

Просмотреть файл

@ -1,5 +0,0 @@
{
"sdk": {
"version": "1.0.0-rc2-16551"
}
}

Просмотреть файл

@ -1,75 +0,0 @@
{
"version": "1.1.0-*",
"description": "Microsoft.Azure.Amqp Dnx Class Library",
"authors": [ "microsoft" ],
"tags": [ "AMQP coreclr Azure" ],
"projectUrl": "https://github.com/Azure/azure-amqp",
"licenseUrl": "https://github.com/Azure/azure-amqp/blob/master/LICENSE.txt",
"compilationOptions": {
"allowUnsafe": true
},
"namedResource": {
"Microsoft.Azure.Amqp.ResourcesGeneric": "../Microsoft.Azure.Amqp/ResourcesGeneric.resx",
"Microsoft.Azure.Amqp.Amqp.Resources": "../Microsoft.Azure.Amqp/Amqp/Resources.resx"
},
"compile": [
"../Microsoft.Azure.Amqp/*.cs",
"../Microsoft.Azure.Amqp/Amqp/*.cs",
"../Microsoft.Azure.Amqp/Amqp/Encoding/*.cs",
"../Microsoft.Azure.Amqp/Amqp/Framing/*.cs",
"../Microsoft.Azure.Amqp/Amqp/Sasl/*.cs",
"../Microsoft.Azure.Amqp/Amqp/Serialization/*.cs",
"../Microsoft.Azure.Amqp/Amqp/Transaction/*.cs",
"../Microsoft.Azure.Amqp/Amqp/Transport/*.cs",
"../Microsoft.Azure.Amqp/Amqp/X509/*.cs",
"../Microsoft.Azure.Amqp/Exceptions/*.cs",
"../Microsoft.Azure.Amqp/Extensions/*.cs",
"../Microsoft.Azure.Amqp/Interop/*.cs",
"../Microsoft.Azure.Amqp/Tracing/*.cs"
],
"configurations": {
"Debug": {
"compilationOptions": {
"define": [ "DEBUG", "TRACE" ]
}
},
"Release": {
"compilationOptions": {
"define": [ "RELEASE", "TRACE" ],
"optimize": true
}
}
},
"frameworks": {
"net451": {
"frameworkAssemblies": {
"System": "",
"System.Runtime.Serialization": "",
"System.ServiceModel": "",
"System.Transactions": "",
"System.Xml": ""
}
},
"dnxcore50": {
"compilationOptions": {
"define": [ "DNXCORE" ]
},
"compileExclude": [
"../Microsoft.Azure.Amqp/Interop/UnsafeNativeMethods.cs"
],
"dependencies": {
"Microsoft.NETCore.Console": "1.0.0-rc2-23712",
"System.Net.Primitives": "4.0.11-rc2-23712",
"System.Net.Security": "4.0.0-rc2-23712",
"System.Net.Sockets": "4.1.0-rc2-23712",
"System.Threading.Thread": "4.0.0-rc2-23712",
"System.Threading.ThreadPool": "4.0.10-rc2-23712"
}
}
}
}

Разница между файлами не показана из-за своего большого размера Загрузить разницу

Просмотреть файл

@ -40,17 +40,5 @@ namespace Microsoft.Azure.Amqp.Transport
get;
internal set;
}
#if DNXCORE
// This is a work-around to a bug in CoreCLR where calling SslStream.ReadAsync (which doesn't complete yet)
// followed by calling SslStream.WriteAsync the WriteAsync call blocks until the ReadAsync completes.
// Work around this by overriding the base Stream.WriteAsync implementation to avoid this serialization.
// Should be removed once we have the fix in SslStream and related classes.
public override Task WriteAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken)
{
base.Write(buffer, offset, count);
return TaskHelpers.CompletedTask;
}
#endif
}
}

Просмотреть файл

@ -58,30 +58,12 @@ namespace Microsoft.Azure.Amqp.Transport
public override int Read(byte[] buffer, int offset, int count)
{
#if DNXCORE
using (var doneEvent = new ManualResetEventSlim())
{
var asyncResult = this.BeginRead(buffer, offset, count, ar => ((ManualResetEventSlim)ar.AsyncState).Set(), doneEvent);
doneEvent.Wait();
return this.EndRead(asyncResult);
}
#else
throw new InvalidOperationException();
#endif
}
public override void Write(byte[] buffer, int offset, int count)
{
#if DNXCORE
using (var doneEvent = new ManualResetEventSlim())
{
var asyncResult = this.BeginWrite(buffer, offset, count, ar => ((ManualResetEventSlim)ar.AsyncState).Set(), doneEvent);
doneEvent.Wait();
this.EndWrite(asyncResult);
}
#else
throw new InvalidOperationException();
#endif
}
public override long Seek(long offset, SeekOrigin origin)

Просмотреть файл

@ -1,7 +1,7 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.24720.0
VisualStudioVersion = 14.0.25123.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Azure.Amqp", "Microsoft.Azure.Amqp\Microsoft.Azure.Amqp.csproj", "{A0D1C509-8C92-4AA1-983C-00E5254F8AE0}"
EndProject
@ -9,17 +9,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Test", "Test", "{07A72A72-7
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestAmqpBroker", "test\TestAmqpBroker\TestAmqpBroker.csproj", "{124A25C1-CFE3-47E5-8B0A-564FBCD6C319}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Azure.Amqp.Dnx", "Microsoft.Azure.Amqp.Dnx\Microsoft.Azure.Amqp.Dnx.xproj", "{1DE15F9C-7CC5-472F-906C-11669436E5AE}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Test.Microsoft.Azure.Amqp", "test\Test.Microsoft.Amqp\Test.Microsoft.Azure.Amqp.csproj", "{8DEA610D-7D10-4B81-B30D-E348BB948623}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{91B24071-55C9-47E7-96E5-ABF6548871BF}"
ProjectSection(SolutionItems) = preProject
Microsoft.Azure.Amqp.Dnx\global.json = Microsoft.Azure.Amqp.Dnx\global.json
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Azure.Amqp.Uwp", "Microsoft.Azure.Amqp.Uwp\Microsoft.Azure.Amqp.Uwp.csproj", "{F127EF83-0EDB-45EF-B719-78703B7FC29C}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Azure.Amqp.Core", "Microsoft.Azure.Amqp.Core\Microsoft.Azure.Amqp.Core.xproj", "{FF1BEB0A-A683-43EC-A378-E0CEC55C8D7A}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@ -79,30 +76,6 @@ Global
{124A25C1-CFE3-47E5-8B0A-564FBCD6C319}.Signed|x64.ActiveCfg = Release|Any CPU
{124A25C1-CFE3-47E5-8B0A-564FBCD6C319}.Signed|x86.ActiveCfg = Release|Any CPU
{124A25C1-CFE3-47E5-8B0A-564FBCD6C319}.Signed|x86.Build.0 = Release|Any CPU
{1DE15F9C-7CC5-472F-906C-11669436E5AE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{1DE15F9C-7CC5-472F-906C-11669436E5AE}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1DE15F9C-7CC5-472F-906C-11669436E5AE}.Debug|ARM.ActiveCfg = Debug|Any CPU
{1DE15F9C-7CC5-472F-906C-11669436E5AE}.Debug|ARM.Build.0 = Debug|Any CPU
{1DE15F9C-7CC5-472F-906C-11669436E5AE}.Debug|x64.ActiveCfg = Debug|Any CPU
{1DE15F9C-7CC5-472F-906C-11669436E5AE}.Debug|x64.Build.0 = Debug|Any CPU
{1DE15F9C-7CC5-472F-906C-11669436E5AE}.Debug|x86.ActiveCfg = Debug|Any CPU
{1DE15F9C-7CC5-472F-906C-11669436E5AE}.Debug|x86.Build.0 = Debug|Any CPU
{1DE15F9C-7CC5-472F-906C-11669436E5AE}.Release|Any CPU.ActiveCfg = Release|Any CPU
{1DE15F9C-7CC5-472F-906C-11669436E5AE}.Release|Any CPU.Build.0 = Release|Any CPU
{1DE15F9C-7CC5-472F-906C-11669436E5AE}.Release|ARM.ActiveCfg = Release|Any CPU
{1DE15F9C-7CC5-472F-906C-11669436E5AE}.Release|ARM.Build.0 = Release|Any CPU
{1DE15F9C-7CC5-472F-906C-11669436E5AE}.Release|x64.ActiveCfg = Release|Any CPU
{1DE15F9C-7CC5-472F-906C-11669436E5AE}.Release|x64.Build.0 = Release|Any CPU
{1DE15F9C-7CC5-472F-906C-11669436E5AE}.Release|x86.ActiveCfg = Release|Any CPU
{1DE15F9C-7CC5-472F-906C-11669436E5AE}.Release|x86.Build.0 = Release|Any CPU
{1DE15F9C-7CC5-472F-906C-11669436E5AE}.Signed|Any CPU.ActiveCfg = Debug|Any CPU
{1DE15F9C-7CC5-472F-906C-11669436E5AE}.Signed|Any CPU.Build.0 = Debug|Any CPU
{1DE15F9C-7CC5-472F-906C-11669436E5AE}.Signed|ARM.ActiveCfg = Release|Any CPU
{1DE15F9C-7CC5-472F-906C-11669436E5AE}.Signed|ARM.Build.0 = Release|Any CPU
{1DE15F9C-7CC5-472F-906C-11669436E5AE}.Signed|x64.ActiveCfg = Debug|Any CPU
{1DE15F9C-7CC5-472F-906C-11669436E5AE}.Signed|x64.Build.0 = Debug|Any CPU
{1DE15F9C-7CC5-472F-906C-11669436E5AE}.Signed|x86.ActiveCfg = Release|Any CPU
{1DE15F9C-7CC5-472F-906C-11669436E5AE}.Signed|x86.Build.0 = Release|Any CPU
{8DEA610D-7D10-4B81-B30D-E348BB948623}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{8DEA610D-7D10-4B81-B30D-E348BB948623}.Debug|Any CPU.Build.0 = Debug|Any CPU
{8DEA610D-7D10-4B81-B30D-E348BB948623}.Debug|ARM.ActiveCfg = Debug|Any CPU
@ -148,6 +121,30 @@ Global
{F127EF83-0EDB-45EF-B719-78703B7FC29C}.Signed|x64.Build.0 = Release|x64
{F127EF83-0EDB-45EF-B719-78703B7FC29C}.Signed|x86.ActiveCfg = Release|x86
{F127EF83-0EDB-45EF-B719-78703B7FC29C}.Signed|x86.Build.0 = Release|x86
{FF1BEB0A-A683-43EC-A378-E0CEC55C8D7A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{FF1BEB0A-A683-43EC-A378-E0CEC55C8D7A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{FF1BEB0A-A683-43EC-A378-E0CEC55C8D7A}.Debug|ARM.ActiveCfg = Debug|Any CPU
{FF1BEB0A-A683-43EC-A378-E0CEC55C8D7A}.Debug|ARM.Build.0 = Debug|Any CPU
{FF1BEB0A-A683-43EC-A378-E0CEC55C8D7A}.Debug|x64.ActiveCfg = Debug|Any CPU
{FF1BEB0A-A683-43EC-A378-E0CEC55C8D7A}.Debug|x64.Build.0 = Debug|Any CPU
{FF1BEB0A-A683-43EC-A378-E0CEC55C8D7A}.Debug|x86.ActiveCfg = Debug|Any CPU
{FF1BEB0A-A683-43EC-A378-E0CEC55C8D7A}.Debug|x86.Build.0 = Debug|Any CPU
{FF1BEB0A-A683-43EC-A378-E0CEC55C8D7A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{FF1BEB0A-A683-43EC-A378-E0CEC55C8D7A}.Release|Any CPU.Build.0 = Release|Any CPU
{FF1BEB0A-A683-43EC-A378-E0CEC55C8D7A}.Release|ARM.ActiveCfg = Release|Any CPU
{FF1BEB0A-A683-43EC-A378-E0CEC55C8D7A}.Release|ARM.Build.0 = Release|Any CPU
{FF1BEB0A-A683-43EC-A378-E0CEC55C8D7A}.Release|x64.ActiveCfg = Release|Any CPU
{FF1BEB0A-A683-43EC-A378-E0CEC55C8D7A}.Release|x64.Build.0 = Release|Any CPU
{FF1BEB0A-A683-43EC-A378-E0CEC55C8D7A}.Release|x86.ActiveCfg = Release|Any CPU
{FF1BEB0A-A683-43EC-A378-E0CEC55C8D7A}.Release|x86.Build.0 = Release|Any CPU
{FF1BEB0A-A683-43EC-A378-E0CEC55C8D7A}.Signed|Any CPU.ActiveCfg = Debug|Any CPU
{FF1BEB0A-A683-43EC-A378-E0CEC55C8D7A}.Signed|Any CPU.Build.0 = Debug|Any CPU
{FF1BEB0A-A683-43EC-A378-E0CEC55C8D7A}.Signed|ARM.ActiveCfg = Debug|Any CPU
{FF1BEB0A-A683-43EC-A378-E0CEC55C8D7A}.Signed|ARM.Build.0 = Debug|Any CPU
{FF1BEB0A-A683-43EC-A378-E0CEC55C8D7A}.Signed|x64.ActiveCfg = Debug|Any CPU
{FF1BEB0A-A683-43EC-A378-E0CEC55C8D7A}.Signed|x64.Build.0 = Debug|Any CPU
{FF1BEB0A-A683-43EC-A378-E0CEC55C8D7A}.Signed|x86.ActiveCfg = Debug|Any CPU
{FF1BEB0A-A683-43EC-A378-E0CEC55C8D7A}.Signed|x86.Build.0 = Debug|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@ -157,7 +154,7 @@ Global
{8DEA610D-7D10-4B81-B30D-E348BB948623} = {07A72A72-7CE5-46AE-B383-F4EA6408AE3C}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
EnterpriseLibraryConfigurationToolBinariesPath = packages\TransientFaultHandling.Core.5.1.1209.1\lib\NET4
EnterpriseLibraryConfigurationToolBinariesPathV6 = packages\EnterpriseLibrary.TransientFaultHandling.6.0.1304.0\lib\portable-net45+win+wp8;packages\EnterpriseLibrary.TransientFaultHandling.WindowsAzure.Storage.6.0.1304.1\lib\NET45;packages\EnterpriseLibrary.TransientFaultHandling.Data.6.0.1304.1\lib\NET45
EnterpriseLibraryConfigurationToolBinariesPath = packages\TransientFaultHandling.Core.5.1.1209.1\lib\NET4
EndGlobalSection
EndGlobal