Downgraded from .NET core 3.0 too .NET core 2.2

PlanBGmbH · Feb 17, 2020 · 5347d54 · 5347d54
1 parent 1191dab
commit 5347d54
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 20 deletions.
diff --git a/PlanB.Butler.Bot/PlanB.Butler.Bot.csproj b/PlanB.Butler.Bot/PlanB.Butler.Bot.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netcoreapp2.2</TargetFramework>
     <LangVersion>latest</LangVersion>
   </PropertyGroup>
 

diff --git a/PlanB.Butler.Bot/Startup.cs b/PlanB.Butler.Bot/Startup.cs
@@ -26,9 +26,6 @@ public void ConfigureServices(IServiceCollection services)
         {
             services.AddMvc().SetCompatibilityVersion(CompatibilityVersion.Version_2_1);
 
-            services.AddMvc(options => options.EnableEndpointRouting = false);
-            services.AddOptions();
-
             // Create the Bot Framework Adapter with error handling enabled.
             services.AddSingleton<IBotFrameworkHttpAdapter, AdapterWithErrorHandler>();
 
@@ -85,8 +82,9 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env)
             app.UseDefaultFiles();
             app.UseStaticFiles();
 
+            app.UseMvc();
+
             // app.UseHttpsRedirection();
-
         }
 
     }

diff --git a/PlanB.Butler.Library/PlanB.Butler.Library.Test/CalenderTests.cs b/PlanB.Butler.Library/PlanB.Butler.Library.Test/CalenderTests.cs
@@ -16,7 +16,8 @@ public class CalenderTests
         [TestMethod]
         public void OnlyDefinedWorkdaysFail()
         {
-
+            var culture = new System.Globalization.CultureInfo("de-DE");
+            var day = culture.DateTimeFormat.GetDayName(DateTime.Today.DayOfWeek);
             var result =BotMethods.CalculateNextDay("test");
             Assert.AreNotEqual(DateTime.MinValue, result);
         }

diff --git a/PlanB.Butler.Library/PlanB.Butler.Library.Test/PlanB.Butler.Library.Test.csproj b/PlanB.Butler.Library/PlanB.Butler.Library.Test/PlanB.Butler.Library.Test.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netcoreapp2.2</TargetFramework>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>

diff --git a/PlanB.Butler.Library/PlanB.Butler.Library/BackendCommunication.cs b/PlanB.Butler.Library/PlanB.Butler.Library/BackendCommunication.cs
@@ -20,7 +20,7 @@ public string GetDocument(string container, string resourceName)
             {
                 string resource = container + "/" + resourceName;
                 // TODO Util?
-                string sasToken=""; //= this.GenerateStorageSasToken(resource, ButlerBot.Util.Settings.StorageAccountUrl, ButlerBot.Util.Settings.StorageAccountKey);
+                string sasToken= this.GenerateStorageSasToken(resource, ButlerBot.Util.Settings.StorageAccountUrl, ButlerBot.Util.Settings.StorageAccountKey);
                 var response = httpClient.GetAsync(sasToken).Result;
                 return (response.Content.ReadAsStringAsync().Result);
             }
@@ -85,7 +85,8 @@ public HttpStatusCode PutDocument(string container, string resourceName, string
             string label = $"{container}/{resourceName}";
             var brokerProperty = new JObject();
             brokerProperty.Add("Label", label);
-            var connectionString = "";// TODO ButlerBot.Util.Settings.serviceBusConnectionString;
+            // TODO.
+            var connectionString = ButlerBot.Util.Settings.serviceBusConnectionString;
             var sasToken = this.GenerateServiceBusSasToken(connectionString,queueName);
             var uri = $"https{connectionString.Split(';')[0].ToString().Split('=')[1].Remove(0, 2)}/{queueName}/messages";
             HttpRequestMessage request = new HttpRequestMessage(HttpMethod.Post, uri);
@@ -104,8 +105,8 @@ public HttpStatusCode PutDocumentByteArray(string container, string resourceName
         {
             string label = $"{container}/{resourceName}";
             var brokerProperty = new JObject();
-            brokerProperty.Add("Label", label);
-            var connectionString = "";// TODO: ButlerBot.Util.Settings.serviceBusConnectionString;
+            brokerProperty.Add("Label", label);// TODO:
+            var connectionString = ButlerBot.Util.Settings.serviceBusConnectionString;
             var sasToken = this.GenerateServiceBusSasToken(connectionString,queueName);
             var uri = $"https{connectionString.Split(';')[0].ToString().Split('=')[1].Remove(0, 2)}/{queueName}/messages";
             HttpRequestMessage request = new HttpRequestMessage(HttpMethod.Post, uri);

diff --git a/PlanB.Butler.Library/PlanB.Butler.Library/BotMethods.cs b/PlanB.Butler.Library/PlanB.Butler.Library/BotMethods.cs
@@ -571,7 +571,8 @@ public static HttpStatusCode NextOrderUpload(Order order)
         /// <returns></returns>
         public static async Task<List<OrderBlob>> GetDailyOverview()
         {
-            var url = string.Empty; // TODO ButlerBot.Util.Settings.GetDailyOverviewFunc;
+             // TODO 
+            var url = ButlerBot.Util.Settings.GetDailyOverviewFunc;
             var response = await client.GetAsync(url);
             var result = await response.Content.ReadAsStringAsync();
             var tmp = JsonConvert.DeserializeObject<List<OrderBlob>>(result);
@@ -585,8 +586,8 @@ public static async Task<List<OrderBlob>> GetDailyOverview()
         /// <param name="user"></param>
         /// <returns></returns>
         public static async Task<List<OrderBlob>> GetDailyUserOverview(string user)
-        {
-            var url = string.Empty; //  TODO: ButlerBot.Util.Settings.GetDailyUserOverviewFunc;
+        {//  TODO:
+            var url = ButlerBot.Util.Settings.GetDailyUserOverviewFunc;
             client.DefaultRequestHeaders.Add("user", user);
             var response = await client.GetAsync(url);
             var result = await response.Content.ReadAsStringAsync();
@@ -601,8 +602,8 @@ public static async Task<List<OrderBlob>> GetDailyUserOverview(string user)
         /// <param name="user"></param>
         /// <returns></returns>
         public static async Task<List<SalaryDeduction>> GetSalaryDeduction(string user)
-        {
-            var url = string.Empty; // TODO: ButlerBot.Util.Settings.GetSalaryDeduction;
+        { // TODO:
+            var url = ButlerBot.Util.Settings.GetSalaryDeduction;
             client.DefaultRequestHeaders.Add("user", user);
             var response = await client.GetAsync(url);
             var result = await response.Content.ReadAsStringAsync();

diff --git a/PlanB.Butler.Library/PlanB.Butler.Library/PlanB.Butler.Library.csproj b/PlanB.Butler.Library/PlanB.Butler.Library/PlanB.Butler.Library.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netcoreapp2.2</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/PlanB.Butler.Services/PostDocument.cs b/PlanB.Butler.Services/PostDocument.cs
@@ -83,12 +83,11 @@ public static async void PostDocumentSalary([ServiceBusTrigger("q.planbutlerupda
         [Singleton]
         [FunctionName(nameof(PostDocumentExcel))]
         public static void PostDocumentExcel([ServiceBusTrigger("q.planbutlerupdateexcel", Connection = "butlerSend")]Microsoft.Azure.ServiceBus.Message messageHeader,
-       [Blob("{Label}", FileAccess.ReadWrite, Connection = "StorageSend")]out string payload,
+       [Blob("{Label}", FileAccess.ReadWrite, Connection = "StorageSend")]out byte[] payload,
        ILogger log)
         {
             // Implement Logging after MVP.
-
-            payload = Encoding.Default.GetString(messageHeader.Body);
+            payload = messageHeader.Body;
         }
     }
 }