From 71bc55227a550eab6dfd7ea9c66dbce76b9d40da Mon Sep 17 00:00:00 2001 From: Hovsep Mkrtchyan Date: Mon, 16 May 2016 18:07:39 -0700 Subject: [PATCH] Moved to CoreClr RC2 public preview --- AutoRest.sln | 4 +- ClientRuntime.sln | 16 +-- ...t.ClientRuntime.Azure.Authentication.xproj | 22 +++ .../project.json | 8 +- .../ActiveDirectoryCredentialsTest.cs | 4 +- ...osoft.Rest.ClientRuntime.Azure.Tests.xproj | 20 +++ .../project.json | 10 +- .../Microsoft.Rest.ClientRuntime.Azure.xproj | 22 +++ .../project.json | 128 +++++++++--------- .../Microsoft.Rest.ClientRuntime.Etw.xproj | 22 +++ .../project.json | 4 +- ...Microsoft.Rest.ClientRuntime.Log4Net.xproj | 22 +++ .../project.json | 4 +- .../Microsoft.Rest.ClientRuntime.Tests.xproj | 20 +++ .../project.json | 10 +- ...oft.Rest.ClientRuntime.Tracing.Tests.xproj | 20 +++ .../project.json | 16 +-- .../Microsoft.Rest.ClientRuntime.xproj | 22 +++ .../Microsoft.Rest.ClientRuntime/project.json | 64 ++++----- NuGet.Config | 9 -- global.json | 2 +- 21 files changed, 305 insertions(+), 144 deletions(-) create mode 100644 ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Azure.Authentication/Microsoft.Rest.ClientRuntime.Azure.Authentication.xproj create mode 100644 ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Azure.Tests/Microsoft.Rest.ClientRuntime.Azure.Tests.xproj create mode 100644 ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Azure/Microsoft.Rest.ClientRuntime.Azure.xproj create mode 100644 ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Etw/Microsoft.Rest.ClientRuntime.Etw.xproj create mode 100644 ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Log4Net/Microsoft.Rest.ClientRuntime.Log4Net.xproj create mode 100644 ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Tests/Microsoft.Rest.ClientRuntime.Tests.xproj create mode 100644 ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Tracing.Tests/Microsoft.Rest.ClientRuntime.Tracing.Tests.xproj create mode 100644 ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime/Microsoft.Rest.ClientRuntime.xproj delete mode 100644 NuGet.Config diff --git a/AutoRest.sln b/AutoRest.sln index e9e2ddf312323..47b533855d68a 100644 --- a/AutoRest.sln +++ b/AutoRest.sln @@ -88,9 +88,9 @@ Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "AutoRest.Generator.Azure.CS EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ClientRuntimes", "ClientRuntimes", "{9C3EF315-B4C1-4E11-B2FC-31B1530393D9}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "ClientRuntime", "ClientRuntimes\CSharp\Microsoft.Rest.ClientRuntime\ClientRuntime.xproj", "{EDDB6367-5C7B-428C-B54C-96BCD90F6E6C}" +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "ClientRuntime", "ClientRuntimes\CSharp\Microsoft.Rest.ClientRuntime\Microsoft.Rest.ClientRuntime.xproj", "{EDDB6367-5C7B-428C-B54C-96BCD90F6E6C}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "ClientRuntime.Azure", "ClientRuntimes\CSharp\Microsoft.Rest.ClientRuntime.Azure\ClientRuntime.Azure.xproj", "{D5296EAB-C13E-4A88-9532-BD0677D18EC9}" +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "ClientRuntime.Azure", "ClientRuntimes\CSharp\Microsoft.Rest.ClientRuntime.Azure\Microsoft.Rest.ClientRuntime.Azure.xproj", "{D5296EAB-C13E-4A88-9532-BD0677D18EC9}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AutoRest.Generator.Azure.Extensions", "AutoRest\Generators\Extensions\Azure.Extensions\AutoRest.Generator.Azure.Extensions.csproj", "{90B943AB-3879-4B64-B9FF-1A21297C0F26}" EndProject diff --git a/ClientRuntime.sln b/ClientRuntime.sln index 957611df8d7bc..e49b38b6e06b3 100644 --- a/ClientRuntime.sln +++ b/ClientRuntime.sln @@ -3,26 +3,26 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 14 VisualStudioVersion = 14.0.24720.0 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "ClientRuntime", "ClientRuntimes\CSharp\Microsoft.Rest.ClientRuntime\ClientRuntime.xproj", "{EDDB6367-5C7B-428C-B54C-96BCD90F6E6C}" +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "ClientRuntime", "ClientRuntimes\CSharp\Microsoft.Rest.ClientRuntime\Microsoft.Rest.ClientRuntime.xproj", "{EDDB6367-5C7B-428C-B54C-96BCD90F6E6C}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "ClientRuntime.Azure", "ClientRuntimes\CSharp\Microsoft.Rest.ClientRuntime.Azure\ClientRuntime.Azure.xproj", "{D5296EAB-C13E-4A88-9532-BD0677D18EC9}" +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "ClientRuntime.Azure", "ClientRuntimes\CSharp\Microsoft.Rest.ClientRuntime.Azure\Microsoft.Rest.ClientRuntime.Azure.xproj", "{D5296EAB-C13E-4A88-9532-BD0677D18EC9}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "ClientRuntime.Tests", "ClientRuntimes\CSharp\Microsoft.Rest.ClientRuntime.Tests\ClientRuntime.Tests.xproj", "{F7F20E35-43EE-4FCC-BF83-7BF93B192BC8}" +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "ClientRuntime.Tests", "ClientRuntimes\CSharp\Microsoft.Rest.ClientRuntime.Tests\Microsoft.Rest.ClientRuntime.Tests.xproj", "{F7F20E35-43EE-4FCC-BF83-7BF93B192BC8}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "ClientRuntime.Log4Net", "ClientRuntimes\CSharp\Microsoft.Rest.ClientRuntime.Log4Net\ClientRuntime.Log4Net.xproj", "{348E414F-101A-4939-99FF-2C994A965A89}" +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "ClientRuntime.Log4Net", "ClientRuntimes\CSharp\Microsoft.Rest.ClientRuntime.Log4Net\Microsoft.Rest.ClientRuntime.Log4Net.xproj", "{348E414F-101A-4939-99FF-2C994A965A89}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "ClientRuntime.Etw", "ClientRuntimes\CSharp\Microsoft.Rest.ClientRuntime.Etw\ClientRuntime.Etw.xproj", "{218D7297-8254-4C70-9C04-33C3D5EE9709}" +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "ClientRuntime.Etw", "ClientRuntimes\CSharp\Microsoft.Rest.ClientRuntime.Etw\Microsoft.Rest.ClientRuntime.Etw.xproj", "{218D7297-8254-4C70-9C04-33C3D5EE9709}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "ClientRuntime.Tracing.Tests", "ClientRuntimes\CSharp\Microsoft.Rest.ClientRuntime.Tracing.Tests\ClientRuntime.Tracing.Tests.xproj", "{52C61F15-BF86-41DC-93D1-05D3DA70F032}" +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "ClientRuntime.Tracing.Tests", "ClientRuntimes\CSharp\Microsoft.Rest.ClientRuntime.Tracing.Tests\Microsoft.Rest.ClientRuntime.Tracing.Tests.xproj", "{52C61F15-BF86-41DC-93D1-05D3DA70F032}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{70D6E596-4444-489F-AE19-83EE0B0D6877}" ProjectSection(SolutionItems) = preProject global.json = global.json EndProjectSection EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "ClientRuntime.Azure.Tests", "ClientRuntimes\CSharp\Microsoft.Rest.ClientRuntime.Azure.Tests\ClientRuntime.Azure.Tests.xproj", "{3B2346E5-5D1F-4B0A-AEEE-F3AFB9583A72}" +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "ClientRuntime.Azure.Tests", "ClientRuntimes\CSharp\Microsoft.Rest.ClientRuntime.Azure.Tests\Microsoft.Rest.ClientRuntime.Azure.Tests.xproj", "{3B2346E5-5D1F-4B0A-AEEE-F3AFB9583A72}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "ClientRuntime.Azure.Authentication", "ClientRuntimes\CSharp\Microsoft.Rest.ClientRuntime.Azure.Authentication\ClientRuntime.Azure.Authentication.xproj", "{6319205D-BBFC-4150-BEAE-31B1C9B911DD}" +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "ClientRuntime.Azure.Authentication", "ClientRuntimes\CSharp\Microsoft.Rest.ClientRuntime.Azure.Authentication\Microsoft.Rest.ClientRuntime.Azure.Authentication.xproj", "{6319205D-BBFC-4150-BEAE-31B1C9B911DD}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Azure.Authentication/Microsoft.Rest.ClientRuntime.Azure.Authentication.xproj b/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Azure.Authentication/Microsoft.Rest.ClientRuntime.Azure.Authentication.xproj new file mode 100644 index 0000000000000..fc908496abbb4 --- /dev/null +++ b/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Azure.Authentication/Microsoft.Rest.ClientRuntime.Azure.Authentication.xproj @@ -0,0 +1,22 @@ + + + + 14.0 + $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) + + + + 6319205d-bbfc-4150-beae-31b1c9b911dd + Microsoft.Rest.ClientRuntime.Azure.Authentication + .\obj + .\bin\ + + + + 2.0 + + + True + + + \ No newline at end of file diff --git a/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Azure.Authentication/project.json b/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Azure.Authentication/project.json index 2059e244736c3..be7d53b2f722f 100644 --- a/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Azure.Authentication/project.json +++ b/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Azure.Authentication/project.json @@ -1,5 +1,5 @@ { - "version": "3.0.0-preview", + "version": "3.1.0-preview", "title": "Authentication for Azure Management Clients", "description": "Provides ADAL based authentication for Azure management client libraries \nSupported Platforms:\n - Portable Class Libraries\n - .NET Framework 4.5\n - Windows 8\n - Windows Phone 8.1\n - DotNet Core", "authors": [ "Microsoft" ], @@ -15,20 +15,19 @@ }, "dependencies": { - "Microsoft.Rest.ClientRuntime": "[3.0.0,4.0)" + "Microsoft.Rest.ClientRuntime": "[3.1.0,4.0)" }, "frameworks": { "net45": { "dependencies": { - "Microsoft.IdentityModel.Clients.ActiveDirectory": "[2.18.206251556]" + "Microsoft.IdentityModel.Clients.ActiveDirectory": "2.26.305102204" } }, "netstandard1.1": { "compilationOptions": { "define": [ "PORTABLE" ] }, "imports": ["dnxcore50", "portable-net45+win8"], "dependencies": { - "Microsoft.Cci": "4.0.0-rc2-23931", "Microsoft.IdentityModel.Clients.ActiveDirectory": "3.6.212041202-alpha" } }, @@ -36,7 +35,6 @@ "compilationOptions": { "define": [ "PORTABLE" ] }, "imports": ["dnxcore50"], "dependencies": { - "Microsoft.Cci": "4.0.0-rc2-23931", "Microsoft.IdentityModel.Clients.ActiveDirectory": "3.6.212041202-alpha" } } diff --git a/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Azure.Tests/ActiveDirectoryCredentialsTest.cs b/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Azure.Tests/ActiveDirectoryCredentialsTest.cs index d5940089c7c5a..affc4715af444 100644 --- a/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Azure.Tests/ActiveDirectoryCredentialsTest.cs +++ b/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Azure.Tests/ActiveDirectoryCredentialsTest.cs @@ -4,7 +4,6 @@ using System; using System.Collections; using System.Collections.Generic; -using System.Configuration; using System.Net; using System.Net.Http; using System.Reflection; @@ -14,6 +13,9 @@ using Microsoft.Rest.Azure.Authentication.Internal; using Xunit; using Xunit.Abstractions; +#if !PORTABLE +using System.Configuration; +#endif namespace Microsoft.Rest.ClientRuntime.Azure.Test { diff --git a/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Azure.Tests/Microsoft.Rest.ClientRuntime.Azure.Tests.xproj b/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Azure.Tests/Microsoft.Rest.ClientRuntime.Azure.Tests.xproj new file mode 100644 index 0000000000000..24f600dd71dff --- /dev/null +++ b/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Azure.Tests/Microsoft.Rest.ClientRuntime.Azure.Tests.xproj @@ -0,0 +1,20 @@ + + + + 14.0 + $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) + + + + 3b2346e5-5d1f-4b0a-aeee-f3afb9583a72 + Microsoft.Rest.ClientRuntime.Azure.Tests + .\obj + .\bin\ + + + + 2.0 + + + + \ No newline at end of file diff --git a/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Azure.Tests/project.json b/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Azure.Tests/project.json index 2f59e0dd5b912..7375260ccde9c 100644 --- a/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Azure.Tests/project.json +++ b/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Azure.Tests/project.json @@ -1,5 +1,5 @@ { - "version": "1.4.2-preview", + "version": "2.0.0-preview", "summary": "ClientRuntime Tests.", "authors": [ "Microsoft" ], "tags": [ "Microsoft AutoRest ClientRuntime REST" ], @@ -14,10 +14,10 @@ } }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc2-24008", - "Microsoft.Rest.ClientRuntime.Azure": "[4.0.0,5.0.0)", - "Microsoft.Rest.ClientRuntime.Azure.Authentication": "[3.0.0-preview,4.0.0)", + "Microsoft.NETCore.App": "1.0.0-rc2-3002702", + "Microsoft.Rest.ClientRuntime.Azure": "[4.1.0,5.0.0)", + "Microsoft.Rest.ClientRuntime.Azure.Authentication": "[3.1.0-preview,4.0.0)", "xunit": "2.1.0", - "dotnet-test-xunit": "1.0.0-dev-140469-38" + "dotnet-test-xunit": "1.0.0-rc2-build10015" } } diff --git a/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Azure/Microsoft.Rest.ClientRuntime.Azure.xproj b/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Azure/Microsoft.Rest.ClientRuntime.Azure.xproj new file mode 100644 index 0000000000000..7d117eebd4a27 --- /dev/null +++ b/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Azure/Microsoft.Rest.ClientRuntime.Azure.xproj @@ -0,0 +1,22 @@ + + + + 14.0 + $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) + + + + {d5296eab-c13e-4a88-9532-bd0677d18ec9} + Microsoft.Rest.ClientRuntime.Azure + .\obj + .\bin\ + + + + 2.0 + + + True + + + \ No newline at end of file diff --git a/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Azure/project.json b/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Azure/project.json index 6cc22cd81e4f2..df9ce997a3a0f 100644 --- a/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Azure/project.json +++ b/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Azure/project.json @@ -1,5 +1,5 @@ { - "version": "4.0.0", + "version": "4.1.0", "copyright": "Copyright (c) Microsoft Corporation", "iconUrl": "http://go.microsoft.com/fwlink/?LinkID=288890", "title": "Client Runtime for Microsoft Azure Libraries", @@ -31,79 +31,79 @@ "compilationOptions": { "define": [ "PORTABLE" ] }, "imports": ["dnxcore50", "portable-net45+win8"], "dependencies": { - "Microsoft.NETCore.Platforms": "1.0.1-rc2-23931", - "Microsoft.NETCore.Runtime": "1.0.2-rc2-23931", - "System.Collections": "4.0.11-rc2-23931", - "System.Collections.Concurrent": "4.0.12-rc2-23931", - "System.Diagnostics.Debug": "4.0.11-rc2-23931", - "System.Diagnostics.Tools": "4.0.1-rc2-23931", - "System.Diagnostics.Tracing": "4.1.0-rc2-23931", - "System.Globalization": "4.0.11-rc2-23931", - "System.IO": "4.1.0-rc2-23931", - "System.IO.Compression": "4.1.0-rc2-23931", - "System.Linq": "4.1.0-rc2-23931", - "System.Linq.Expressions": "4.0.11-rc2-23931", - "System.Net.Http": "4.0.1-rc2-23931", - "System.Net.Primitives": "4.0.11-rc2-23931", - "System.ObjectModel": "4.0.12-rc2-23931", - "System.Reflection": "4.1.0-rc2-23931", - "System.Reflection.Extensions": "4.0.1-rc2-23931", - "System.Reflection.Primitives": "4.0.1-rc2-23931", - "System.Resources.ResourceManager": "4.0.1-rc2-23931", - "System.Runtime": "4.1.0-rc2-23931", - "System.Runtime.Extensions": "4.1.0-rc2-23931", - "System.Runtime.InteropServices": "4.1.0-rc2-23931", - "System.Runtime.InteropServices.RuntimeInformation": "4.0.0-rc2-23931", - "System.Runtime.Numerics": "4.0.1-rc2-23931", - "System.Text.Encoding": "4.0.11-rc2-23931", - "System.Text.Encoding.Extensions": "4.0.11-rc2-23931", - "System.Text.RegularExpressions": "4.0.12-rc2-23931", - "System.Threading": "4.0.11-rc2-23931", - "System.Threading.Tasks": "4.0.11-rc2-23931", - "System.Xml.ReaderWriter": "4.0.11-rc2-23931", - "System.Xml.XDocument": "4.0.11-rc2-23931" + "Microsoft.NETCore.Platforms": "1.0.1-rc2-24027", + "Microsoft.NETCore.Runtime": "1.0.2-rc2-24027", + "System.Collections": "4.0.11-rc2-24027", + "System.Collections.Concurrent": "4.0.12-rc2-24027", + "System.Diagnostics.Debug": "4.0.11-rc2-24027", + "System.Diagnostics.Tools": "4.0.1-rc2-24027", + "System.Diagnostics.Tracing": "4.1.0-rc2-24027", + "System.Globalization": "4.0.11-rc2-24027", + "System.IO": "4.1.0-rc2-24027", + "System.IO.Compression": "4.1.0-rc2-24027", + "System.Linq": "4.1.0-rc2-24027", + "System.Linq.Expressions": "4.0.11-rc2-24027", + "System.Net.Http": "4.0.1-rc2-24027", + "System.Net.Primitives": "4.0.11-rc2-24027", + "System.ObjectModel": "4.0.12-rc2-24027", + "System.Reflection": "4.1.0-rc2-24027", + "System.Reflection.Extensions": "4.0.1-rc2-24027", + "System.Reflection.Primitives": "4.0.1-rc2-24027", + "System.Resources.ResourceManager": "4.0.1-rc2-24027", + "System.Runtime": "4.1.0-rc2-24027", + "System.Runtime.Extensions": "4.1.0-rc2-24027", + "System.Runtime.InteropServices": "4.1.0-rc2-24027", + "System.Runtime.InteropServices.RuntimeInformation": "4.0.0-rc2-24027", + "System.Runtime.Numerics": "4.0.1-rc2-24027", + "System.Text.Encoding": "4.0.11-rc2-24027", + "System.Text.Encoding.Extensions": "4.0.11-rc2-24027", + "System.Text.RegularExpressions": "4.0.12-rc2-24027", + "System.Threading": "4.0.11-rc2-24027", + "System.Threading.Tasks": "4.0.11-rc2-24027", + "System.Xml.ReaderWriter": "4.0.11-rc2-24027", + "System.Xml.XDocument": "4.0.11-rc2-24027" } }, "netstandard1.5": { "compilationOptions": { "define": [ "PORTABLE" ] }, "imports": ["dnxcore50"], "dependencies": { - "Microsoft.NETCore.Platforms": "1.0.1-rc2-23931", - "Microsoft.NETCore.Runtime": "1.0.2-rc2-23931", - "System.Collections": "4.0.11-rc2-23931", - "System.Collections.Concurrent": "4.0.12-rc2-23931", - "System.Diagnostics.Debug": "4.0.11-rc2-23931", - "System.Diagnostics.Tools": "4.0.1-rc2-23931", - "System.Diagnostics.Tracing": "4.1.0-rc2-23931", - "System.Globalization": "4.0.11-rc2-23931", - "System.IO": "4.1.0-rc2-23931", - "System.IO.Compression": "4.1.0-rc2-23931", - "System.Linq": "4.1.0-rc2-23931", - "System.Linq.Expressions": "4.0.11-rc2-23931", - "System.Net.Http": "4.0.1-rc2-23931", - "System.Net.Primitives": "4.0.11-rc2-23931", - "System.ObjectModel": "4.0.12-rc2-23931", - "System.Reflection": "4.1.0-rc2-23931", - "System.Reflection.Extensions": "4.0.1-rc2-23931", - "System.Reflection.Primitives": "4.0.1-rc2-23931", - "System.Resources.ResourceManager": "4.0.1-rc2-23931", - "System.Runtime": "4.1.0-rc2-23931", - "System.Runtime.Extensions": "4.1.0-rc2-23931", - "System.Runtime.InteropServices": "4.1.0-rc2-23931", - "System.Runtime.InteropServices.RuntimeInformation": "4.0.0-rc2-23931", - "System.Runtime.Numerics": "4.0.1-rc2-23931", - "System.Text.Encoding": "4.0.11-rc2-23931", - "System.Text.Encoding.Extensions": "4.0.11-rc2-23931", - "System.Text.RegularExpressions": "4.0.12-rc2-23931", - "System.Threading": "4.0.11-rc2-23931", - "System.Threading.Tasks": "4.0.11-rc2-23931", - "System.Xml.ReaderWriter": "4.0.11-rc2-23931", - "System.Xml.XDocument": "4.0.11-rc2-23931" + "Microsoft.NETCore.Platforms": "1.0.1-rc2-24027", + "Microsoft.NETCore.Runtime": "1.0.2-rc2-24027", + "System.Collections": "4.0.11-rc2-24027", + "System.Collections.Concurrent": "4.0.12-rc2-24027", + "System.Diagnostics.Debug": "4.0.11-rc2-24027", + "System.Diagnostics.Tools": "4.0.1-rc2-24027", + "System.Diagnostics.Tracing": "4.1.0-rc2-24027", + "System.Globalization": "4.0.11-rc2-24027", + "System.IO": "4.1.0-rc2-24027", + "System.IO.Compression": "4.1.0-rc2-24027", + "System.Linq": "4.1.0-rc2-24027", + "System.Linq.Expressions": "4.0.11-rc2-24027", + "System.Net.Http": "4.0.1-rc2-24027", + "System.Net.Primitives": "4.0.11-rc2-24027", + "System.ObjectModel": "4.0.12-rc2-24027", + "System.Reflection": "4.1.0-rc2-24027", + "System.Reflection.Extensions": "4.0.1-rc2-24027", + "System.Reflection.Primitives": "4.0.1-rc2-24027", + "System.Resources.ResourceManager": "4.0.1-rc2-24027", + "System.Runtime": "4.1.0-rc2-24027", + "System.Runtime.Extensions": "4.1.0-rc2-24027", + "System.Runtime.InteropServices": "4.1.0-rc2-24027", + "System.Runtime.InteropServices.RuntimeInformation": "4.0.0-rc2-24027", + "System.Runtime.Numerics": "4.0.1-rc2-24027", + "System.Text.Encoding": "4.0.11-rc2-24027", + "System.Text.Encoding.Extensions": "4.0.11-rc2-24027", + "System.Text.RegularExpressions": "4.0.12-rc2-24027", + "System.Threading": "4.0.11-rc2-24027", + "System.Threading.Tasks": "4.0.11-rc2-24027", + "System.Xml.ReaderWriter": "4.0.11-rc2-24027", + "System.Xml.XDocument": "4.0.11-rc2-24027" } } }, "dependencies": { - "Microsoft.Rest.ClientRuntime": "[3.0.0,4.0)" + "Microsoft.Rest.ClientRuntime": "[3.1.0,4.0)" } } diff --git a/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Etw/Microsoft.Rest.ClientRuntime.Etw.xproj b/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Etw/Microsoft.Rest.ClientRuntime.Etw.xproj new file mode 100644 index 0000000000000..a01545b896f45 --- /dev/null +++ b/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Etw/Microsoft.Rest.ClientRuntime.Etw.xproj @@ -0,0 +1,22 @@ + + + + 14.0 + $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) + + + + 218d7297-8254-4c70-9c04-33c3d5ee9709 + Microsoft.Rest.ClientRuntime + .\obj + .\bin\ + + + + 2.0 + + + True + + + \ No newline at end of file diff --git a/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Etw/project.json b/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Etw/project.json index d1546a7163a10..156f36474ff9b 100644 --- a/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Etw/project.json +++ b/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Etw/project.json @@ -1,5 +1,5 @@ { - "version": "2.0.0-preview", + "version": "2.1.0-preview", "iconUrl": "https://cdn.rawgit.com/Azure/AutoRest/7c1576dfb56974176223545cfac5762d168ded5f/Documentation/images/autorest-small-flat.png", "title": "ETW Logger for Microsoft AutoRest Generated Clients", "summary": "Provides ETW tracing of \"Microsoft.Rest\" Client Library events.", @@ -24,6 +24,6 @@ }, "dependencies": { - "Microsoft.Rest.ClientRuntime": "[3.0.0,4.0.0)" + "Microsoft.Rest.ClientRuntime": "[3.1.0,4.0.0)" } } diff --git a/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Log4Net/Microsoft.Rest.ClientRuntime.Log4Net.xproj b/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Log4Net/Microsoft.Rest.ClientRuntime.Log4Net.xproj new file mode 100644 index 0000000000000..1811718c63da9 --- /dev/null +++ b/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Log4Net/Microsoft.Rest.ClientRuntime.Log4Net.xproj @@ -0,0 +1,22 @@ + + + + 14.0 + $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) + + + + 348e414f-101a-4939-99ff-2c994a965a89 + Microsoft.Rest.ClientRuntime + .\obj + .\bin\ + + + + 2.0 + + + True + + + \ No newline at end of file diff --git a/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Log4Net/project.json b/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Log4Net/project.json index 9e5f04e566366..cce61c644eb5d 100644 --- a/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Log4Net/project.json +++ b/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Log4Net/project.json @@ -1,5 +1,5 @@ { - "version": "2.0.0-preview", + "version": "2.1.0-preview", "iconUrl": "https://cdn.rawgit.com/Azure/AutoRest/7c1576dfb56974176223545cfac5762d168ded5f/Documentation/images/autorest-small-flat.png", "title": "Log4Net Logger for Microsoft AutoRest Generated Clients", "summary": "Provides Log4Net logging for AutoRest generated client libraries.", @@ -28,7 +28,7 @@ }, "dependencies": { - "Microsoft.Rest.ClientRuntime": "[3.0.0,4.0.0)", + "Microsoft.Rest.ClientRuntime": "[3.1.0,4.0.0)", "log4net": "2.0.3" } } diff --git a/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Tests/Microsoft.Rest.ClientRuntime.Tests.xproj b/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Tests/Microsoft.Rest.ClientRuntime.Tests.xproj new file mode 100644 index 0000000000000..c9ee1ae8e1736 --- /dev/null +++ b/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Tests/Microsoft.Rest.ClientRuntime.Tests.xproj @@ -0,0 +1,20 @@ + + + + 14.0 + $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) + + + + f7f20e35-43ee-4fcc-bf83-7bf93b192bc8 + Microsoft.Rest.ClientRuntime.Tests + .\obj + .\bin\ + + + + 2.0 + + + + \ No newline at end of file diff --git a/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Tests/project.json b/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Tests/project.json index 2f59e0dd5b912..7375260ccde9c 100644 --- a/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Tests/project.json +++ b/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Tests/project.json @@ -1,5 +1,5 @@ { - "version": "1.4.2-preview", + "version": "2.0.0-preview", "summary": "ClientRuntime Tests.", "authors": [ "Microsoft" ], "tags": [ "Microsoft AutoRest ClientRuntime REST" ], @@ -14,10 +14,10 @@ } }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc2-24008", - "Microsoft.Rest.ClientRuntime.Azure": "[4.0.0,5.0.0)", - "Microsoft.Rest.ClientRuntime.Azure.Authentication": "[3.0.0-preview,4.0.0)", + "Microsoft.NETCore.App": "1.0.0-rc2-3002702", + "Microsoft.Rest.ClientRuntime.Azure": "[4.1.0,5.0.0)", + "Microsoft.Rest.ClientRuntime.Azure.Authentication": "[3.1.0-preview,4.0.0)", "xunit": "2.1.0", - "dotnet-test-xunit": "1.0.0-dev-140469-38" + "dotnet-test-xunit": "1.0.0-rc2-build10015" } } diff --git a/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Tracing.Tests/Microsoft.Rest.ClientRuntime.Tracing.Tests.xproj b/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Tracing.Tests/Microsoft.Rest.ClientRuntime.Tracing.Tests.xproj new file mode 100644 index 0000000000000..795cd4457fe2c --- /dev/null +++ b/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Tracing.Tests/Microsoft.Rest.ClientRuntime.Tracing.Tests.xproj @@ -0,0 +1,20 @@ + + + + 14.0 + $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) + + + + 52c61f15-bf86-41dc-93d1-05d3da70f032 + Microsoft.Rest.ClientRuntime.Tracing.Tests + .\obj + .\bin\ + + + + 2.0 + + + + \ No newline at end of file diff --git a/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Tracing.Tests/project.json b/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Tracing.Tests/project.json index 4730611472a4c..962890a71dc5f 100644 --- a/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Tracing.Tests/project.json +++ b/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Tracing.Tests/project.json @@ -1,5 +1,5 @@ { - "version": "1.4.2-preview", + "version": "2.0.0-preview", "summary": "ClientRuntime Tests.", "authors": [ "Microsoft" ], "tags": [ "Microsoft AutoRest ClientRuntime REST" ], @@ -18,13 +18,13 @@ } }, "dependencies": { - "Microsoft.NETCore.Platforms": "1.0.1-rc2-23931", - "Microsoft.NETCore.Runtime": "1.0.2-rc2-23931", - "Microsoft.Diagnostics.Tracing.TraceEvent": "1.0.39", - "Microsoft.Rest.ClientRuntime.Log4Net": "[2.0.0-preview,3.0.0)", - "Microsoft.Rest.ClientRuntime.Etw": "[2.0.0-preview,3.0.0)", - "Newtonsoft.Json": "7.0.1", + "Microsoft.NETCore.Platforms": "1.0.1-rc2-24027", + "Microsoft.NETCore.Runtime": "1.0.2-rc2-24027", + "Microsoft.Diagnostics.Tracing.TraceEvent": "1.0.41", + "Microsoft.Rest.ClientRuntime.Log4Net": "[2.1.0-preview,3.0.0)", + "Microsoft.Rest.ClientRuntime.Etw": "[2.1.0-preview,3.0.0)", + "Newtonsoft.Json": "8.0.3", "xunit": "2.1.0", - "dotnet-test-xunit": "1.0.0-rc2-157751-46" + "dotnet-test-xunit": "1.0.0-rc2-build10015" } } diff --git a/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime/Microsoft.Rest.ClientRuntime.xproj b/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime/Microsoft.Rest.ClientRuntime.xproj new file mode 100644 index 0000000000000..51cccd7cff923 --- /dev/null +++ b/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime/Microsoft.Rest.ClientRuntime.xproj @@ -0,0 +1,22 @@ + + + + 14.0 + $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) + + + + eddb6367-5c7b-428c-b54c-96bcd90f6e6c + Microsoft.Rest.ClientRuntime + .\obj + .\bin\ + + + + 2.0 + + + True + + + \ No newline at end of file diff --git a/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime/project.json b/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime/project.json index b6783fd831f0a..7bfb446d2b229 100644 --- a/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime/project.json +++ b/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime/project.json @@ -1,5 +1,5 @@ { - "version": "3.0.0", + "version": "3.1.0", "copyright": "Copyright (c) Microsoft Corporation", "iconUrl": "https://cdn.rawgit.com/Azure/AutoRest/7c1576dfb56974176223545cfac5762d168ded5f/Documentation/images/autorest-small-flat.png", "title": "Client Runtime Library for Microsoft AutoRest Generated Clients", @@ -35,7 +35,7 @@ "compilationOptions": { "define": [ "PORTABLE" ] }, "imports": ["dnxcore50", "portable-net45+win8"], "dependencies": { - "NETStandard.Library": "1.5.0-rc2-23931", + "NETStandard.Library": "1.5.0-rc2-24027", "Newtonsoft.Json": "8.0.3" } }, @@ -43,36 +43,36 @@ "compilationOptions": { "define": [ "PORTABLE" ] }, "imports": ["dnxcore50"], "dependencies": { - "Microsoft.NETCore.Platforms": "1.0.1-rc2-23931", - "Microsoft.NETCore.Runtime": "1.0.2-rc2-23931", - "System.Collections": "4.0.11-rc2-23931", - "System.Collections.Concurrent": "4.0.12-rc2-23931", - "System.Diagnostics.Debug": "4.0.11-rc2-23931", - "System.Diagnostics.Tools": "4.0.1-rc2-23931", - "System.Diagnostics.Tracing": "4.1.0-rc2-23931", - "System.Globalization": "4.0.11-rc2-23931", - "System.IO": "4.1.0-rc2-23931", - "System.IO.Compression": "4.1.0-rc2-23931", - "System.Linq": "4.1.0-rc2-23931", - "System.Net.Http": "4.0.1-rc2-23931", - "System.Net.Primitives": "4.0.11-rc2-23931", - "System.ObjectModel": "4.0.12-rc2-23931", - "System.Reflection": "4.1.0-rc2-23931", - "System.Reflection.Extensions": "4.0.1-rc2-23931", - "System.Reflection.Primitives": "4.0.1-rc2-23931", - "System.Resources.ResourceManager": "4.0.1-rc2-23931", - "System.Runtime": "4.1.0-rc2-23931", - "System.Runtime.Extensions": "4.1.0-rc2-23931", - "System.Runtime.InteropServices": "4.1.0-rc2-23931", - "System.Runtime.InteropServices.RuntimeInformation": "4.0.0-rc2-23931", - "System.Runtime.Numerics": "4.0.1-rc2-23931", - "System.Text.Encoding": "4.0.11-rc2-23931", - "System.Text.Encoding.Extensions": "4.0.11-rc2-23931", - "System.Text.RegularExpressions": "4.0.12-rc2-23931", - "System.Threading": "4.0.11-rc2-23931", - "System.Threading.Tasks": "4.0.11-rc2-23931", - "System.Xml.ReaderWriter": "4.0.11-rc2-23931", - "System.Xml.XDocument": "4.0.11-rc2-23931", + "Microsoft.NETCore.Platforms": "1.0.1-rc2-24027", + "Microsoft.NETCore.Runtime": "1.0.2-rc2-24027", + "System.Collections": "4.0.11-rc2-24027", + "System.Collections.Concurrent": "4.0.12-rc2-24027", + "System.Diagnostics.Debug": "4.0.11-rc2-24027", + "System.Diagnostics.Tools": "4.0.1-rc2-24027", + "System.Diagnostics.Tracing": "4.1.0-rc2-24027", + "System.Globalization": "4.0.11-rc2-24027", + "System.IO": "4.1.0-rc2-24027", + "System.IO.Compression": "4.1.0-rc2-24027", + "System.Linq": "4.1.0-rc2-24027", + "System.Net.Http": "4.0.1-rc2-24027", + "System.Net.Primitives": "4.0.11-rc2-24027", + "System.ObjectModel": "4.0.12-rc2-24027", + "System.Reflection": "4.1.0-rc2-24027", + "System.Reflection.Extensions": "4.0.1-rc2-24027", + "System.Reflection.Primitives": "4.0.1-rc2-24027", + "System.Resources.ResourceManager": "4.0.1-rc2-24027", + "System.Runtime": "4.1.0-rc2-24027", + "System.Runtime.Extensions": "4.1.0-rc2-24027", + "System.Runtime.InteropServices": "4.1.0-rc2-24027", + "System.Runtime.InteropServices.RuntimeInformation": "4.0.0-rc2-24027", + "System.Runtime.Numerics": "4.0.1-rc2-24027", + "System.Text.Encoding": "4.0.11-rc2-24027", + "System.Text.Encoding.Extensions": "4.0.11-rc2-24027", + "System.Text.RegularExpressions": "4.0.12-rc2-24027", + "System.Threading": "4.0.11-rc2-24027", + "System.Threading.Tasks": "4.0.11-rc2-24027", + "System.Xml.ReaderWriter": "4.0.11-rc2-24027", + "System.Xml.XDocument": "4.0.11-rc2-24027", "Newtonsoft.Json": "8.0.3" } } diff --git a/NuGet.Config b/NuGet.Config deleted file mode 100644 index fd5ce235a39fc..0000000000000 --- a/NuGet.Config +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/global.json b/global.json index 5b90b67959d6c..74ca124ccf67a 100644 --- a/global.json +++ b/global.json @@ -12,6 +12,6 @@ ], "sdk": { "runtime": "coreclr", - "version": "1.0.0-rc1-final" + "version": "1.0.0-preview1-002702" } } \ No newline at end of file