Skip to content

Commit

Permalink
Patch nuspecs and bump versions (#4335)
Browse files Browse the repository at this point in the history
* cleanup nuspec files

* bump version

* bump connector version
  • Loading branch information
Tom Laird-McConnell authored Mar 20, 2018
1 parent 992e29f commit aa5a37b
Show file tree
Hide file tree
Showing 19 changed files with 85 additions and 85 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("3.14.1.0")]
[assembly: AssemblyFileVersion("3.14.1.0")]
[assembly: AssemblyVersion("3.14.1.1")]
[assembly: AssemblyFileVersion("3.14.1.1")]

[assembly: InternalsVisibleTo("Microsoft.Bot.Builder.Tests")]
[assembly: InternalsVisibleTo("Microsoft.Bot.Sample.Tests")]
Expand Down
Original file line number Diff line number Diff line change
@@ -1,34 +1,32 @@
<?xml version="1.0"?>
<package xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<metadata xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
<id>Microsoft.Bot.Builder.Calling</id>
<version>$version$</version>
<authors>Microsoft</authors>
<owners>microsoft, BotFramework, nugetbotbuilder </owners>
<copyright>© Microsoft Corporation. All rights reserved.</copyright>
<requireLicenseAcceptance>true</requireLicenseAcceptance>
<licenseUrl>https://github.com/Microsoft/BotBuilder/blob/master/LICENSE</licenseUrl>
<description>
Microsoft Bot Builder extension for Skype Calling API. It provides the required constructs to extend your bot to handle incoming calls from Skype.
</description>
<projectUrl>https://github.com/Microsoft/BotBuilder</projectUrl>
<iconUrl>http://docs.botframework.com/images/bot_icon.png</iconUrl>
<summary>A Microsoft Bot Builder extension for Skype Calling API.</summary>
<language>en-US</language>
<dependencies>
<dependency id="Autofac" version="3.5.2"/>
<dependency id="Microsoft.AspNet.WebApi.Client" version="5.2.3" />
<dependency id="Microsoft.AspNet.WebApi.Core" version="5.2.3" />
<dependency id="Microsoft.Bot.Builder" version="$builder$" />
<dependency id="Newtonsoft.Json" version="8.0.3" />
<dependency id="System.IdentityModel.Tokens.Jwt" version="[4.0.4.403061554,5.0)" />
<dependency id="Microsoft.IdentityModel.Protocol.Extensions" version="1.0.4.403061554" />
</dependencies>
</metadata>
<files>
<file src="bin\release\Microsoft.Bot.Builder.Calling.dll" target="lib\net46"/>
<file src="bin\release\Microsoft.Bot.Builder.Calling.xml" target="lib\net46" />
<file src="bin\release\Microsoft.Bot.Builder.Calling.pdb" target="lib\net46" />
<file src="*.cs" target="src" />
</files>
<metadata xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
<id>Microsoft.Bot.Builder.Calling</id>
<version>$version$</version>
<authors>Microsoft</authors>
<owners>microsoft, BotFramework, nugetbotbuilder </owners>
<copyright>© Microsoft Corporation. All rights reserved.</copyright>
<requireLicenseAcceptance>true</requireLicenseAcceptance>
<licenseUrl>https://github.com/Microsoft/BotBuilder/blob/master/LICENSE</licenseUrl>
<description>
Microsoft Bot Builder extension for Skype Calling API. It provides the required constructs to extend your bot to handle incoming calls from Skype.
</description>
<projectUrl>https://github.com/Microsoft/BotBuilder</projectUrl>
<iconUrl>http://docs.botframework.com/images/bot_icon.png</iconUrl>
<summary>A Microsoft Bot Builder extension for Skype Calling API.</summary>
<language>en-US</language>
<dependencies>
<dependency id="Autofac" version="3.5.2"/>
<dependency id="Microsoft.AspNet.WebApi.Client" version="5.2.3" />
<dependency id="Microsoft.AspNet.WebApi.Core" version="5.2.3" />
<dependency id="Microsoft.Bot.Builder" version="$builder$" />
<dependency id="Newtonsoft.Json" version="9.0.1" />
</dependencies>
</metadata>
<files>
<file src="bin\release\Microsoft.Bot.Builder.Calling.dll" target="lib\net46"/>
<file src="bin\release\Microsoft.Bot.Builder.Calling.xml" target="lib\net46" />
<file src="bin\release\Microsoft.Bot.Builder.Calling.pdb" target="lib\net46" />
<file src="*.cs" target="src" />
</files>
</package>
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("3.14.1.0")]
[assembly: AssemblyFileVersion("3.14.1.0")]
[assembly: AssemblyVersion("3.14.1.1")]
[assembly: AssemblyFileVersion("3.14.1.1")]

//[assembly: AssemblyKeyFileAttribute(@"..\\..\\buildtools\\35MSSharedLib1024.snk")]
//[assembly: AssemblyDelaySignAttribute(true)]
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("3.14.1.0")]
[assembly: AssemblyFileVersion("3.14.1.0")]
[assembly: AssemblyVersion("3.14.1.1")]
[assembly: AssemblyFileVersion("3.14.1.1")]

[assembly: InternalsVisibleTo("Microsoft.Bot.Builder.Tests")]
[assembly: InternalsVisibleTo("Microsoft.Bot.Sample.Tests")]
Expand Down
Original file line number Diff line number Diff line change
@@ -1,29 +1,30 @@
<?xml version="1.0"?>
<package xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<metadata xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
<id>Microsoft.Bot.Builder.History</id>
<version>$version$</version>
<authors>Microsoft</authors>
<owners>microsoft, BotFramework, nugetbotbuilder </owners>
<copyright>© Microsoft Corporation. All rights reserved.</copyright>
<requireLicenseAcceptance>true</requireLicenseAcceptance>
<licenseUrl>https://github.com/Microsoft/BotBuilder/blob/master/LICENSE</licenseUrl>
<description>
Provide interfaces and classes for working with conversation histories in the Microsoft Bot Builder.
<metadata xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
<id>Microsoft.Bot.Builder.History</id>
<version>$version$</version>
<authors>Microsoft</authors>
<owners>microsoft, BotFramework, nugetbotbuilder </owners>
<copyright>© Microsoft Corporation. All rights reserved.</copyright>
<requireLicenseAcceptance>true</requireLicenseAcceptance>
<licenseUrl>https://github.com/Microsoft/BotBuilder/blob/master/LICENSE</licenseUrl>
<description>
Provide interfaces and classes for working with conversation histories in the Microsoft Bot Builder.
In particular this includes facilities to walk across stored histories and replay them.
</description>
<projectUrl>https://github.com/Microsoft/BotBuilder</projectUrl>
<iconUrl>http://docs.botframework.com/images/bot_icon.png</iconUrl>
<summary>Microsoft History extensions for Microsoft.Bot.Builder.</summary>
<language>en-US</language>
<dependencies>
<dependency id="Microsoft.Bot.Builder" version="$builder$"/>
</dependencies>
</metadata>
<files>
<file src="bin\release\Microsoft.Bot.Builder.History.dll" target="lib\net46"/>
<file src="bin\release\Microsoft.Bot.Builder.History.xml" target="lib\net46" />
<file src="bin\release\Microsoft.Bot.Builder.History.pdb" target="lib\net46" />
<file src="**\*.cs" exclude="**\obj\**\*.cs" target="src" />
</files>
</description>
<projectUrl>https://github.com/Microsoft/BotBuilder</projectUrl>
<iconUrl>http://docs.botframework.com/images/bot_icon.png</iconUrl>
<summary>Microsoft History extensions for Microsoft.Bot.Builder.</summary>
<language>en-US</language>
<dependencies>
<dependency id="Microsoft.Bot.Builder" version="$builder$"/>
<dependency id="Newtonsoft.Json" version="9.0.1" />
</dependencies>
</metadata>
<files>
<file src="bin\release\Microsoft.Bot.Builder.History.dll" target="lib\net46"/>
<file src="bin\release\Microsoft.Bot.Builder.History.xml" target="lib\net46" />
<file src="bin\release\Microsoft.Bot.Builder.History.pdb" target="lib\net46" />
<file src="**\*.cs" exclude="**\obj\**\*.cs" target="src" />
</files>
</package>
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("3.14.1.0")]
[assembly: AssemblyFileVersion("3.14.1.0")]
[assembly: AssemblyVersion("3.14.1.1")]
[assembly: AssemblyFileVersion("3.14.1.1")]

//[assembly: AssemblyKeyFileAttribute(@"..\\..\\buildtools\\35MSSharedLib1024.snk")]
//[assembly: AssemblyDelaySignAttribute(true)]
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<dependency id="Autofac" version="3.5.2"/>
<dependency id="Chronic.Signed" version="0.3.2" />
<dependency id="Microsoft.AspNet.WebAPI.Core" version="5.2.3" />
<dependency id="Microsoft.Bot.Connector" version="3.14.1.0" />
<dependency id="Microsoft.Bot.Connector" version="3.14.1.1" />
<dependency id="Microsoft.Rest.ClientRuntime" version="2.3.2" />
<dependency id="Newtonsoft.Json" version="9.0.1" />
<dependency id="System.IdentityModel.Tokens.Jwt" version="5.1.4" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("3.14.1.0")]
[assembly: AssemblyFileVersion("3.14.1.0")]
[assembly: AssemblyVersion("3.14.1.1")]
[assembly: AssemblyFileVersion("3.14.1.1")]


[assembly: InternalsVisibleTo("Microsoft.Bot.Builder.Tests")]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<package xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<metadata xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
<id>Microsoft.Bot.Connector.AspNetCore</id>
<version>1.1.3.10</version>
<version>1.1.3.11</version>
<authors>Microsoft</authors>
<owners>microsoft, BotFramework, nugetbotbuilder </owners>
<iconUrl>https://bots.botframework.com/Client/Images/bot-framework-default-7.png</iconUrl>
Expand All @@ -22,7 +22,7 @@
<dependency id="Newtonsoft.Json" version="9.0.1" />
<dependency id="System.IdentityModel.Tokens.Jwt" version="5.1.4" />
<dependency id="Microsoft.AspNetCore.Mvc.Core" version="1.1.4" />
<dependency id="Microsoft.Bot.Connector" version="3.14.1.0" />
<dependency id="Microsoft.Bot.Connector" version="3.14.1.1" />
</group>
</dependencies>
</metadata>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
[assembly: AssemblyCulture("")]


[assembly: AssemblyVersion("1.1.3.10")]
[assembly: AssemblyFileVersion("1.1.3.10")]
[assembly: AssemblyVersion("1.1.3.11")]
[assembly: AssemblyFileVersion("1.1.3.11")]

//[assembly: AssemblyKeyFileAttribute(@"..\\..\\buildtools\\35MSSharedLib1024.snk")]
//[assembly: AssemblyDelaySignAttribute(true)]
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
[assembly: AssemblyCulture("")]


[assembly: AssemblyVersion("2.0.1.2")]
[assembly: AssemblyFileVersion("2.0.1.2")]
[assembly: AssemblyVersion("2.0.1.3")]
[assembly: AssemblyFileVersion("2.0.1.3")]

//[assembly: AssemblyKeyFileAttribute(@"..\\..\\buildtools\\35MSSharedLib1024.snk")]
//[assembly: AssemblyDelaySignAttribute(true)]
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<package xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<metadata xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
<id>Microsoft.Bot.Connector.AspNetCore</id>
<version>2.0.1.2</version>
<version>2.0.1.3</version>
<authors>Microsoft</authors>
<owners>microsoft, BotFramework, nugetbotbuilder </owners>
<iconUrl>https://bots.botframework.com/Client/Images/bot-framework-default-7.png</iconUrl>
Expand All @@ -19,7 +19,7 @@
<dependency id="Microsoft.AspNetCore.Authentication.JwtBearer" version="2.0.0" />
<dependency id="Microsoft.AspNetCore.Mvc" version="2.0.0" />
<dependency id="Microsoft.Rest.ClientRuntime" version="2.3.10" />
<dependency id="Microsoft.Bot.Connector" version="3.14.1.0" />
<dependency id="Microsoft.Bot.Connector" version="3.14.1.1" />
</group>
</dependencies>
</metadata>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<package xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<metadata xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
<id>Microsoft.Bot.Connector</id>
<version>3.14.1.0</version>
<version>3.14.1.1</version>
<authors>Microsoft</authors>
<owners>microsoft, BotFramework, nugetbotbuilder </owners>
<iconUrl>https://bots.botframework.com/Client/Images/bot-framework-default-7.png</iconUrl>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

[assembly: AssemblyVersion("3.14.1.0")]
[assembly: AssemblyFileVersion("3.14.1.0")]
[assembly: AssemblyVersion("3.14.1.1")]
[assembly: AssemblyFileVersion("3.14.1.1")]

//[assembly: AssemblyKeyFileAttribute(@"..\\..\\buildtools\\35MSSharedLib1024.snk")]
//[assembly: AssemblyDelaySignAttribute(true)]
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
using System.Reflection;
using System.Resources;

[assembly: AssemblyVersion("3.14.1.0")]
[assembly: AssemblyFileVersion("3.14.1.0")]
[assembly: AssemblyVersion("3.14.1.1")]
[assembly: AssemblyFileVersion("3.14.1.1")]

//[assembly: AssemblyKeyFileAttribute(@"..\\..\\buildtools\\35MSSharedLib1024.snk")]
//[assembly: AssemblyDelaySignAttribute(true)]
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<package xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<metadata xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
<id>Microsoft.Bot.Connector</id>
<version>3.14.1.0</version>
<version>3.14.1.1</version>
<authors>Microsoft</authors>
<owners>microsoft, BotFramework, nugetbotbuilder </owners>
<iconUrl>https://bots.botframework.com/Client/Images/bot-framework-default-7.png</iconUrl>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

[assembly: AssemblyVersion("3.14.1.0")]
[assembly: AssemblyFileVersion("3.14.1.0")]
[assembly: AssemblyVersion("3.14.1.1")]
[assembly: AssemblyFileVersion("3.14.1.1")]

//[assembly: AssemblyKeyFileAttribute(@"..\\..\\buildtools\\35MSSharedLib1024.snk")]
//[assembly: AssemblyDelaySignAttribute(true)]
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
using System.Reflection;
using System.Runtime.InteropServices;

[assembly: AssemblyVersion("3.14.1.0")]
[assembly: AssemblyFileVersion("3.14.1.0")]
[assembly: AssemblyVersion("3.14.1.1")]
[assembly: AssemblyFileVersion("3.14.1.1")]

//[assembly: AssemblyKeyFileAttribute(@"..\\..\\buildtools\\35MSSharedLib1024.snk")]
//[assembly: AssemblyDelaySignAttribute(true)]
1 change: 1 addition & 0 deletions CSharp/Microsoft.Bot.Builder.sln
Original file line number Diff line number Diff line change
Expand Up @@ -195,6 +195,7 @@ Global
{AA997154-61D1-49FA-A4C6-E6AC79A7508A} = {28BCEB2C-F4BE-416D-A4FD-A311E99A9EB5}
{32013CA6-2B38-4B59-9093-538167DF31E1} = {28BCEB2C-F4BE-416D-A4FD-A311E99A9EB5}
{09C14EF5-F94A-480F-82CA-4D934A977C7F} = {28BCEB2C-F4BE-416D-A4FD-A311E99A9EB5}
{48E4B834-49A5-48EB-BBA7-20A7CD9690D2} = {8E05398E-3CBE-4DCD-9382-072DC8859427}
{BC07AED8-F885-4810-8C41-66C05D4C1EAD} = {8E05398E-3CBE-4DCD-9382-072DC8859427}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
Expand Down

0 comments on commit aa5a37b

Please sign in to comment.