Merge pull request #255 from microsoft/dev +resetdemo

Integrate new features and bugfixes

Author: markusheiliger

TeamCloud.code-workspace

@@ -3,5 +3,8 @@
 		{
 			"path": "."
 		}
-	]
+	],
+	"settings": {
+		"restructuredtext.languageServer.disabled": true
+	}
 }

scripts/delete-task-hubs.sh

@@ -12,30 +12,30 @@ pushd $cdir/../src/TeamCloud.Orchestrator > /dev/null
 
 popd > /dev/null
 
-for azureProvider in AppInsights DevOps DevTestLabs; do
+# for azureProvider in AppInsights DevOps DevTestLabs; do
 
-    echo "Deleting task hub for 'TeamCloud.Providers.Azure.$azureProvider'."
+#     echo "Deleting task hub for 'TeamCloud.Providers.Azure.$azureProvider'."
 
-    pushd $cdir/../../TeamCloud-Providers/Azure/TeamCloud.Providers.Azure.$azureProvider > /dev/null
+#     pushd $cdir/../../TeamCloud-Providers/Azure/TeamCloud.Providers.Azure.$azureProvider > /dev/null
 
-        func durable delete-task-hub --connection-string-setting DurableFunctionsHubStorage
-        echo ""
+#         func durable delete-task-hub --connection-string-setting DurableFunctionsHubStorage
+#         echo ""
 
-    popd > /dev/null
+#     popd > /dev/null
 
-done
+# done
 
-for githubProvider in Repos Actions; do
+# for githubProvider in Repos Actions; do
 
-    echo "Deleting task hub for 'TeamCloud.Providers.GitHub.$githubProvider'."
+#     echo "Deleting task hub for 'TeamCloud.Providers.GitHub.$githubProvider'."
 
-    pushd $cdir/../../TeamCloud-Providers/Azure/TeamCloud.Providers.Azure.$githubProvider > /dev/null
+#     pushd $cdir/../../TeamCloud-Providers/Azure/TeamCloud.Providers.Azure.$githubProvider > /dev/null
 
-        func durable delete-task-hub --connection-string-setting DurableFunctionsHubStorage
-        echo ""
+#         func durable delete-task-hub --connection-string-setting DurableFunctionsHubStorage
+#         echo ""
 
-    popd > /dev/null
+#     popd > /dev/null
 
-done
+# done
 
 echo "Done."

src/TeamCloud.API/Controllers/ProjectController.cs

@@ -192,7 +192,7 @@ public Task<IActionResult> Post([FromBody] ProjectDefinition projectDefinition)
             project.Tags = input
                 .ToObject<Dictionary<string, object>>()
                 .ToDictionary(kvp => kvp.Key, kvp => kvp.Value?.ToString());
-            
+
             var currentUser = users.FirstOrDefault(u => u.Id == UserService.CurrentUserId);
 
             var command = new ProjectCreateCommand(currentUser, project);

src/TeamCloud.API/Data/Serialization/DataResultConverter.cs

@@ -3,8 +3,8 @@
  *  Licensed under the MIT License.
  */
 
-using Newtonsoft.Json;
 using System;
+using Newtonsoft.Json;
 using TeamCloud.API.Data.Results;
 using TeamCloud.Serialization;
 

src/TeamCloud.API/GlobalExtensions.cs

@@ -20,7 +20,6 @@
 using TeamCloud.API.Data.Results;
 using TeamCloud.API.Initialization;
 using TeamCloud.API.Services;
-using TeamCloud.Model.Commands;
 using TeamCloud.Model.Commands.Core;
 
 namespace TeamCloud.API
@@ -141,6 +140,7 @@ public static string GetTenantId(this ClaimsPrincipal claimsPrincipal)
             return tenantId;
         }
 
+        // TODO: Update to use teamcloud serializer
         public static Task<T> ReadAsAsync<T>(this HttpContent httpContent, JsonSerializerSettings serializerSettings = null)
             => httpContent.ReadAsAsync<T>(JsonSerializer.CreateDefault(serializerSettings));
 

src/TeamCloud.Azure.Resources/AzureResource.cs

@@ -202,6 +202,13 @@ protected virtual async Task<string> GetLatestApiVersionAsync(bool includePrevie
             return apiVersions.FirstOrDefault();
         }
 
+        public async Task<string> GetLocationAsync()
+        {
+            var json = await GetJsonAsync().ConfigureAwait(false);
+
+            return json?.SelectToken("location")?.ToString();
+        }
+
         public async Task<JObject> GetJsonAsync(string apiVersion = null)
         {
             apiVersion ??= await GetLatestApiVersionAsync()

src/TeamCloud.Azure.Resources/TeamCloud.Azure.Resources.csproj

@@ -33,6 +33,7 @@
 
   <ItemGroup>
     <PackageReference Include="Azure.Storage.Files.Shares" Version="12.5.0" />
+    <PackageReference Include="Docker.DotNet.BasicAuth" Version="3.125.3" />
     <PackageReference Include="Microsoft.Azure.Management.DevTestLabs" Version="3.0.0" />
     <PackageReference Include="System.Linq.Async" Version="4.1.1" />
     <ProjectReference Include="..\TeamCloud.Azure\TeamCloud.Azure.csproj" />