Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 global.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"sdk": {
"version": "11.0.100-rc.1.26425.128",
"version": "11.0.100-rc.2.26504.105",
"rollForward": "disable",
"allowPrerelease": true
}
Expand Down
2 changes: 1 addition & 1 deletion tools/csharp-tests/ReleaseParityRegressionTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ public sealed class ReleaseParityRegressionTests
private const string PassphraseVariable = EnvironmentVariables.AurSshPassphrase;
private const string SyntheticPassphrase = "synthetic-passphrase";
private const string RepositoryDeployKey = "repository-deploy-key";
private const string TestDotnetSdk = "11.0.100-rc.1.26425.128";
private const string TestDotnetSdk = "11.0.100-rc.2.26504.105";
private const string CommandLogVariable = "WAYSCRIBER_COMMAND_LOG";

[Fact]
Expand Down
16 changes: 8 additions & 8 deletions tools/csharp-tests/VersionConsistencyTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ public async Task CopiedRepositoryMetadataPasses( )
}

[Theory]
[InlineData( """{"sdk":{"version":"11.0.100-rc.1.26425.128","rollForward":"disable","allowPrerelease":true}}""" )]
[InlineData( """{"sdk":{"version":" 11.0.100-rc.1.26425.128 ","rollForward":"disable","allowPrerelease":true}}""" )]
[InlineData( """{"sdk":{"version":"11.0.100-rc.2.26504.105","rollForward":"disable","allowPrerelease":true}}""" )]
[InlineData( """{"sdk":{"version":" 11.0.100-rc.2.26504.105 ","rollForward":"disable","allowPrerelease":true}}""" )]
public async Task CompactGlobalJsonWithTheReviewedSdkPasses( string globalJson )
{
using var fixture = new VersionMetadataFixture( );
Expand All @@ -43,13 +43,13 @@ public async Task CompactGlobalJsonWithTheReviewedSdkPasses( string globalJson )
"global.json SDK metadata is invalid: sdk.version must be a non-empty string" )]
[InlineData( """{"sdk":{"version":11,"rollForward":"disable","allowPrerelease":true}}""",
"global.json SDK metadata is invalid: sdk.version must be a non-empty string" )]
[InlineData( """{"sdk":{"version":"11.0.100-rc.1.26425.127","rollForward":"disable","allowPrerelease":true}}""",
"global.json SDK: expected 11.0.100-rc.1.26425.128, got 11.0.100-rc.1.26425.127" )]
[InlineData( """{"sdk":{"version":"11.0.100-rc.1.26425.128","rollForward":"latestPatch","allowPrerelease":false}}""",
[InlineData( """{"sdk":{"version":"11.0.100-rc.2.26504.104","rollForward":"disable","allowPrerelease":true}}""",
"global.json SDK: expected 11.0.100-rc.2.26504.105, got 11.0.100-rc.2.26504.104" )]
[InlineData( """{"sdk":{"version":"11.0.100-rc.2.26504.105","rollForward":"latestPatch","allowPrerelease":false}}""",
"global.json SDK rollForward must be disable" )]
[InlineData( """{"sdk":{"version":"11.0.100-rc.1.26425.128","rollForward":"latestPatch","allowPrerelease":false}}""",
[InlineData( """{"sdk":{"version":"11.0.100-rc.2.26504.105","rollForward":"latestPatch","allowPrerelease":false}}""",
"global.json SDK allowPrerelease must be true" )]
[InlineData( """{"sdk":{"version":"11.0.100-rc.1.26425.128","rollForward":"disable","allowPrerelease":"true"}}""",
[InlineData( """{"sdk":{"version":"11.0.100-rc.2.26504.105","rollForward":"disable","allowPrerelease":"true"}}""",
"global.json SDK allowPrerelease must be true" )]
public async Task GlobalJsonMustPinTheReviewedSdk( string globalJson, string expected )
{
Expand Down Expand Up @@ -183,7 +183,7 @@ public async Task MissingGlobalJsonIsInvalidSdkMetadata( )
var error = await fixture.CheckExpectingFailure( );

Assert.Contains( "global.json SDK metadata is invalid", error, StringComparison.Ordinal );
Assert.Contains( "global.json SDK: expected 11.0.100-rc.1.26425.128, got missing", error, StringComparison.Ordinal );
Assert.Contains( "global.json SDK: expected 11.0.100-rc.2.26504.105, got missing", error, StringComparison.Ordinal );
}

[Theory]
Expand Down
2 changes: 1 addition & 1 deletion tools/csharp/Commands/VersionCommands.cs
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ internal static partial class VersionCommands

// Raise this floor only as a coordinated release-platform change.
internal const string SupportedLibadwaitaFloor = "1.4";
internal const string ToolSdkVersion = "11.0.100-rc.1.26425.128";
internal const string ToolSdkVersion = "11.0.100-rc.2.26504.105";
internal const string ToolSdkRollForward = "disable";

public static IReadOnlyList<ToolCommand> Commands
Expand Down
Loading