Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AndriySvyryd merged 4 commits into from
Nov 11, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
919e5dd
[release/9.0-staging] Update macOS images to 13 (#35004)
AndriySvyryd Oct 30, 2024
b7fc500
adjusting some migration tests so that baselines dont depend on the p…
maumar Nov 2, 2024
e97fb7c
Merge branch 'release/9.0' into release/9.0-staging
AndriySvyryd Nov 6, 2024
92280e2
Merge branch 'release/9.0' into release/9.0-staging (#35056)
AndriySvyryd Nov 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion 2 azure-pipelines-public.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion 2 azure-pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
16 changes: 8 additions & 8 deletions 16 test/EFCore.SqlServer.FunctionalTests/Migrations/MigrationsInfrastructureSqlServerTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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);
}

Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -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);
}

Expand Down
Morty Proxy This is a proxified and sanitized view of the page, visit original site.