Merge pull request Azure#1105 from hovsepm/master

Added license header to CertificateAuthenticationProvider cs file and fixed assembly versions in client runtime.
jianghaolu · Jun 7, 2016 · 86e9bd7 · 86e9bd7
2 parents 8a35466 + 194f509
commit 86e9bd7
Show file tree

Hide file tree

Showing 19 changed files with 44 additions and 34 deletions.
diff --git a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/project.json b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/project.json
@@ -30,7 +30,7 @@
     }, 
     "Microsoft.NETCore.Platforms": "1.0.1-rc2-24027",
     "CSharp.Tests": "2.0.0",
-    "Microsoft.Rest.ClientRuntime.Azure": "[4.0.1,5.0.0)",
+    "Microsoft.Rest.ClientRuntime.Azure": "[4.0.2,5.0.0)",
     "xunit": "2.1.0",
     "dotnet-test-xunit": "1.0.0-rc2-build10015"
   }

diff --git a/AutoRest/Generators/CSharp/CSharp.Tests/project.json b/AutoRest/Generators/CSharp/CSharp.Tests/project.json
@@ -28,7 +28,7 @@
       "version": "1.0.0-rc2-*" 
     }, 
     "Microsoft.NETCore.Platforms": "1.0.1-rc2-24027",
-    "Microsoft.Rest.ClientRuntime": "[3.0.1,4.0)",
+    "Microsoft.Rest.ClientRuntime": "[3.0.2,4.0)",
     "Microsoft.Extensions.Logging": "1.0.0-rc2-final",
     "Microsoft.Extensions.Logging.Console": "1.0.0-rc2-final",
     "Microsoft.Extensions.Logging.Filter": "1.0.0-rc2-final",

diff --git a/...rp/Microsoft.Rest.ClientRuntime.Azure.Authentication/CertificateAuthenticationProvider.cs b/...rp/Microsoft.Rest.ClientRuntime.Azure.Authentication/CertificateAuthenticationProvider.cs
@@ -1,4 +1,7 @@
-using System;
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for license information.
+
+using System;
 using System.Threading.Tasks;
 using Microsoft.IdentityModel.Clients.ActiveDirectory;
 

diff --git a/...times/CSharp/Microsoft.Rest.ClientRuntime.Azure.Authentication/Properties/AssemblyInfo.cs b/...times/CSharp/Microsoft.Rest.ClientRuntime.Azure.Authentication/Properties/AssemblyInfo.cs
@@ -9,8 +9,8 @@
 
 [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.0.1.0")]
+[assembly: AssemblyVersion("3.0.0.0")]
+[assembly: AssemblyFileVersion("3.0.2.0")]
 
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Microsoft Corporation")]

diff --git 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.1-preview",
+  "version": "3.0.2-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" ],
@@ -21,7 +21,7 @@
   },
 
   "dependencies": {
-    "Microsoft.Rest.ClientRuntime": "[3.0.1,4.0)"
+    "Microsoft.Rest.ClientRuntime": "[3.0.2,4.0)"
   },
 
   "frameworks": {

diff --git a/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Azure.Tests/project.json b/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Azure.Tests/project.json
@@ -22,8 +22,8 @@
       "version": "1.0.0-rc2-*" 
     }, 
     "Microsoft.NETCore.Platforms": "1.0.1-rc2-24027",
-    "Microsoft.Rest.ClientRuntime.Azure": "[4.0.1,5.0.0)",
-    "Microsoft.Rest.ClientRuntime.Azure.Authentication": "[3.0.1-preview,4.0.0)",
+    "Microsoft.Rest.ClientRuntime.Azure": "[4.0.2,5.0.0)",
+    "Microsoft.Rest.ClientRuntime.Azure.Authentication": "[3.0.2-preview,4.0.0)",
     "xunit": "2.1.0",
     "dotnet-test-xunit": "1.0.0-rc2-build10015"
   }

diff --git a/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Azure/Properties/AssemblyInfo.cs b/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Azure/Properties/AssemblyInfo.cs
@@ -8,8 +8,8 @@
 
 [assembly: AssemblyTitle("Microsoft Rest Azure Client Runtime")]
 [assembly: AssemblyDescription("Client infrastructure for Azure client libraries.")]
-[assembly: AssemblyVersion("3.0.0.0")]
-[assembly: AssemblyFileVersion("3.2.0.0")]
+[assembly: AssemblyVersion("4.0.0.0")]
+[assembly: AssemblyFileVersion("4.0.2.0")]
 
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Microsoft Corporation")]

diff --git 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.1",
+  "version": "4.0.2",
   "copyright": "Copyright (c) Microsoft Corporation",
   "title": "Client Runtime for Microsoft Azure Libraries",
   "description": "Provides common error handling, tracing, and HTTP/REST-based pipeline manipulation. \nSupported Platforms:\n  -   Portable Class Libraries\n  -   .NET Framework 4.5\n  -   Windows 8\n  -   Windows Phone 8.1\n  -   DotNet Core",
@@ -21,7 +21,7 @@
   },
 
   "dependencies": {
-    "Microsoft.Rest.ClientRuntime": "[3.0.1,4.0)"
+    "Microsoft.Rest.ClientRuntime": "[3.0.2,4.0)"
   },
 
   "frameworks": {

diff --git a/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Etw/Properties/AssemblyInfo.cs b/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Etw/Properties/AssemblyInfo.cs
@@ -8,8 +8,8 @@
 
 [assembly: AssemblyTitle("Microsoft Rest Client Runtime ETW Logger")]
 [assembly: AssemblyDescription("Provides ETW tracing of \"Microsoft.Rest\" Client Library events.")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("2.0.0.0")]
+[assembly: AssemblyFileVersion("2.0.2.0")]
 
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Microsoft Corporation")]

diff --git 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.1-preview",
+  "version": "2.0.2-preview",
   "title": "ETW Logger for Microsoft AutoRest Generated Clients",
   "description": "Enables tracing of event messages for AutoRest generated client libraries events via ETW (Event Tracing for Windows). ETW events can be captured by subscribing to the \"Microsoft.Rest\" event source.",
   "copyright": "Copyright (c) Microsoft Corporation",
@@ -21,7 +21,7 @@
   },
 
   "dependencies": {
-    "Microsoft.Rest.ClientRuntime": "[3.0.1,4.0.0)"
+    "Microsoft.Rest.ClientRuntime": "[3.0.2,4.0.0)"
   },
 
   "frameworks": {

diff --git a/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Log4Net/Properties/AssemblyInfo.cs b/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Log4Net/Properties/AssemblyInfo.cs
@@ -8,8 +8,8 @@
 
 [assembly: AssemblyTitle("Microsoft Rest Client Runtime Log4Net Logger")]
 [assembly: AssemblyDescription("Provides Log4Net logging of \"Microsoft.Rest\" Client Library events.")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("2.0.0.0")]
+[assembly: AssemblyFileVersion("2.0.2.0")]
 
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Microsoft Corporation")]

diff --git 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.1-preview",
+  "version": "2.0.2-preview",
   "title": "Log4Net Logger for Microsoft AutoRest Generated Clients",
   "description": "Enables logging of event messages for AutoRest generated client libraries via Log4Net.",
   "copyright": "Copyright (c) Microsoft Corporation",
@@ -20,7 +20,7 @@
   },
 
   "dependencies": {
-    "Microsoft.Rest.ClientRuntime": "[3.0.1,4.0.0)",
+    "Microsoft.Rest.ClientRuntime": "[3.0.2,4.0.0)",
     "log4net": "2.0.3"
   },
 

diff --git a/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Tests/project.json b/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Tests/project.json
@@ -22,8 +22,8 @@
       "version": "1.0.0-rc2-*" 
     }, 
     "Microsoft.NETCore.Platforms": "1.0.1-rc2-24027",
-    "Microsoft.Rest.ClientRuntime.Azure": "[4.0.1,5.0.0)",
-    "Microsoft.Rest.ClientRuntime.Azure.Authentication": "[3.0.1-preview,4.0.0)",
+    "Microsoft.Rest.ClientRuntime.Azure": "[4.0.2,5.0.0)",
+    "Microsoft.Rest.ClientRuntime.Azure.Authentication": "[3.0.2-preview,4.0.0)",
     "xunit": "2.1.0",
     "dotnet-test-xunit": "1.0.0-rc2-build10015"
   }

diff --git a/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Tracing.Tests/project.json b/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Tracing.Tests/project.json
@@ -24,8 +24,8 @@
     "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.0.1-preview,3.0.0)",
-    "Microsoft.Rest.ClientRuntime.Etw": "[2.0.1-preview,3.0.0)",
+    "Microsoft.Rest.ClientRuntime.Log4Net": "[2.0.2-preview,3.0.0)",
+    "Microsoft.Rest.ClientRuntime.Etw": "[2.0.2-preview,3.0.0)",
     "Newtonsoft.Json": "8.0.3",
     "xunit": "2.1.0",
     "dotnet-test-xunit": "1.0.0-rc2-build10015"

diff --git a/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime/Properties/AssemblyInfo.cs b/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime/Properties/AssemblyInfo.cs
@@ -8,8 +8,8 @@
 
 [assembly: AssemblyTitle("Microsoft Rest Client Runtime")]
 [assembly: AssemblyDescription("Client infrastructure for client libraries generated by AutoRest.")]
-[assembly: AssemblyVersion("2.0.0.0")]
-[assembly: AssemblyFileVersion("2.2.0.0")]
+[assembly: AssemblyVersion("3.0.0.0")]
+[assembly: AssemblyFileVersion("3.0.2.0")]
 
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Microsoft Corporation")]

diff --git a/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime/project.json b/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime/project.json
@@ -1,5 +1,5 @@
 {
-  "version": "3.0.1",
+  "version": "3.0.2",
   "copyright": "Copyright (c) Microsoft Corporation",
   "title": "Client Runtime Library for Microsoft AutoRest Generated Clients",
   "description": "Infrastructure for error handling, tracing, and HttpClient pipeline configuration. Required by client libraries generated using AutoRest. \nSupported Platforms:\n  -   Portable Class Libraries\n  -   .NET Framework 4.5\n  -   Windows 8\n  -   Windows Phone 8.1\n  -   DotNet Core",

diff --git a/Tools/NuGet.exe b/Tools/NuGet.exe
diff --git a/Tools/NuGet.targets b/Tools/NuGet.targets
@@ -80,14 +80,21 @@
   <Target Name="Publish">
     <Error Condition=" '$(NuGetKey)' == '' " Text="You must provide the NuGetKey parameter to the build: /p:NuGetKey=YOUR_PUBLISHING_KEY" />
     <ItemGroup>
-      <NugetPackagesToPublish Include="$(PackageOutputDir)\*.nupkg" />
+      <NugetPackagesToPublish Include="$(PackageOutputDir)\*.nupkg" Exclude="$(PackageOutputDir)\*.symbols.nupkg"/>
+      <SymbolPackagesToPublish Include="$(PackageOutputDir)\*.symbols.nupkg"/>
     </ItemGroup>
     <PropertyGroup>
-      <ActualSource Condition=" '$(NuGetPublishingSource)' == '' "></ActualSource>
-      <ActualSource Condition=" '$(NuGetPublishingSource)' != '' "> -Source $(NuGetPublishingSource)</ActualSource>
+      <NugetSource Condition=" '$(NuGetPublishingSource)' == '' ">https://www.nuget.org/api/v2/package/</NugetSource>
+      <NugetSource Condition=" '$(NuGetPublishingSource)' != '' ">$(NuGetPublishingSource)</NugetSource>
+      <SymbolSource Condition=" '$(SymbolPublishingSource)' == '' ">https://nuget.smbsrc.net/</SymbolSource>
+      <SymbolSource Condition=" '$(SymbolPublishingSource)' != '' ">$(SymbolPublishingSource)</SymbolSource>      
     </PropertyGroup>
-    <Message Importance="high" Text="Publishing main and symbols packages to the cloud at $(NuGetPublishingSource)" />
-    <Exec Command="$(NuGetCommand) push &quot;%(NugetPackagesToPublish.FullPath)&quot; $(NuGetKey)$(ActualSource)"
+
+    <Message Importance="high" Text="Publishing main package to the cloud at $(NugetSource)" />
+    <Exec Command="$(NuGetCommand) push &quot;%(NugetPackagesToPublish.FullPath)&quot; $(NuGetKey) -Source $(NugetSource)"
           IgnoreExitCode="true" />
+    <Message Importance="high" Text="Publishing symbols package to the cloud at $(SymbolSource)" />
+    <Exec Command="$(NuGetCommand) push &quot;%(SymbolPackagesToPublish.FullPath)&quot; $(NuGetKey) -Source $(SymbolSource)"
+          IgnoreExitCode="true" />          
   </Target>
 </Project>
diff --git a/gulpfile.js b/gulpfile.js
@@ -500,7 +500,7 @@ var msbuildDefaults = {
   stdout: process.stdout,
   stderr: process.stderr,
   maxBuffer: MAX_BUFFER,
-  verbosity: 'minimal',
+  verbosity: 'normal',
   errorOnFail: true,
   toolsVersion: msBuildToolsVersion
 };