diff --git a/.vscode/tasks.json b/.vscode/tasks.json index a84216891..1b8070a50 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -5,9 +5,9 @@ "args": [], "tasks": [ { - "taskName": "build", + "taskName": "msbuild", "args": [ - "**/project.json" + "dotnetty.sln" ], "isBuildCommand": true, "problemMatcher": "$msCompile" diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index 3ae42bd47..48996d334 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -1,3 +1,7 @@ +#### 0.4.4 March 31 2017 +- Added SNI support +- Fixed assembly metadata + #### 0.4.3 March 21 2017 - Extended support for .NET 4.5 - Fix to PooledByteBufferAllocator to promptly release freed chunks for GC diff --git a/build.cake b/build.cake index 94fc3836c..2b051083b 100644 --- a/build.cake +++ b/build.cake @@ -154,8 +154,10 @@ Task("Publish-NuGet") foreach(var package in packages) { NuGetPush(package, new NuGetPushSettings { + ToolPath = ".nuget/nuget.exe", Source = source, - ApiKey = apiKey + ApiKey = apiKey, + Verbosity = NuGetVerbosity.Detailed }); } }); @@ -272,6 +274,13 @@ Task("Update-Version") throw new CakeException("No version specified!"); } + CreateAssemblyInfo("src/shared/SharedAssemblyInfo.cs", new AssemblyInfoSettings { + Product = "DotNetty", + Company = "Microsoft", + Version = version, + FileVersion = version, + Copyright = string.Format("(c) Microsoft 2015 - {0}", DateTime.Now.Year) + }); UpdateCsProjectVersion(version, csProjectFiles); }); @@ -303,6 +312,7 @@ Task("PR") Task("Nightly") .IsDependentOn("Update-Version") + .IsDependentOn("Compile") .IsDependentOn("Package-NuGet"); diff --git a/src/DotNetty.Buffers/DotNetty.Buffers.csproj b/src/DotNetty.Buffers/DotNetty.Buffers.csproj index 734eeb3f5..79a8635c9 100644 --- a/src/DotNetty.Buffers/DotNetty.Buffers.csproj +++ b/src/DotNetty.Buffers/DotNetty.Buffers.csproj @@ -6,7 +6,7 @@ Copyright © Microsoft Corporation DotNetty: buffer management en-US - 0.4.3 + 0.4.4 Microsoft Azure $(NoWarn);CS1591 false @@ -22,6 +22,9 @@ https://github.com/Azure/DotNetty/ 1.6.1 + + + diff --git a/src/DotNetty.Buffers/Properties/AssemblyInfo.cs b/src/DotNetty.Buffers/Properties/AssemblyInfo.cs index 8185cc7c5..bea1740fb 100644 --- a/src/DotNetty.Buffers/Properties/AssemblyInfo.cs +++ b/src/DotNetty.Buffers/Properties/AssemblyInfo.cs @@ -2,25 +2,7 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. using System.Reflection; -using System.Runtime.InteropServices; +using System.Resources; -// 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("DotNetty.Buffers")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyProduct("DotNetty.Buffers")] -[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 -// 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("0a7e12f0-c77e-484d-a210-dcb82b4b5bf4")] \ No newline at end of file +[assembly: NeutralResourcesLanguage("en-US")] +[assembly: AssemblyMetadata("Serviceable", "True")] \ No newline at end of file diff --git a/src/DotNetty.Codecs.Mqtt/DotNetty.Codecs.Mqtt.csproj b/src/DotNetty.Codecs.Mqtt/DotNetty.Codecs.Mqtt.csproj index 19826bb85..b33fb4d8e 100644 --- a/src/DotNetty.Codecs.Mqtt/DotNetty.Codecs.Mqtt.csproj +++ b/src/DotNetty.Codecs.Mqtt/DotNetty.Codecs.Mqtt.csproj @@ -7,7 +7,7 @@ Copyright © Microsoft Corporation DotNetty: MQTT codec en-US - 0.4.3 + 0.4.4 Microsoft Azure $(NoWarn);CS1591 false @@ -23,6 +23,9 @@ https://github.com/Azure/DotNetty/ 1.6.1 + + + diff --git a/src/DotNetty.Codecs.Protobuf/DotNetty.Codecs.Protobuf.csproj b/src/DotNetty.Codecs.Protobuf/DotNetty.Codecs.Protobuf.csproj index 16080d6f0..3b4ec8c91 100644 --- a/src/DotNetty.Codecs.Protobuf/DotNetty.Codecs.Protobuf.csproj +++ b/src/DotNetty.Codecs.Protobuf/DotNetty.Codecs.Protobuf.csproj @@ -7,7 +7,7 @@ Copyright © Microsoft Corporation DotNetty: Protobuf Proto3 codec en-US - 0.4.3 + 0.4.4 Microsoft Azure $(NoWarn);CS1591 false @@ -23,6 +23,9 @@ https://github.com/Azure/DotNetty/ 1.6.1 + + + diff --git a/src/DotNetty.Codecs.ProtocolBuffers/DotNetty.Codecs.ProtocolBuffers.csproj b/src/DotNetty.Codecs.ProtocolBuffers/DotNetty.Codecs.ProtocolBuffers.csproj index e7f18a31f..87585c50f 100644 --- a/src/DotNetty.Codecs.ProtocolBuffers/DotNetty.Codecs.ProtocolBuffers.csproj +++ b/src/DotNetty.Codecs.ProtocolBuffers/DotNetty.Codecs.ProtocolBuffers.csproj @@ -8,7 +8,7 @@ Copyright © Microsoft Corporation DotNetty: ProtocolBuffers Proto2 codec en-US - 0.4.3 + 0.4.4 Microsoft Azure $(NoWarn);CS1591 false @@ -25,6 +25,9 @@ $(PackageTargetFallback);portable-net45+win8 1.6.1 + + + diff --git a/src/DotNetty.Codecs.Redis/DotNetty.Codecs.Redis.csproj b/src/DotNetty.Codecs.Redis/DotNetty.Codecs.Redis.csproj index cc7c87599..1983fe54e 100644 --- a/src/DotNetty.Codecs.Redis/DotNetty.Codecs.Redis.csproj +++ b/src/DotNetty.Codecs.Redis/DotNetty.Codecs.Redis.csproj @@ -7,7 +7,7 @@ Copyright © Microsoft Corporation DotNetty: Redis codec en-US - 0.4.3 + 0.4.4 Microsoft Azure $(NoWarn);CS1591 false @@ -23,6 +23,9 @@ https://github.com/Azure/DotNetty/ 1.6.1 + + + diff --git a/src/DotNetty.Codecs/DotNetty.Codecs.csproj b/src/DotNetty.Codecs/DotNetty.Codecs.csproj index 0b344c1bc..e993d5f22 100644 --- a/src/DotNetty.Codecs/DotNetty.Codecs.csproj +++ b/src/DotNetty.Codecs/DotNetty.Codecs.csproj @@ -7,7 +7,7 @@ Copyright © Microsoft Corporation DotNetty: codecs en-US - 0.4.3 + 0.4.4 Microsoft Azure $(NoWarn);CS1591 true @@ -25,6 +25,9 @@ https://github.com/Azure/DotNetty/ 1.6.1 + + + diff --git a/src/DotNetty.Common/DotNetty.Common.csproj b/src/DotNetty.Common/DotNetty.Common.csproj index 816322da3..4e1943d2d 100644 --- a/src/DotNetty.Common/DotNetty.Common.csproj +++ b/src/DotNetty.Common/DotNetty.Common.csproj @@ -8,7 +8,7 @@ Copyright © Microsoft Corporation DotNetty: common routines en-US - 0.4.3 + 0.4.4 Microsoft Azure $(NoWarn);CS1591 false @@ -24,6 +24,9 @@ https://github.com/Azure/DotNetty/ 1.6.1 + + + diff --git a/src/DotNetty.Handlers/DotNetty.Handlers.csproj b/src/DotNetty.Handlers/DotNetty.Handlers.csproj index c0b841ed0..124ac8c78 100644 --- a/src/DotNetty.Handlers/DotNetty.Handlers.csproj +++ b/src/DotNetty.Handlers/DotNetty.Handlers.csproj @@ -7,7 +7,7 @@ Copyright © Microsoft Corporation DotNetty: handlers en-US - 0.4.3 + 0.4.4 Microsoft Azure $(NoWarn);CS1591 false @@ -23,6 +23,9 @@ https://github.com/Azure/DotNetty/ 1.6.1 + + + diff --git a/src/DotNetty.Transport/DotNetty.Transport.csproj b/src/DotNetty.Transport/DotNetty.Transport.csproj index 5f5fabd9e..86563a5dd 100644 --- a/src/DotNetty.Transport/DotNetty.Transport.csproj +++ b/src/DotNetty.Transport/DotNetty.Transport.csproj @@ -7,7 +7,7 @@ Copyright © Microsoft Corporation DotNetty: transport model en-US - 0.4.3 + 0.4.4 Microsoft Azure $(NoWarn);CS1591 false @@ -23,6 +23,9 @@ https://github.com/Azure/DotNetty/ 1.6.1 + + + diff --git a/src/shared/SharedAssemblyInfo.cs b/src/shared/SharedAssemblyInfo.cs new file mode 100644 index 000000000..1cafddc7c --- /dev/null +++ b/src/shared/SharedAssemblyInfo.cs @@ -0,0 +1,13 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by Cake. +// +//------------------------------------------------------------------------------ +using System.Reflection; + +[assembly: AssemblyCompany("Microsoft")] +[assembly: AssemblyProduct("DotNetty")] +[assembly: AssemblyVersion("0.4.4")] +[assembly: AssemblyFileVersion("0.4.4")] +[assembly: AssemblyCopyright("(c) Microsoft 2015 - 2017")] +