Skip to content

Commit

Permalink
[Rollout] Production rollout 2024-12-09 (#4226)
Browse files Browse the repository at this point in the history
  • Loading branch information
premun authored Dec 9, 2024
2 parents 67e3a0d + 7e11978 commit ba658be
Show file tree
Hide file tree
Showing 10 changed files with 95 additions and 114 deletions.
2 changes: 1 addition & 1 deletion Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Project>
<PropertyGroup>
<AspNetAzureVersion>3.1.24</AspNetAzureVersion>
<AspNetCoreVersion>6.0.26</AspNetCoreVersion>
<AspNetCoreVersion>6.0.36</AspNetCoreVersion>
<MicrosoftExtensionsVersion>6.0.0</MicrosoftExtensionsVersion>
<AspireVersion>8.2.0</AspireVersion>
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
Expand Down
88 changes: 44 additions & 44 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
@@ -1,93 +1,93 @@
<?xml version="1.0" encoding="utf-8"?>
<Dependencies>
<ProductDependencies>
<Dependency Name="Microsoft.DotNet.Internal.Logging" Version="1.1.0-beta.24376.1">
<Dependency Name="Microsoft.DotNet.Internal.Logging" Version="1.1.0-beta.24606.1">
<Uri>https://github.com/dotnet/dnceng-shared</Uri>
<Sha>77fb751f40c92262450af10314e965a1a708857b</Sha>
<Sha>ba6673193e2447a3cb5f373a2168f0fe561dcd9a</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.ApiPagination" Version="1.1.0-beta.24376.1">
<Dependency Name="Microsoft.AspNetCore.ApiPagination" Version="1.1.0-beta.24606.1">
<Uri>https://github.com/dotnet/dnceng-shared</Uri>
<Sha>77fb751f40c92262450af10314e965a1a708857b</Sha>
<Sha>ba6673193e2447a3cb5f373a2168f0fe561dcd9a</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.ApiVersioning" Version="1.1.0-beta.24376.1">
<Dependency Name="Microsoft.AspNetCore.ApiVersioning" Version="1.1.0-beta.24606.1">
<Uri>https://github.com/dotnet/dnceng-shared</Uri>
<Sha>77fb751f40c92262450af10314e965a1a708857b</Sha>
<Sha>ba6673193e2447a3cb5f373a2168f0fe561dcd9a</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.ApiVersioning.Analyzers" Version="1.1.0-beta.24376.1">
<Dependency Name="Microsoft.AspNetCore.ApiVersioning.Analyzers" Version="1.1.0-beta.24606.1">
<Uri>https://github.com/dotnet/dnceng-shared</Uri>
<Sha>77fb751f40c92262450af10314e965a1a708857b</Sha>
<Sha>ba6673193e2447a3cb5f373a2168f0fe561dcd9a</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.ApiVersioning.Swashbuckle" Version="1.1.0-beta.24376.1">
<Dependency Name="Microsoft.AspNetCore.ApiVersioning.Swashbuckle" Version="1.1.0-beta.24606.1">
<Uri>https://github.com/dotnet/dnceng-shared</Uri>
<Sha>77fb751f40c92262450af10314e965a1a708857b</Sha>
<Sha>ba6673193e2447a3cb5f373a2168f0fe561dcd9a</Sha>
</Dependency>
<Dependency Name="Microsoft.DncEng.CommandLineLib" Version="1.1.0-beta.24376.1">
<Dependency Name="Microsoft.DncEng.CommandLineLib" Version="1.1.0-beta.24606.1">
<Uri>https://github.com/dotnet/dnceng-shared</Uri>
<Sha>77fb751f40c92262450af10314e965a1a708857b</Sha>
<Sha>ba6673193e2447a3cb5f373a2168f0fe561dcd9a</Sha>
</Dependency>
<Dependency Name="Microsoft.DncEng.Configuration.Extensions" Version="1.1.0-beta.24376.1">
<Dependency Name="Microsoft.DncEng.Configuration.Extensions" Version="1.1.0-beta.24606.1">
<Uri>https://github.com/dotnet/dnceng-shared</Uri>
<Sha>77fb751f40c92262450af10314e965a1a708857b</Sha>
<Sha>ba6673193e2447a3cb5f373a2168f0fe561dcd9a</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Authentication.Algorithms" Version="1.1.0-beta.24376.1">
<Dependency Name="Microsoft.DotNet.Authentication.Algorithms" Version="1.1.0-beta.24606.1">
<Uri>https://github.com/dotnet/dnceng-shared</Uri>
<Sha>77fb751f40c92262450af10314e965a1a708857b</Sha>
<Sha>ba6673193e2447a3cb5f373a2168f0fe561dcd9a</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GitHub.Authentication" Version="1.1.0-beta.24376.1">
<Dependency Name="Microsoft.DotNet.GitHub.Authentication" Version="1.1.0-beta.24606.1">
<Uri>https://github.com/dotnet/dnceng-shared</Uri>
<Sha>77fb751f40c92262450af10314e965a1a708857b</Sha>
<Sha>ba6673193e2447a3cb5f373a2168f0fe561dcd9a</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Internal.DependencyInjection.Testing" Version="1.1.0-beta.24376.1">
<Dependency Name="Microsoft.DotNet.Internal.DependencyInjection.Testing" Version="1.1.0-beta.24606.1">
<Uri>https://github.com/dotnet/dnceng-shared</Uri>
<Sha>77fb751f40c92262450af10314e965a1a708857b</Sha>
<Sha>ba6673193e2447a3cb5f373a2168f0fe561dcd9a</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Internal.DependencyInjection" Version="1.1.0-beta.24376.1">
<Dependency Name="Microsoft.DotNet.Internal.DependencyInjection" Version="1.1.0-beta.24606.1">
<Uri>https://github.com/dotnet/dnceng-shared</Uri>
<Sha>77fb751f40c92262450af10314e965a1a708857b</Sha>
<Sha>ba6673193e2447a3cb5f373a2168f0fe561dcd9a</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Internal.Health" Version="1.1.0-beta.24376.1">
<Dependency Name="Microsoft.DotNet.Internal.Health" Version="1.1.0-beta.24606.1">
<Uri>https://github.com/dotnet/dnceng-shared</Uri>
<Sha>77fb751f40c92262450af10314e965a1a708857b</Sha>
<Sha>ba6673193e2447a3cb5f373a2168f0fe561dcd9a</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Internal.Testing.DependencyInjection.Abstractions" Version="1.1.0-beta.24376.1">
<Dependency Name="Microsoft.DotNet.Internal.Testing.DependencyInjection.Abstractions" Version="1.1.0-beta.24606.1">
<Uri>https://github.com/dotnet/dnceng-shared</Uri>
<Sha>77fb751f40c92262450af10314e965a1a708857b</Sha>
<Sha>ba6673193e2447a3cb5f373a2168f0fe561dcd9a</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Internal.Testing.DependencyInjectionCodeGen" Version="1.1.0-beta.24376.1">
<Dependency Name="Microsoft.DotNet.Internal.Testing.DependencyInjectionCodeGen" Version="1.1.0-beta.24606.1">
<Uri>https://github.com/dotnet/dnceng-shared</Uri>
<Sha>77fb751f40c92262450af10314e965a1a708857b</Sha>
<Sha>ba6673193e2447a3cb5f373a2168f0fe561dcd9a</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Internal.Testing.Utility" Version="1.1.0-beta.24376.1">
<Dependency Name="Microsoft.DotNet.Internal.Testing.Utility" Version="1.1.0-beta.24606.1">
<Uri>https://github.com/dotnet/dnceng-shared</Uri>
<Sha>77fb751f40c92262450af10314e965a1a708857b</Sha>
<Sha>ba6673193e2447a3cb5f373a2168f0fe561dcd9a</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Kusto" Version="1.1.0-beta.24376.1">
<Dependency Name="Microsoft.DotNet.Kusto" Version="1.1.0-beta.24606.1">
<Uri>https://github.com/dotnet/dnceng-shared</Uri>
<Sha>77fb751f40c92262450af10314e965a1a708857b</Sha>
<Sha>ba6673193e2447a3cb5f373a2168f0fe561dcd9a</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Metrics" Version="1.1.0-beta.24376.1">
<Dependency Name="Microsoft.DotNet.Metrics" Version="1.1.0-beta.24606.1">
<Uri>https://github.com/dotnet/dnceng-shared</Uri>
<Sha>77fb751f40c92262450af10314e965a1a708857b</Sha>
<Sha>ba6673193e2447a3cb5f373a2168f0fe561dcd9a</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.ServiceFabric.ServiceHost" Version="1.1.0-beta.24376.1">
<Dependency Name="Microsoft.DotNet.ServiceFabric.ServiceHost" Version="1.1.0-beta.24606.1">
<Uri>https://github.com/dotnet/dnceng-shared</Uri>
<Sha>77fb751f40c92262450af10314e965a1a708857b</Sha>
<Sha>ba6673193e2447a3cb5f373a2168f0fe561dcd9a</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Services.Utility" Version="1.1.0-beta.24376.1">
<Dependency Name="Microsoft.DotNet.Services.Utility" Version="1.1.0-beta.24606.1">
<Uri>https://github.com/dotnet/dnceng-shared</Uri>
<Sha>77fb751f40c92262450af10314e965a1a708857b</Sha>
<Sha>ba6673193e2447a3cb5f373a2168f0fe561dcd9a</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Web.Authentication" Version="1.1.0-beta.24376.1">
<Dependency Name="Microsoft.DotNet.Web.Authentication" Version="1.1.0-beta.24606.1">
<Uri>https://github.com/dotnet/dnceng-shared</Uri>
<Sha>77fb751f40c92262450af10314e965a1a708857b</Sha>
<Sha>ba6673193e2447a3cb5f373a2168f0fe561dcd9a</Sha>
</Dependency>
<Dependency Name="ServiceFabricMocks" Version="1.1.0-beta.24376.1">
<Dependency Name="ServiceFabricMocks" Version="1.1.0-beta.24606.1">
<Uri>https://github.com/dotnet/dnceng-shared</Uri>
<Sha>77fb751f40c92262450af10314e965a1a708857b</Sha>
<Sha>ba6673193e2447a3cb5f373a2168f0fe561dcd9a</Sha>
</Dependency>
<Dependency Name="CoreHealthMonitor" Version="1.1.0-beta.24376.1">
<Dependency Name="CoreHealthMonitor" Version="1.1.0-beta.24606.1">
<Uri>https://github.com/dotnet/dnceng-shared</Uri>
<Sha>77fb751f40c92262450af10314e965a1a708857b</Sha>
<Sha>ba6673193e2447a3cb5f373a2168f0fe561dcd9a</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
Expand Down
44 changes: 22 additions & 22 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -15,28 +15,28 @@
<MicrosoftDotNetGitIssueManagerVersion>8.0.0-beta.24570.5</MicrosoftDotNetGitIssueManagerVersion>
<MicrosoftDotNetVersionToolsVersion>8.0.0-beta.24570.5</MicrosoftDotNetVersionToolsVersion>
<MicrosoftNetTestSdkVersion>17.4.1</MicrosoftNetTestSdkVersion>
<MicrosoftDotNetInternalLoggingVersion>1.1.0-beta.24376.1</MicrosoftDotNetInternalLoggingVersion>
<MicrosoftAspNetCoreApiPaginationVersion>1.1.0-beta.24376.1</MicrosoftAspNetCoreApiPaginationVersion>
<MicrosoftAspNetCoreApiVersioningVersion>1.1.0-beta.24376.1</MicrosoftAspNetCoreApiVersioningVersion>
<MicrosoftAspNetCoreApiVersioningAnalyzersVersion>1.1.0-beta.24376.1</MicrosoftAspNetCoreApiVersioningAnalyzersVersion>
<MicrosoftAspNetCoreApiVersioningSwashbuckleVersion>1.1.0-beta.24376.1</MicrosoftAspNetCoreApiVersioningSwashbuckleVersion>
<MicrosoftDncEngCommandLineLibVersion>1.1.0-beta.24376.1</MicrosoftDncEngCommandLineLibVersion>
<MicrosoftDncEngConfigurationExtensionsVersion>1.1.0-beta.24376.1</MicrosoftDncEngConfigurationExtensionsVersion>
<MicrosoftDotNetAuthenticationAlgorithmsVersion>1.1.0-beta.24376.1</MicrosoftDotNetAuthenticationAlgorithmsVersion>
<MicrosoftDotNetGitHubAuthenticationVersion>1.1.0-beta.24376.1</MicrosoftDotNetGitHubAuthenticationVersion>
<MicrosoftDotNetInternalDependencyInjectionTestingVersion>1.1.0-beta.24376.1</MicrosoftDotNetInternalDependencyInjectionTestingVersion>
<MicrosoftDotNetInternalDependencyInjectionVersion>1.1.0-beta.24376.1</MicrosoftDotNetInternalDependencyInjectionVersion>
<MicrosoftDotNetInternalHealthVersion>1.1.0-beta.24376.1</MicrosoftDotNetInternalHealthVersion>
<MicrosoftDotNetInternalTestingDependencyInjectionAbstractionsVersion>1.1.0-beta.24376.1</MicrosoftDotNetInternalTestingDependencyInjectionAbstractionsVersion>
<MicrosoftDotNetInternalTestingDependencyInjectionCodeGenVersion>1.1.0-beta.24376.1</MicrosoftDotNetInternalTestingDependencyInjectionCodeGenVersion>
<MicrosoftDotNetInternalTestingUtilityVersion>1.1.0-beta.24376.1</MicrosoftDotNetInternalTestingUtilityVersion>
<MicrosoftDotNetKustoVersion>1.1.0-beta.24376.1</MicrosoftDotNetKustoVersion>
<MicrosoftDotNetMetricsVersion>1.1.0-beta.24376.1</MicrosoftDotNetMetricsVersion>
<MicrosoftDotNetServiceFabricServiceHostVersion>1.1.0-beta.24376.1</MicrosoftDotNetServiceFabricServiceHostVersion>
<MicrosoftDotNetServicesUtilityVersion>1.1.0-beta.24376.1</MicrosoftDotNetServicesUtilityVersion>
<MicrosoftDotNetWebAuthenticationVersion>1.1.0-beta.24376.1</MicrosoftDotNetWebAuthenticationVersion>
<ServiceFabricMocksVersion>1.1.0-beta.24376.1</ServiceFabricMocksVersion>
<CoreHealthMonitorVersion>1.1.0-beta.24376.1</CoreHealthMonitorVersion>
<MicrosoftDotNetInternalLoggingVersion>1.1.0-beta.24606.1</MicrosoftDotNetInternalLoggingVersion>
<MicrosoftAspNetCoreApiPaginationVersion>1.1.0-beta.24606.1</MicrosoftAspNetCoreApiPaginationVersion>
<MicrosoftAspNetCoreApiVersioningVersion>1.1.0-beta.24606.1</MicrosoftAspNetCoreApiVersioningVersion>
<MicrosoftAspNetCoreApiVersioningAnalyzersVersion>1.1.0-beta.24606.1</MicrosoftAspNetCoreApiVersioningAnalyzersVersion>
<MicrosoftAspNetCoreApiVersioningSwashbuckleVersion>1.1.0-beta.24606.1</MicrosoftAspNetCoreApiVersioningSwashbuckleVersion>
<MicrosoftDncEngCommandLineLibVersion>1.1.0-beta.24606.1</MicrosoftDncEngCommandLineLibVersion>
<MicrosoftDncEngConfigurationExtensionsVersion>1.1.0-beta.24606.1</MicrosoftDncEngConfigurationExtensionsVersion>
<MicrosoftDotNetAuthenticationAlgorithmsVersion>1.1.0-beta.24606.1</MicrosoftDotNetAuthenticationAlgorithmsVersion>
<MicrosoftDotNetGitHubAuthenticationVersion>1.1.0-beta.24606.1</MicrosoftDotNetGitHubAuthenticationVersion>
<MicrosoftDotNetInternalDependencyInjectionTestingVersion>1.1.0-beta.24606.1</MicrosoftDotNetInternalDependencyInjectionTestingVersion>
<MicrosoftDotNetInternalDependencyInjectionVersion>1.1.0-beta.24606.1</MicrosoftDotNetInternalDependencyInjectionVersion>
<MicrosoftDotNetInternalHealthVersion>1.1.0-beta.24606.1</MicrosoftDotNetInternalHealthVersion>
<MicrosoftDotNetInternalTestingDependencyInjectionAbstractionsVersion>1.1.0-beta.24606.1</MicrosoftDotNetInternalTestingDependencyInjectionAbstractionsVersion>
<MicrosoftDotNetInternalTestingDependencyInjectionCodeGenVersion>1.1.0-beta.24606.1</MicrosoftDotNetInternalTestingDependencyInjectionCodeGenVersion>
<MicrosoftDotNetInternalTestingUtilityVersion>1.1.0-beta.24606.1</MicrosoftDotNetInternalTestingUtilityVersion>
<MicrosoftDotNetKustoVersion>1.1.0-beta.24606.1</MicrosoftDotNetKustoVersion>
<MicrosoftDotNetMetricsVersion>1.1.0-beta.24606.1</MicrosoftDotNetMetricsVersion>
<MicrosoftDotNetServiceFabricServiceHostVersion>1.1.0-beta.24606.1</MicrosoftDotNetServiceFabricServiceHostVersion>
<MicrosoftDotNetServicesUtilityVersion>1.1.0-beta.24606.1</MicrosoftDotNetServicesUtilityVersion>
<MicrosoftDotNetWebAuthenticationVersion>1.1.0-beta.24606.1</MicrosoftDotNetWebAuthenticationVersion>
<ServiceFabricMocksVersion>1.1.0-beta.24606.1</ServiceFabricMocksVersion>
<CoreHealthMonitorVersion>1.1.0-beta.24606.1</CoreHealthMonitorVersion>
<MicrosoftDncEngSecretManagerVersion>1.1.0-beta.24562.1</MicrosoftDncEngSecretManagerVersion>
<MicrosoftDncEngConfigurationBootstrapVersion>1.1.0-beta.24562.1</MicrosoftDncEngConfigurationBootstrapVersion>
</PropertyGroup>
Expand Down
32 changes: 10 additions & 22 deletions src/Maestro/Maestro.Data/BuildAssetRegistryContext.cs
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,6 @@
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Design;
using Microsoft.EntityFrameworkCore.Query.SqlExpressions;
using Microsoft.Extensions.Hosting;
using Microsoft.Extensions.Hosting.Internal;

namespace Maestro.Data;

public class BuildAssetRegistryContextFactory : IDesignTimeDbContextFactory<BuildAssetRegistryContext>
Expand All @@ -39,9 +36,7 @@ public BuildAssetRegistryContext CreateDbContext(string[] args)
})
.Options;

return new BuildAssetRegistryContext(
new HostingEnvironment{EnvironmentName = Environments.Development},
options);
return new BuildAssetRegistryContext(options);
}

public static string GetConnectionString(string databaseName)
Expand All @@ -50,16 +45,9 @@ public static string GetConnectionString(string databaseName)
}
}

public class BuildAssetRegistryContext : IdentityDbContext<ApplicationUser, IdentityRole<int>, int>
public class BuildAssetRegistryContext(DbContextOptions options)
: IdentityDbContext<ApplicationUser, IdentityRole<int>, int>(options)
{
public BuildAssetRegistryContext(IHostEnvironment hostingEnvironment, DbContextOptions options) : base(
options)
{
HostingEnvironment = hostingEnvironment;
}

public IHostEnvironment HostingEnvironment { get; }

public DbSet<Asset> Assets { get; set; }
public DbSet<AssetLocation> AssetLocations { get; set; }
public DbSet<AssetFilter> AssetFilters { get; set; }
Expand Down Expand Up @@ -121,7 +109,7 @@ protected override void OnModelCreating(ModelBuilder builder)
base.OnModelCreating(builder);

builder.Entity<Asset>()
.HasIndex(a => new {a.Name, a.Version});
.HasIndex(a => new { a.Name, a.Version });

builder.Entity<Channel>().HasIndex(c => c.Name).IsUnique();

Expand All @@ -144,7 +132,7 @@ protected override void OnModelCreating(ModelBuilder builder)
.HasForeignKey(bc => bc.ChannelId);

builder.Entity<BuildDependency>()
.HasKey(d => new {d.BuildId, d.DependentBuildId});
.HasKey(d => new { d.BuildId, d.DependentBuildId });

builder.Entity<BuildDependency>()
.HasOne(d => d.Build)
Expand Down Expand Up @@ -176,7 +164,7 @@ protected override void OnModelCreating(ModelBuilder builder)
dc.ChannelId
})
.IsUnique();

builder.Entity<SubscriptionUpdate>().Property(typeof(DateTime), "SysStartTime").HasColumnType("datetime2");
builder.Entity<SubscriptionUpdate>().Property(typeof(DateTime), "SysEndTime").HasColumnType("datetime2");

Expand All @@ -203,7 +191,7 @@ protected override void OnModelCreating(ModelBuilder builder)
builder.Entity<SubscriptionUpdateHistory>().HasIndex("SysEndTime", "SysStartTime").IsClustered();
builder.Entity<SubscriptionUpdateHistory>().HasIndex("SubscriptionId", "SysEndTime", "SysStartTime");

builder.Entity<Repository>().HasKey(r => new {r.RepositoryName});
builder.Entity<Repository>().HasKey(r => new { r.RepositoryName });

builder.Entity<RepositoryBranch>()
.HasKey(
Expand All @@ -216,7 +204,7 @@ protected override void OnModelCreating(ModelBuilder builder)
builder.Entity<RepositoryBranch>()
.HasOne(rb => rb.Repository)
.WithMany(r => r.Branches)
.HasForeignKey(rb => new {rb.RepositoryName});
.HasForeignKey(rb => new { rb.RepositoryName });

builder.Entity<RepositoryBranchUpdate>()
.HasKey(
Expand Down Expand Up @@ -335,8 +323,8 @@ AND traverse.Depth < 10 -- Don't load all the way back because of incorrect isPr
};

IQueryable<Build> builds = from build in Builds
where buildIds.Contains(build.Id)
select build;
where buildIds.Contains(build.Id)
select build;

Dictionary<int, Build> dict = await builds.ToDictionaryAsync(b => b.Id,
b =>
Expand Down
2 changes: 0 additions & 2 deletions src/Maestro/Maestro.Data/Maestro.Data.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@
</PropertyGroup>

<ItemGroup>
<FrameworkReference Include="Microsoft.AspNetCore.App" />

<PackageReference Include="EntityFrameworkCore.Triggers" />
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" />
<PackageReference Include="Microsoft.EntityFrameworkCore" />
Expand Down
Loading

0 comments on commit ba658be

Please sign in to comment.