Update endjin/corvus/menes/marain packages to 1.0.0 (#142)

marain-dotnet · Aug 3, 2020 · a39f7d0 · a39f7d0
1 parent 1165b31
commit a39f7d0
Show file tree

Hide file tree

Showing 10 changed files with 28 additions and 28 deletions.
diff --git a/Solutions/Marain.Operations.Abstractions/Marain.Operations.Abstractions.csproj b/Solutions/Marain.Operations.Abstractions/Marain.Operations.Abstractions.csproj
@@ -15,12 +15,12 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Corvus.Tenancy.Abstractions" Version="0.23.0" />
-    <PackageReference Include="Endjin.RecommendedPractices" Version="0.6.0">
+    <PackageReference Include="Corvus.Tenancy.Abstractions" Version="1.0.0" />
+    <PackageReference Include="Endjin.RecommendedPractices" Version="1.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Menes.Abstractions" Version="0.11.0" />
+    <PackageReference Include="Menes.Abstractions" Version="1.0.0" />
     <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
   </ItemGroup>
 

diff --git a/Solutions/Marain.Operations.Azure.Storage/Marain.Operations.Azure.Storage.csproj b/Solutions/Marain.Operations.Azure.Storage/Marain.Operations.Azure.Storage.csproj
@@ -15,8 +15,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Corvus.Azure.Storage.Tenancy" Version="0.24.0-preview.37" />
-    <PackageReference Include="Endjin.RecommendedPractices" Version="0.6.0">
+    <PackageReference Include="Corvus.Azure.Storage.Tenancy" Version="1.0.0" />
+    <PackageReference Include="Endjin.RecommendedPractices" Version="1.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

diff --git a/Solutions/Marain.Operations.ControlClient/Marain.Operations.ControlClient.csproj b/Solutions/Marain.Operations.ControlClient/Marain.Operations.ControlClient.csproj
@@ -33,7 +33,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Corvus.Identity.ManagedServiceIdentity.ClientAuthentication" Version="0.1.0" />
+    <PackageReference Include="Corvus.Identity.ManagedServiceIdentity.ClientAuthentication" Version="1.0.0" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="2.2.0" />
     <PackageReference Include="Microsoft.Rest.ClientRuntime" Version="2.3.20" />
   </ItemGroup>

diff --git a/...ns/Marain.Operations.ControlHost.Functions/Marain.Operations.ControlHost.Functions.csproj b/...ns/Marain.Operations.ControlHost.Functions/Marain.Operations.ControlHost.Functions.csproj
@@ -13,8 +13,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Corvus.Azure.Storage.Tenancy" Version="0.24.0-preview.37" />
-    <PackageReference Include="Endjin.RecommendedPractices" Version="0.6.0">
+    <PackageReference Include="Corvus.Azure.Storage.Tenancy" Version="1.0.0" />
+    <PackageReference Include="Endjin.RecommendedPractices" Version="1.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

diff --git a/Solutions/Marain.Operations.Hosting.AspNetCore/Marain.Operations.Hosting.AspNetCore.csproj b/Solutions/Marain.Operations.Hosting.AspNetCore/Marain.Operations.Hosting.AspNetCore.csproj
@@ -15,15 +15,15 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Corvus.Identity.ManagedServiceIdentity.ClientAuthentication" Version="0.2.0-preview.5" />
-    <PackageReference Include="Corvus.Tenancy.Abstractions" Version="0.24.0-preview.37" />
-    <PackageReference Include="Endjin.RecommendedPractices" Version="0.6.0">
+    <PackageReference Include="Corvus.Identity.ManagedServiceIdentity.ClientAuthentication" Version="1.0.0" />
+    <PackageReference Include="Corvus.Tenancy.Abstractions" Version="1.0.0" />
+    <PackageReference Include="Endjin.RecommendedPractices" Version="1.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Marain.Tenancy.ClientTenantProvider" Version="0.3.0-corvus-tenancy-update.36" />
-    <PackageReference Include="Menes.Abstractions" Version="0.11.0" />
-    <PackageReference Include="Menes.Hosting.AspNetCore" Version="0.11.0" />
+    <PackageReference Include="Marain.Tenancy.ClientTenantProvider" Version="1.0.0" />
+    <PackageReference Include="Menes.Abstractions" Version="1.0.0" />
+    <PackageReference Include="Menes.Hosting.AspNetCore" Version="1.0.0" />
     <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
   </ItemGroup>
 

diff --git a/...crosoft/Extensions/DependencyInjection/OperationsRepositoryServiceCollectionExtensions.cs b/...crosoft/Extensions/DependencyInjection/OperationsRepositoryServiceCollectionExtensions.cs
@@ -6,6 +6,7 @@ namespace Microsoft.Extensions.DependencyInjection
 {
     using System;
     using Corvus.Azure.Storage.Tenancy;
+    using Corvus.Identity.ManagedServiceIdentity.ClientAuthentication;
     using Marain.Operations.OpenApi;
     using Marain.Operations.Storage;
     using Marain.Operations.Storage.Blob;
@@ -31,7 +32,7 @@ public static IServiceCollection AddTenancyBlobContainerOperationsRepository(
             services.AddRootTenant();
 
             services.AddSingleton(sp => sp.GetRequiredService<IConfiguration>().GetSection("TenancyClient").Get<TenancyClientOptions>());
-            services.AddAzureManagedIdentityBasedTokenSource();
+            services.AddAzureManagedIdentityBasedTokenSource(default(AzureManagedIdentityTokenSourceOptions));
             services.AddTenantCloudBlobContainerFactory(sp => sp.GetRequiredService<TenantCloudBlobContainerFactoryOptions>());
             services.AddSingleton<IOperationsRepository, OperationsRepository>();
 

diff --git a/Solutions/Marain.Operations.OpenApi/Marain.Operations.OpenApi.csproj b/Solutions/Marain.Operations.OpenApi/Marain.Operations.OpenApi.csproj
@@ -24,11 +24,11 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Endjin.RecommendedPractices" Version="0.6.0">
+    <PackageReference Include="Endjin.RecommendedPractices" Version="1.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Marain.Services.Tenancy" Version="0.1.0-preview.9" />
+    <PackageReference Include="Marain.Services.Tenancy" Version="1.0.0" />
   </ItemGroup>
 
 </Project>
diff --git a/Solutions/Marain.Operations.Specs/Marain.Operations.Specs.csproj b/Solutions/Marain.Operations.Specs/Marain.Operations.Specs.csproj
@@ -9,9 +9,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Corvus.Configuration.TestEnvironment" Version="0.4.0" />
+    <PackageReference Include="Corvus.Configuration.TestEnvironment" Version="1.0.0" />
     <PackageReference Include="Corvus.SpecFlow.Extensions" Version="0.6.0" />
-    <PackageReference Include="Marain.Services.Tenancy.Testing" Version="0.1.0-preview.9" />
+    <PackageReference Include="Marain.Services.Tenancy.Testing" Version="1.0.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration" Version="3.1.5" />
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="2.2.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.16.1">

diff --git a/Solutions/Marain.Operations.Specs/Mocks/InMemoryTenantProvider.cs b/Solutions/Marain.Operations.Specs/Mocks/InMemoryTenantProvider.cs
@@ -9,6 +9,7 @@ namespace Marain.TenantManagement.Specs.Mocks
     using System.Linq;
     using System.Threading.Tasks;
     using Corvus.Extensions.Json;
+    using Corvus.Json;
     using Corvus.Tenancy;
     using Corvus.Tenancy.Exceptions;
     using Newtonsoft.Json;
@@ -38,16 +39,18 @@ namespace Marain.TenantManagement.Specs.Mocks
     public class InMemoryTenantProvider : ITenantProvider
     {
         private readonly IJsonSerializerSettingsProvider jsonSerializerSettingsProvider;
+        private readonly IPropertyBagFactory propertyBagFactory;
         private readonly List<StoredTenant> allTenants = new List<StoredTenant>();
         private readonly Dictionary<string, List<string>> tenantsByParent = new Dictionary<string, List<string>>();
 
-        public InMemoryTenantProvider(RootTenant rootTenant, IJsonSerializerSettingsProvider jsonSerializerSettingsProvider)
+        public InMemoryTenantProvider(RootTenant rootTenant, IJsonSerializerSettingsProvider jsonSerializerSettingsProvider, IPropertyBagFactory propertyBagFactory)
         {
             this.Root = rootTenant;
             this.jsonSerializerSettingsProvider = jsonSerializerSettingsProvider;
+            this.propertyBagFactory = propertyBagFactory;
         }
 
-        public ITenant Root { get; }
+        public RootTenant Root { get; }
 
         public Task<ITenant> CreateChildTenantAsync(string parentTenantId, string name)
         {
@@ -57,11 +60,7 @@ public Task<ITenant> CreateChildTenantAsync(string parentTenantId, string name)
         public async Task<ITenant> CreateWellKnownChildTenantAsync(string parentTenantId, Guid wellKnownChildTenantGuid, string name)
         {
             ITenant parent = await this.GetTenantAsync(parentTenantId).ConfigureAwait(false);
-            var newTenant = new Tenant(this.jsonSerializerSettingsProvider)
-            {
-                Id = parent.Id.CreateChildId(wellKnownChildTenantGuid),
-                Name = name,
-            };
+            var newTenant = new Tenant(parent.Id.CreateChildId(wellKnownChildTenantGuid), name, this.propertyBagFactory.Create(new List<KeyValuePair<string, object>>()));
 
             List<string> childrenList = this.GetChildren(parent.Id);
             childrenList.Add(newTenant.Id);

diff --git a/...ions/Marain.Operations.StatusHost.Functions/Marain.Operations.StatusHost.Functions.csproj b/...ions/Marain.Operations.StatusHost.Functions/Marain.Operations.StatusHost.Functions.csproj
@@ -13,8 +13,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Corvus.Tenancy.Storage.Azure.Blob" Version="0.23.0" />
-    <PackageReference Include="Endjin.RecommendedPractices" Version="0.6.0">
+    <PackageReference Include="Corvus.Tenancy.Storage.Azure.Blob" Version="1.0.0" />
+    <PackageReference Include="Endjin.RecommendedPractices" Version="1.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>