From 0c2a2a901ef1d9f0d79e00491519002d279fe63e Mon Sep 17 00:00:00 2001 From: Tom Laird-McConnell Date: Mon, 4 Jun 2018 19:44:04 -0700 Subject: [PATCH 1/2] fix success to use status==TaskStatus.RunToCompletion instead of .IsCompleted --- .../Microsoft.Bot.Builder.Autofac/Properties/AssemblyInfo.cs | 4 ++-- .../Microsoft.Bot.Builder.Calling/Properties/AssemblyInfo.cs | 4 ++-- .../Properties/AssemblyInfo.cs | 4 ++-- .../Microsoft.Bot.Builder.History/Properties/AssemblyInfo.cs | 4 ++-- .../Microsoft.Bot.Builder/Microsoft.Bot.Builder.nuspec | 2 +- .../Library/Microsoft.Bot.Builder/Properties/AssemblyInfo.cs | 4 ++-- .../Microsoft.Bot.Connector.AspNetCore.nuspec | 4 ++-- .../Properties/AssemblyInfo.cs | 4 ++-- .../Microsoft.Bot.Connector.AspNetCore2/AssemblyInfo.cs | 4 ++-- .../Microsoft.Bot.Connector.AspNetCore2.nuspec | 4 ++-- .../Microsoft.Bot.Connector.nuspec | 2 +- .../Microsoft.Bot.Connector.Falcon/Properties/AssemblyInfo.cs | 4 ++-- .../Properties/AssemblyInfo.cs | 4 ++-- .../Microsoft.Bot.Connector.nuspec | 2 +- .../Properties/AssemblyInfo.cs | 4 ++-- .../Microsoft.Bot.Connector.Shared/MicrosoftAppCredentials.cs | 4 ++-- .../Library/Microsoft.Bot.Connector.Standard/AssemblyInfo.cs | 4 ++-- 17 files changed, 31 insertions(+), 31 deletions(-) diff --git a/CSharp/Library/Microsoft.Bot.Builder.Autofac/Properties/AssemblyInfo.cs b/CSharp/Library/Microsoft.Bot.Builder.Autofac/Properties/AssemblyInfo.cs index 09fbfd568b..355ec7c1b5 100644 --- a/CSharp/Library/Microsoft.Bot.Builder.Autofac/Properties/AssemblyInfo.cs +++ b/CSharp/Library/Microsoft.Bot.Builder.Autofac/Properties/AssemblyInfo.cs @@ -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.15.2.2")] -[assembly: AssemblyFileVersion("3.15.2.2")] +[assembly: AssemblyVersion("3.15.2.3")] +[assembly: AssemblyFileVersion("3.15.2.3")] [assembly: InternalsVisibleTo("Microsoft.Bot.Builder.Tests")] [assembly: InternalsVisibleTo("Microsoft.Bot.Sample.Tests")] diff --git a/CSharp/Library/Microsoft.Bot.Builder.Calling/Properties/AssemblyInfo.cs b/CSharp/Library/Microsoft.Bot.Builder.Calling/Properties/AssemblyInfo.cs index 956505b318..1f1f2f1604 100644 --- a/CSharp/Library/Microsoft.Bot.Builder.Calling/Properties/AssemblyInfo.cs +++ b/CSharp/Library/Microsoft.Bot.Builder.Calling/Properties/AssemblyInfo.cs @@ -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.15.2.2")] -[assembly: AssemblyFileVersion("3.15.2.2")] +[assembly: AssemblyVersion("3.15.2.3")] +[assembly: AssemblyFileVersion("3.15.2.3")] //[assembly: AssemblyKeyFileAttribute(@"..\\..\\buildtools\\35MSSharedLib1024.snk")] //[assembly: AssemblyDelaySignAttribute(true)] diff --git a/CSharp/Library/Microsoft.Bot.Builder.FormFlow.Json/Properties/AssemblyInfo.cs b/CSharp/Library/Microsoft.Bot.Builder.FormFlow.Json/Properties/AssemblyInfo.cs index d06e54cdb3..8c0dd68121 100644 --- a/CSharp/Library/Microsoft.Bot.Builder.FormFlow.Json/Properties/AssemblyInfo.cs +++ b/CSharp/Library/Microsoft.Bot.Builder.FormFlow.Json/Properties/AssemblyInfo.cs @@ -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.15.2.2")] -[assembly: AssemblyFileVersion("3.15.2.2")] +[assembly: AssemblyVersion("3.15.2.3")] +[assembly: AssemblyFileVersion("3.15.2.3")] [assembly: InternalsVisibleTo("Microsoft.Bot.Builder.Tests")] [assembly: InternalsVisibleTo("Microsoft.Bot.Sample.Tests")] diff --git a/CSharp/Library/Microsoft.Bot.Builder.History/Properties/AssemblyInfo.cs b/CSharp/Library/Microsoft.Bot.Builder.History/Properties/AssemblyInfo.cs index 29b7679da5..0a6daaccda 100644 --- a/CSharp/Library/Microsoft.Bot.Builder.History/Properties/AssemblyInfo.cs +++ b/CSharp/Library/Microsoft.Bot.Builder.History/Properties/AssemblyInfo.cs @@ -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.15.2.2")] -[assembly: AssemblyFileVersion("3.15.2.2")] +[assembly: AssemblyVersion("3.15.2.3")] +[assembly: AssemblyFileVersion("3.15.2.3")] //[assembly: AssemblyKeyFileAttribute(@"..\\..\\buildtools\\35MSSharedLib1024.snk")] //[assembly: AssemblyDelaySignAttribute(true)] diff --git a/CSharp/Library/Microsoft.Bot.Builder/Microsoft.Bot.Builder.nuspec b/CSharp/Library/Microsoft.Bot.Builder/Microsoft.Bot.Builder.nuspec index e68476910d..269513d677 100644 --- a/CSharp/Library/Microsoft.Bot.Builder/Microsoft.Bot.Builder.nuspec +++ b/CSharp/Library/Microsoft.Bot.Builder/Microsoft.Bot.Builder.nuspec @@ -28,7 +28,7 @@ - + diff --git a/CSharp/Library/Microsoft.Bot.Builder/Properties/AssemblyInfo.cs b/CSharp/Library/Microsoft.Bot.Builder/Properties/AssemblyInfo.cs index 03e81097a4..906dfdfbe3 100644 --- a/CSharp/Library/Microsoft.Bot.Builder/Properties/AssemblyInfo.cs +++ b/CSharp/Library/Microsoft.Bot.Builder/Properties/AssemblyInfo.cs @@ -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.15.2.2")] -[assembly: AssemblyFileVersion("3.15.2.2")] +[assembly: AssemblyVersion("3.15.2.3")] +[assembly: AssemblyFileVersion("3.15.2.3")] [assembly: InternalsVisibleTo("Microsoft.Bot.Builder.Tests")] diff --git a/CSharp/Library/Microsoft.Bot.Connector.AspNetCore/Microsoft.Bot.Connector.AspNetCore.nuspec b/CSharp/Library/Microsoft.Bot.Connector.AspNetCore/Microsoft.Bot.Connector.AspNetCore.nuspec index 5f9f64561b..bbe8733dd1 100644 --- a/CSharp/Library/Microsoft.Bot.Connector.AspNetCore/Microsoft.Bot.Connector.AspNetCore.nuspec +++ b/CSharp/Library/Microsoft.Bot.Connector.AspNetCore/Microsoft.Bot.Connector.AspNetCore.nuspec @@ -2,7 +2,7 @@ Microsoft.Bot.Connector.AspNetCore - 1.1.3.15 + 1.1.3.16 Microsoft microsoft, BotFramework, nugetbotbuilder https://bots.botframework.com/Client/Images/bot-framework-default-7.png @@ -22,7 +22,7 @@ - + diff --git a/CSharp/Library/Microsoft.Bot.Connector.AspNetCore/Properties/AssemblyInfo.cs b/CSharp/Library/Microsoft.Bot.Connector.AspNetCore/Properties/AssemblyInfo.cs index ee0e83639a..d48bd62383 100644 --- a/CSharp/Library/Microsoft.Bot.Connector.AspNetCore/Properties/AssemblyInfo.cs +++ b/CSharp/Library/Microsoft.Bot.Connector.AspNetCore/Properties/AssemblyInfo.cs @@ -12,8 +12,8 @@ [assembly: AssemblyCulture("")] -[assembly: AssemblyVersion("1.1.3.15")] -[assembly: AssemblyFileVersion("1.1.3.15")] +[assembly: AssemblyVersion("1.1.3.16")] +[assembly: AssemblyFileVersion("1.1.3.16")] //[assembly: AssemblyKeyFileAttribute(@"..\\..\\buildtools\\35MSSharedLib1024.snk")] //[assembly: AssemblyDelaySignAttribute(true)] diff --git a/CSharp/Library/Microsoft.Bot.Connector.AspNetCore2/AssemblyInfo.cs b/CSharp/Library/Microsoft.Bot.Connector.AspNetCore2/AssemblyInfo.cs index ebd1f71995..9003380196 100644 --- a/CSharp/Library/Microsoft.Bot.Connector.AspNetCore2/AssemblyInfo.cs +++ b/CSharp/Library/Microsoft.Bot.Connector.AspNetCore2/AssemblyInfo.cs @@ -10,8 +10,8 @@ [assembly: AssemblyCulture("")] -[assembly: AssemblyVersion("2.0.1.7")] -[assembly: AssemblyFileVersion("2.0.1.7")] +[assembly: AssemblyVersion("2.0.1.8")] +[assembly: AssemblyFileVersion("2.0.1.8")] //[assembly: AssemblyKeyFileAttribute(@"..\\..\\buildtools\\35MSSharedLib1024.snk")] //[assembly: AssemblyDelaySignAttribute(true)] diff --git a/CSharp/Library/Microsoft.Bot.Connector.AspNetCore2/Microsoft.Bot.Connector.AspNetCore2.nuspec b/CSharp/Library/Microsoft.Bot.Connector.AspNetCore2/Microsoft.Bot.Connector.AspNetCore2.nuspec index fd1ac739ec..84917e56f6 100644 --- a/CSharp/Library/Microsoft.Bot.Connector.AspNetCore2/Microsoft.Bot.Connector.AspNetCore2.nuspec +++ b/CSharp/Library/Microsoft.Bot.Connector.AspNetCore2/Microsoft.Bot.Connector.AspNetCore2.nuspec @@ -2,7 +2,7 @@ Microsoft.Bot.Connector.AspNetCore - 2.0.1.7 + 2.0.1.8 Microsoft microsoft, BotFramework, nugetbotbuilder https://bots.botframework.com/Client/Images/bot-framework-default-7.png @@ -19,7 +19,7 @@ - + diff --git a/CSharp/Library/Microsoft.Bot.Connector.Falcon/Microsoft.Bot.Connector.nuspec b/CSharp/Library/Microsoft.Bot.Connector.Falcon/Microsoft.Bot.Connector.nuspec index a6add3cf4f..6dab7b72cf 100644 --- a/CSharp/Library/Microsoft.Bot.Connector.Falcon/Microsoft.Bot.Connector.nuspec +++ b/CSharp/Library/Microsoft.Bot.Connector.Falcon/Microsoft.Bot.Connector.nuspec @@ -2,7 +2,7 @@ Microsoft.Bot.Connector - 3.15.2.2 + 3.15.2.3 Microsoft microsoft, BotFramework, nugetbotbuilder https://bots.botframework.com/Client/Images/bot-framework-default-7.png diff --git a/CSharp/Library/Microsoft.Bot.Connector.Falcon/Properties/AssemblyInfo.cs b/CSharp/Library/Microsoft.Bot.Connector.Falcon/Properties/AssemblyInfo.cs index 7765d23c5b..a1138ec99a 100644 --- a/CSharp/Library/Microsoft.Bot.Connector.Falcon/Properties/AssemblyInfo.cs +++ b/CSharp/Library/Microsoft.Bot.Connector.Falcon/Properties/AssemblyInfo.cs @@ -10,8 +10,8 @@ [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] -[assembly: AssemblyVersion("3.15.2.2")] -[assembly: AssemblyFileVersion("3.15.2.2")] +[assembly: AssemblyVersion("3.15.2.3")] +[assembly: AssemblyFileVersion("3.15.2.3")] //[assembly: AssemblyKeyFileAttribute(@"..\\..\\buildtools\\35MSSharedLib1024.snk")] //[assembly: AssemblyDelaySignAttribute(true)] diff --git a/CSharp/Library/Microsoft.Bot.Connector.NetCore/Properties/AssemblyInfo.cs b/CSharp/Library/Microsoft.Bot.Connector.NetCore/Properties/AssemblyInfo.cs index 4830752b2f..b9ff1168c0 100644 --- a/CSharp/Library/Microsoft.Bot.Connector.NetCore/Properties/AssemblyInfo.cs +++ b/CSharp/Library/Microsoft.Bot.Connector.NetCore/Properties/AssemblyInfo.cs @@ -1,8 +1,8 @@ using System.Reflection; using System.Resources; -[assembly: AssemblyVersion("3.15.2.2")] -[assembly: AssemblyFileVersion("3.15.2.2")] +[assembly: AssemblyVersion("3.15.2.3")] +[assembly: AssemblyFileVersion("3.15.2.3")] //[assembly: AssemblyKeyFileAttribute(@"..\\..\\buildtools\\35MSSharedLib1024.snk")] //[assembly: AssemblyDelaySignAttribute(true)] diff --git a/CSharp/Library/Microsoft.Bot.Connector.NetFramework/Microsoft.Bot.Connector.nuspec b/CSharp/Library/Microsoft.Bot.Connector.NetFramework/Microsoft.Bot.Connector.nuspec index 7f82e12e4a..83a917186a 100644 --- a/CSharp/Library/Microsoft.Bot.Connector.NetFramework/Microsoft.Bot.Connector.nuspec +++ b/CSharp/Library/Microsoft.Bot.Connector.NetFramework/Microsoft.Bot.Connector.nuspec @@ -2,7 +2,7 @@ Microsoft.Bot.Connector - 3.15.2.2 + 3.15.2.3 Microsoft microsoft, BotFramework, nugetbotbuilder https://bots.botframework.com/Client/Images/bot-framework-default-7.png diff --git a/CSharp/Library/Microsoft.Bot.Connector.NetFramework/Properties/AssemblyInfo.cs b/CSharp/Library/Microsoft.Bot.Connector.NetFramework/Properties/AssemblyInfo.cs index 0602e88904..8b38d2a427 100644 --- a/CSharp/Library/Microsoft.Bot.Connector.NetFramework/Properties/AssemblyInfo.cs +++ b/CSharp/Library/Microsoft.Bot.Connector.NetFramework/Properties/AssemblyInfo.cs @@ -10,8 +10,8 @@ [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] -[assembly: AssemblyVersion("3.15.2.2")] -[assembly: AssemblyFileVersion("3.15.2.2")] +[assembly: AssemblyVersion("3.15.2.3")] +[assembly: AssemblyFileVersion("3.15.2.3")] //[assembly: AssemblyKeyFileAttribute(@"..\\..\\buildtools\\35MSSharedLib1024.snk")] //[assembly: AssemblyDelaySignAttribute(true)] diff --git a/CSharp/Library/Microsoft.Bot.Connector.Shared/MicrosoftAppCredentials.cs b/CSharp/Library/Microsoft.Bot.Connector.Shared/MicrosoftAppCredentials.cs index 404b28947d..36628d946e 100644 --- a/CSharp/Library/Microsoft.Bot.Connector.Shared/MicrosoftAppCredentials.cs +++ b/CSharp/Library/Microsoft.Bot.Connector.Shared/MicrosoftAppCredentials.cs @@ -192,7 +192,7 @@ public async Task GetTokenAsync(bool forceRefresh = false) // if the task is completed and is the expired token, then we need to force a new one // (This happens if bot has been 100% idle past the expiration point) - if (oAuthTokenTask.IsCompleted && oAuthTokenTask.Result.access_token == oAuthToken.access_token) + if (oAuthTokenTask.Status == TaskStatus.RanToCompletion && oAuthTokenTask.Result.access_token == oAuthToken.access_token) { oAuthTokenTask = _getCurrentTokenTask(forceRefresh: true); } @@ -232,7 +232,7 @@ private void CheckAutoRefreshToken() .ContinueWith(task => { // observe the background task and put in cache when done - if (task.IsCompleted) + if (task.Status == TaskStatus.RanToCompletion) { // update the cache with completed task so all new requests will get it tokenTaskCache[CacheKey] = task; diff --git a/CSharp/Library/Microsoft.Bot.Connector.Standard/AssemblyInfo.cs b/CSharp/Library/Microsoft.Bot.Connector.Standard/AssemblyInfo.cs index 4a768a57ca..99ac851ac4 100644 --- a/CSharp/Library/Microsoft.Bot.Connector.Standard/AssemblyInfo.cs +++ b/CSharp/Library/Microsoft.Bot.Connector.Standard/AssemblyInfo.cs @@ -1,8 +1,8 @@ using System.Reflection; using System.Runtime.InteropServices; -[assembly: AssemblyVersion("3.15.2.2")] -[assembly: AssemblyFileVersion("3.15.2.2")] +[assembly: AssemblyVersion("3.15.2.3")] +[assembly: AssemblyFileVersion("3.15.2.3")] //[assembly: AssemblyKeyFileAttribute(@"..\\..\\buildtools\\35MSSharedLib1024.snk")] //[assembly: AssemblyDelaySignAttribute(true)] From 5039c45cf2e185803f6ec1e5480ae29e70e90207 Mon Sep 17 00:00:00 2001 From: Tom Laird-McConnell Date: Mon, 25 Jun 2018 17:06:07 -0700 Subject: [PATCH 2/2] merge translation --- .../MultilingualResources/FormTest.en.xlf | 29 +++++++++++++++++++ .../MultilingualResources/FormTest.fr.xlf | 29 +++++++++++++++++++ .../FormTest/Resource/DynamicSandwich.en.resx | 15 ---------- .../FormTest/Resource/DynamicSandwich.fr.resx | 15 ---------- 4 files changed, 58 insertions(+), 30 deletions(-) diff --git a/CSharp/Tests/FormTest/MultilingualResources/FormTest.en.xlf b/CSharp/Tests/FormTest/MultilingualResources/FormTest.en.xlf index c92b02eb67..b41885dcc3 100644 --- a/CSharp/Tests/FormTest/MultilingualResources/FormTest.en.xlf +++ b/CSharp/Tests/FormTest/MultilingualResources/FormTest.en.xlf @@ -686,4 +686,33 @@ + +
+ +
+ + + + Address must start with a number. + Address must start with a number. + + + Total for your sandwich is {0:C2} is that ok? + Total for your sandwich is {0:C2} is that ok? + + + Free cookie + Free cookie + + + Free drink + Free drink + + + We are currently processing your sandwich. We will message you the status. + We are currently processing your sandwich. We will message you the status. + + + + \ No newline at end of file diff --git a/CSharp/Tests/FormTest/MultilingualResources/FormTest.fr.xlf b/CSharp/Tests/FormTest/MultilingualResources/FormTest.fr.xlf index c2cd4afaa5..5aa0f80506 100644 --- a/CSharp/Tests/FormTest/MultilingualResources/FormTest.fr.xlf +++ b/CSharp/Tests/FormTest/MultilingualResources/FormTest.fr.xlf @@ -686,4 +686,33 @@ + +
+ +
+ + + + Address must start with a number. + Address must start with a number. + + + Total for your sandwich is {0:C2} is that ok? + Total for your sandwich is {0:C2} is that ok? + + + Free cookie + Free cookie + + + Free drink + Free drink + + + We are currently processing your sandwich. We will message you the status. + We are currently processing your sandwich. We will message you the status. + + + + \ No newline at end of file diff --git a/CSharp/Tests/FormTest/Resource/DynamicSandwich.en.resx b/CSharp/Tests/FormTest/Resource/DynamicSandwich.en.resx index 8d77969113..a3df4f013d 100644 --- a/CSharp/Tests/FormTest/Resource/DynamicSandwich.en.resx +++ b/CSharp/Tests/FormTest/Resource/DynamicSandwich.en.resx @@ -12,19 +12,4 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Address must start with a number. - - - Total for your sandwich is {0:C2} is that ok? - - - Free cookie - - - Free drink - - - We are currently processing your sandwich. We will message you the status. - \ No newline at end of file diff --git a/CSharp/Tests/FormTest/Resource/DynamicSandwich.fr.resx b/CSharp/Tests/FormTest/Resource/DynamicSandwich.fr.resx index 9dad1dd2da..a3df4f013d 100644 --- a/CSharp/Tests/FormTest/Resource/DynamicSandwich.fr.resx +++ b/CSharp/Tests/FormTest/Resource/DynamicSandwich.fr.resx @@ -12,19 +12,4 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Adresse doit commencer par un nombre. - - - Total pour votre "sandwich" est {0:C2} est ce correct? - - - Cookie gratuit - - - Boisson gratuite - - - Nous traitons actuellement votre "sandwich". Nous seront vous message le statut. - \ No newline at end of file