From 0933d58d682e38db9d5c469f5b2a951622737500 Mon Sep 17 00:00:00 2001 From: Hovsep Date: Thu, 14 Jul 2016 10:47:44 -0700 Subject: [PATCH] Aligning Authentication releases with the master branch (#1250) * Update project.json * Update AssemblyInfo.cs * Update project.json * Update project.json * upgraded to ADAL 2.27 (#1222) * Fixed ClientRuntime.sln --- ClientRuntime.sln | 30 +++++++++++++++++-- .../Properties/AssemblyInfo.cs | 2 +- .../project.json | 4 +-- 3 files changed, 30 insertions(+), 6 deletions(-) diff --git a/ClientRuntime.sln b/ClientRuntime.sln index cea036670b3bc..2df0595bffedf 100644 --- a/ClientRuntime.sln +++ b/ClientRuntime.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 14 -VisualStudioVersion = 14.0.25123.0 +VisualStudioVersion = 14.0.25420.1 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Rest.ClientRuntime", "src\client\Microsoft.Rest.ClientRuntime\Microsoft.Rest.ClientRuntime.xproj", "{EDDB6367-5C7B-428C-B54C-96BCD90F6E6C}" EndProject @@ -24,12 +24,20 @@ Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Rest.ClientRuntim EndProject Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Rest.ClientRuntime.Azure.Authentication", "src\client\Microsoft.Rest.ClientRuntime.Azure.Authentication\Microsoft.Rest.ClientRuntime.Azure.Authentication.xproj", "{6319205D-BBFC-4150-BEAE-31B1C9B911DD}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "CSharp.Tests", "src\generator\AutoRest.CSharp.Tests\CSharp.Tests.xproj", "{784D4B45-F12A-4B8F-A86C-35A080814A19}" +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "AutoRest.CSharp.Tests", "src\generator\AutoRest.CSharp.Tests\AutoRest.CSharp.Tests.xproj", "{784D4B45-F12A-4B8F-A86C-35A080814A19}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Azure.CSharp.Tests", "src\generator\AutoRest.CSharp.Azure.Tests\Azure.CSharp.Tests.xproj", "{43DFEF27-2FD7-4827-A669-DFD2DD1CBBCC}" +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "AutoRest.CSharp.Azure.Tests", "src\generator\AutoRest.CSharp.Azure.Tests\AutoRest.CSharp.Azure.Tests.xproj", "{43DFEF27-2FD7-4827-A669-DFD2DD1CBBCC}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "GeneratorTests", "GeneratorTests", "{0B59BFFC-587F-4E08-987C-82CCB57426B1}" EndProject +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "AutoRest.Core", "src\core\AutoRest.Core\AutoRest.Core.xproj", "{C876085F-9DC3-41F0-B7B4-17022CD84684}" +EndProject +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "AutoRest.CSharp", "src\generator\AutoRest.CSharp\AutoRest.CSharp.xproj", "{CC1EEC95-41EF-44B6-8761-00FA3E647248}" +EndProject +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "AutoRest.Extensions", "src\core\AutoRest.Extensions\AutoRest.Extensions.xproj", "{7DD043EB-5E53-4180-B123-CC3CC5022E34}" +EndProject +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "AutoRest.Swagger", "src\modeler\AutoRest.Swagger\AutoRest.Swagger.xproj", "{9517265E-5127-460C-9DDE-FE017D73121C}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -76,6 +84,22 @@ Global {43DFEF27-2FD7-4827-A669-DFD2DD1CBBCC}.Debug|Any CPU.Build.0 = Debug|Any CPU {43DFEF27-2FD7-4827-A669-DFD2DD1CBBCC}.Release|Any CPU.ActiveCfg = Release|Any CPU {43DFEF27-2FD7-4827-A669-DFD2DD1CBBCC}.Release|Any CPU.Build.0 = Release|Any CPU + {C876085F-9DC3-41F0-B7B4-17022CD84684}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {C876085F-9DC3-41F0-B7B4-17022CD84684}.Debug|Any CPU.Build.0 = Debug|Any CPU + {C876085F-9DC3-41F0-B7B4-17022CD84684}.Release|Any CPU.ActiveCfg = Release|Any CPU + {C876085F-9DC3-41F0-B7B4-17022CD84684}.Release|Any CPU.Build.0 = Release|Any CPU + {CC1EEC95-41EF-44B6-8761-00FA3E647248}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {CC1EEC95-41EF-44B6-8761-00FA3E647248}.Debug|Any CPU.Build.0 = Debug|Any CPU + {CC1EEC95-41EF-44B6-8761-00FA3E647248}.Release|Any CPU.ActiveCfg = Release|Any CPU + {CC1EEC95-41EF-44B6-8761-00FA3E647248}.Release|Any CPU.Build.0 = Release|Any CPU + {7DD043EB-5E53-4180-B123-CC3CC5022E34}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {7DD043EB-5E53-4180-B123-CC3CC5022E34}.Debug|Any CPU.Build.0 = Debug|Any CPU + {7DD043EB-5E53-4180-B123-CC3CC5022E34}.Release|Any CPU.ActiveCfg = Release|Any CPU + {7DD043EB-5E53-4180-B123-CC3CC5022E34}.Release|Any CPU.Build.0 = Release|Any CPU + {9517265E-5127-460C-9DDE-FE017D73121C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {9517265E-5127-460C-9DDE-FE017D73121C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {9517265E-5127-460C-9DDE-FE017D73121C}.Release|Any CPU.ActiveCfg = Release|Any CPU + {9517265E-5127-460C-9DDE-FE017D73121C}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/src/client/Microsoft.Rest.ClientRuntime.Azure.Authentication/Properties/AssemblyInfo.cs b/src/client/Microsoft.Rest.ClientRuntime.Azure.Authentication/Properties/AssemblyInfo.cs index 4b64238dfa653..4f6e63a302999 100644 --- a/src/client/Microsoft.Rest.ClientRuntime.Azure.Authentication/Properties/AssemblyInfo.cs +++ b/src/client/Microsoft.Rest.ClientRuntime.Azure.Authentication/Properties/AssemblyInfo.cs @@ -10,7 +10,7 @@ [assembly: AssemblyTitle("Microsoft Rest Azure Client Runtime Authentication")] [assembly: AssemblyDescription("Client authentication infrastructure for Azure client libraries.")] [assembly: AssemblyVersion("2.0.0.0")] -[assembly: AssemblyFileVersion("2.2.2.0")] +[assembly: AssemblyFileVersion("2.2.4.0")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("Microsoft Corporation")] diff --git a/src/client/Microsoft.Rest.ClientRuntime.Azure.Authentication/project.json b/src/client/Microsoft.Rest.ClientRuntime.Azure.Authentication/project.json index 09dc0c5a52801..4f1b7b97beaaf 100644 --- a/src/client/Microsoft.Rest.ClientRuntime.Azure.Authentication/project.json +++ b/src/client/Microsoft.Rest.ClientRuntime.Azure.Authentication/project.json @@ -1,5 +1,5 @@ { - "version": "2.2.3-*", + "version": "2.2.4-*", "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" ], @@ -27,7 +27,7 @@ "frameworks": { "net45": { "dependencies": { - "Microsoft.IdentityModel.Clients.ActiveDirectory": "[2.18.0,3.0)" + "Microsoft.IdentityModel.Clients.ActiveDirectory": "[2.27,3.0)" } }, "netstandard1.1": {