Merge branch 'release/9.0-staging' => 'release/9.0' (#35078)

dotnet · Nov 11, 2024 · b1256ad · b1256ad
2 parents 01ccb27 + 92280e2
commit b1256ad
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/azure-pipelines-public.yml b/azure-pipelines-public.yml
@@ -93,7 +93,7 @@ stages:
           - job: macOS
             enablePublishTestResults: true
             pool:
-              vmImage: macOS-12
+              vmImage: macOS-13
             variables:
               # Rely on task Arcade injects, not auto-injected build step.
               - skipComponentGovernanceDetection: true

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -139,7 +139,7 @@ extends:
           - job: macOS
             pool:
               name: Azure Pipelines
-              image: macOS-12
+              image: macOS-13
               os: macOS
             variables:
               # Rely on task Arcade injects, not auto-injected build step.

diff --git a/test/EFCore.SqlServer.FunctionalTests/Migrations/MigrationsInfrastructureSqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Migrations/MigrationsInfrastructureSqlServerTest.cs
@@ -755,7 +755,7 @@ FROM [__EFMigrationsHistory]
 ORDER BY [MigrationId];
 
 INSERT INTO [__EFMigrationsHistory] ([MigrationId], [ProductVersion])
-VALUES (N'00000000000000_Empty', N'9.0.1');
+VALUES (N'00000000000000_Empty', N'7.0.0-test');
 
 --Before
 
@@ -798,18 +798,18 @@ CONSTRAINT [PK_Blogs] PRIMARY KEY ([Id])
 END
 
 INSERT INTO [__EFMigrationsHistory] ([MigrationId], [ProductVersion])
-VALUES (N'00000000000001_Migration1', N'9.0.1');
+VALUES (N'00000000000001_Migration1', N'7.0.0-test');
 
 --After
 
 INSERT INTO [__EFMigrationsHistory] ([MigrationId], [ProductVersion])
-VALUES (N'00000000000002_Migration2', N'9.0.1');
+VALUES (N'00000000000002_Migration2', N'7.0.0-test');
 
 DECLARE @result int;
 EXEC @result = sp_releaseapplock @Resource = '__EFMigrationsLock', @LockOwner = 'Session';
 SELECT @result
 """,
-                Fixture.TestSqlLoggerFactory.Sql,
+                Fixture.TestSqlLoggerFactory.Sql.Replace(ProductInfo.GetVersion(), "7.0.0-test"),
                 ignoreLineEndingDifferences: true);
         }
 
@@ -867,7 +867,7 @@ FROM [__EFMigrationsHistory]
 ORDER BY [MigrationId];
 
 INSERT INTO [__EFMigrationsHistory] ([MigrationId], [ProductVersion])
-VALUES (N'00000000000000_Empty', N'9.0.1');
+VALUES (N'00000000000000_Empty', N'7.0.0-test');
 
 --Before
 
@@ -910,18 +910,18 @@ CONSTRAINT [PK_Blogs] PRIMARY KEY ([Id])
 END
 
 INSERT INTO [__EFMigrationsHistory] ([MigrationId], [ProductVersion])
-VALUES (N'00000000000001_Migration1', N'9.0.1');
+VALUES (N'00000000000001_Migration1', N'7.0.0-test');
 
 --After
 
 INSERT INTO [__EFMigrationsHistory] ([MigrationId], [ProductVersion])
-VALUES (N'00000000000002_Migration2', N'9.0.1');
+VALUES (N'00000000000002_Migration2', N'7.0.0-test');
 
 DECLARE @result int;
 EXEC @result = sp_releaseapplock @Resource = '__EFMigrationsLock', @LockOwner = 'Session';
 SELECT @result
 """,
-                Fixture.TestSqlLoggerFactory.Sql,
+                Fixture.TestSqlLoggerFactory.Sql.Replace(ProductInfo.GetVersion(), "7.0.0-test"),
                 ignoreLineEndingDifferences: true);
         }