diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7ab0b595f844..8a5eb6eef2cd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,18 +1,18 @@ - + https://github.com/dotnet/templating - 6b3817430ddd6466a3b07f44a0c6cc59b6f7fb39 + 79a9c6f5d056b30df9ded35dc5a4bc27f637948e - + https://github.com/dotnet/templating - 6b3817430ddd6466a3b07f44a0c6cc59b6f7fb39 + 79a9c6f5d056b30df9ded35dc5a4bc27f637948e - + https://github.com/dotnet/templating - 6b3817430ddd6466a3b07f44a0c6cc59b6f7fb39 + 79a9c6f5d056b30df9ded35dc5a4bc27f637948e @@ -73,18 +73,18 @@ 8808f75f212bcec6a2050fe045a7e07ab8a5a8c1 - + https://github.com/dotnet/msbuild - eec6ac731e5b39f6b14bbbe7995896047d170332 + 37fc8280dd8516257e7d04b9fc5e426de33091f2 - + https://github.com/dotnet/msbuild - eec6ac731e5b39f6b14bbbe7995896047d170332 + 37fc8280dd8516257e7d04b9fc5e426de33091f2 - + https://github.com/dotnet/msbuild - eec6ac731e5b39f6b14bbbe7995896047d170332 + 37fc8280dd8516257e7d04b9fc5e426de33091f2 @@ -135,13 +135,13 @@ https://github.com/dotnet/roslyn 543cb4568f28b0d2f2cfecdf2d56365b9252e848 - + https://github.com/dotnet/aspnetcore - eb68e016a554b4da50d7fb0aeffe897cfabf36c7 + ef42fb27e05acfe6eaad0fe2285737168f497e2f - + https://github.com/dotnet/aspnetcore - eb68e016a554b4da50d7fb0aeffe897cfabf36c7 + ef42fb27e05acfe6eaad0fe2285737168f497e2f https://github.com/nuget/nuget.client @@ -212,22 +212,22 @@ https://github.com/nuget/nuget.client aa7eb9987d28e7169cfabfa484f2fdd22d2b91d2 - + https://github.com/microsoft/vstest - 7892673cf1302662e4aee495628a25dd6e32ef0d + 7d34b30433259fb914aaaf276fde663a47b6ef2f - + https://github.com/microsoft/vstest - 7892673cf1302662e4aee495628a25dd6e32ef0d + 7d34b30433259fb914aaaf276fde663a47b6ef2f - + https://github.com/microsoft/vstest - 7892673cf1302662e4aee495628a25dd6e32ef0d + 7d34b30433259fb914aaaf276fde663a47b6ef2f - + https://github.com/microsoft/vstest - 7892673cf1302662e4aee495628a25dd6e32ef0d + 7d34b30433259fb914aaaf276fde663a47b6ef2f @@ -275,89 +275,89 @@ https://github.com/dotnet/wpf cbaeca87f0bd676b1ecd869338cf78b22f5295f7 - + https://github.com/dotnet/aspnetcore - 30a1828cec2ece64605d7410d81a9c6457ec3b55 + ef42fb27e05acfe6eaad0fe2285737168f497e2f - + https://github.com/dotnet/aspnetcore - 30a1828cec2ece64605d7410d81a9c6457ec3b55 + ef42fb27e05acfe6eaad0fe2285737168f497e2f - + https://github.com/dotnet/aspnetcore - 30a1828cec2ece64605d7410d81a9c6457ec3b55 + ef42fb27e05acfe6eaad0fe2285737168f497e2f - + https://github.com/dotnet/aspnetcore - 30a1828cec2ece64605d7410d81a9c6457ec3b55 + ef42fb27e05acfe6eaad0fe2285737168f497e2f - + https://github.com/dotnet/aspnetcore - 30a1828cec2ece64605d7410d81a9c6457ec3b55 + ef42fb27e05acfe6eaad0fe2285737168f497e2f - + https://github.com/dotnet/aspnetcore - 30a1828cec2ece64605d7410d81a9c6457ec3b55 + ef42fb27e05acfe6eaad0fe2285737168f497e2f - + https://github.com/dotnet/aspnetcore - 30a1828cec2ece64605d7410d81a9c6457ec3b55 + ef42fb27e05acfe6eaad0fe2285737168f497e2f - + https://github.com/dotnet/aspnetcore - 30a1828cec2ece64605d7410d81a9c6457ec3b55 + ef42fb27e05acfe6eaad0fe2285737168f497e2f - + https://github.com/dotnet/aspnetcore - 30a1828cec2ece64605d7410d81a9c6457ec3b55 + ef42fb27e05acfe6eaad0fe2285737168f497e2f - + https://github.com/dotnet/aspnetcore - 30a1828cec2ece64605d7410d81a9c6457ec3b55 + ef42fb27e05acfe6eaad0fe2285737168f497e2f - + https://github.com/dotnet/aspnetcore - 30a1828cec2ece64605d7410d81a9c6457ec3b55 + ef42fb27e05acfe6eaad0fe2285737168f497e2f - + https://github.com/dotnet/aspnetcore - 30a1828cec2ece64605d7410d81a9c6457ec3b55 + ef42fb27e05acfe6eaad0fe2285737168f497e2f - + https://github.com/dotnet/razor - f3aaba93ee45b9d8aabfd7171019158a2a375696 + 70303665960a0a97758b178c288e7c2f88905bcc - + https://github.com/dotnet/razor - f3aaba93ee45b9d8aabfd7171019158a2a375696 + 70303665960a0a97758b178c288e7c2f88905bcc - + https://github.com/dotnet/razor - f3aaba93ee45b9d8aabfd7171019158a2a375696 + 70303665960a0a97758b178c288e7c2f88905bcc - + https://github.com/dotnet/razor - f3aaba93ee45b9d8aabfd7171019158a2a375696 + 70303665960a0a97758b178c288e7c2f88905bcc - + https://github.com/dotnet/aspnetcore - 30a1828cec2ece64605d7410d81a9c6457ec3b55 + ef42fb27e05acfe6eaad0fe2285737168f497e2f - + https://github.com/dotnet/aspnetcore - 30a1828cec2ece64605d7410d81a9c6457ec3b55 + ef42fb27e05acfe6eaad0fe2285737168f497e2f - + https://github.com/dotnet/aspnetcore - 30a1828cec2ece64605d7410d81a9c6457ec3b55 + ef42fb27e05acfe6eaad0fe2285737168f497e2f - + https://github.com/dotnet/aspnetcore - 30a1828cec2ece64605d7410d81a9c6457ec3b55 + ef42fb27e05acfe6eaad0fe2285737168f497e2f https://github.com/dotnet/test-templates @@ -445,49 +445,49 @@ - + https://github.com/dotnet/source-build-externals - b4c6488eecb5011a4c7fc363d96c9c77f461a5fe + 09aaed01f4bd113a1aca58d620096fe77c5a2da7 - + https://github.com/dotnet/source-build-reference-packages - 92a51d1379daa1fa7892a9d06840ba833fcd6298 + df6fdaf26c24fa7c897ca8062227aa28e76e2339 https://github.com/dotnet/deployment-tools 4d818b1bfd1cf450492eb8ab3877eb3875488642 - + https://github.com/dotnet/sourcelink - 4e751513abaad9c7b51fb411fa44ee2f8480a183 + 234bdefe64fdaee50f0c9343d5eca283bd4342b5 - + https://github.com/dotnet/sourcelink - 4e751513abaad9c7b51fb411fa44ee2f8480a183 + 234bdefe64fdaee50f0c9343d5eca283bd4342b5 - + https://github.com/dotnet/sourcelink - 4e751513abaad9c7b51fb411fa44ee2f8480a183 + 234bdefe64fdaee50f0c9343d5eca283bd4342b5 - + https://github.com/dotnet/sourcelink - 4e751513abaad9c7b51fb411fa44ee2f8480a183 + 234bdefe64fdaee50f0c9343d5eca283bd4342b5 - + https://github.com/dotnet/sourcelink - 4e751513abaad9c7b51fb411fa44ee2f8480a183 + 234bdefe64fdaee50f0c9343d5eca283bd4342b5 - + https://github.com/dotnet/sourcelink - 4e751513abaad9c7b51fb411fa44ee2f8480a183 + 234bdefe64fdaee50f0c9343d5eca283bd4342b5 - + https://github.com/dotnet/sourcelink - 4e751513abaad9c7b51fb411fa44ee2f8480a183 + 234bdefe64fdaee50f0c9343d5eca283bd4342b5 @@ -539,9 +539,9 @@ https://github.com/dotnet/runtime 55eee324653e01cf28809d02b25a5b0894b58d22 - + https://github.com/dotnet/aspnetcore - 30a1828cec2ece64605d7410d81a9c6457ec3b55 + ef42fb27e05acfe6eaad0fe2285737168f497e2f https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 211574aa9bd3..55f6f0f53f10 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -174,9 +174,9 @@ - 17.13.0-preview-24563-01 - 17.13.0-preview-24563-01 - 17.13.0-preview-24563-01 + 17.13.0-preview-24569-02 + 17.13.0-preview-24569-02 + 17.13.0-preview-24569-02 @@ -198,19 +198,19 @@ then use that in Directory.Packages.props. At usage sites, either we use MicrosoftBuildMinimumVersion, or MicrosoftBuildVersion in source-only modes. --> - 17.13.0-preview-24568-02 - 17.13.0-preview-24568-02 + 17.13.0-preview-24568-05 + 17.13.0-preview-24568-05 $([System.IO.File]::ReadAllText('$(RepoRoot)src\Layout\redist\minimumMSBuildVersion').Trim()) - 10.0.100-alpha.1.24568.1 + 10.0.100-alpha.1.24569.3 $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 10.0.100-alpha.1.24568.1 + 10.0.100-alpha.1.24569.3 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) @@ -232,25 +232,25 @@ - 10.0.0-alpha.2.24568.8 - 10.0.0-alpha.2.24568.8 - 10.0.0-alpha.2.24568.8 - 10.0.0-alpha.2.24568.8 - 10.0.0-alpha.2.24568.8 - 10.0.0-alpha.2.24568.8 - 10.0.0-alpha.2.24568.8 - 10.0.0-alpha.2.24568.8 - 10.0.0-alpha.2.24568.8 - 10.0.0-alpha.2.24568.8 - 10.0.0-alpha.2.24568.8 - 10.0.0-alpha.2.24568.8 - 10.0.0-alpha.2.24568.8 + 10.0.0-alpha.2.24569.2 + 10.0.0-alpha.2.24569.2 + 10.0.0-alpha.2.24569.2 + 10.0.0-alpha.2.24569.2 + 10.0.0-alpha.2.24569.2 + 10.0.0-alpha.2.24569.2 + 10.0.0-alpha.2.24569.2 + 10.0.0-alpha.2.24569.2 + 10.0.0-alpha.2.24569.2 + 10.0.0-alpha.2.24569.2 + 10.0.0-alpha.2.24569.2 + 10.0.0-alpha.2.24569.2 + 10.0.0-alpha.2.24569.2 - 9.0.0-preview.24568.7 - 9.0.0-preview.24568.7 - 9.0.0-preview.24568.7 + 9.0.0-preview.24569.2 + 9.0.0-preview.24569.2 + 9.0.0-preview.24569.2 @@ -282,12 +282,12 @@ - 9.0.0-beta.24562.2 - 9.0.0-beta.24562.2 - 9.0.0-beta.24562.2 - 9.0.0-beta.24562.2 - 9.0.0-beta.24562.2 - 9.0.0-beta.24562.2 + 9.0.0-beta.24568.2 + 9.0.0-beta.24568.2 + 9.0.0-beta.24568.2 + 9.0.0-beta.24568.2 + 9.0.0-beta.24568.2 + 9.0.0-beta.24568.2 diff --git a/github-merge-flow.jsonc b/github-merge-flow.jsonc index 064cf7234e25..f14a2eb445f1 100644 --- a/github-merge-flow.jsonc +++ b/github-merge-flow.jsonc @@ -1,16 +1,6 @@ // IMPORTANT: This file is read by the merge flow from main branch only. { "merge-flow-configurations": { - // Automate opening PRs to merge cli release/6.0.1xx to .4xx - "release/6.0.1xx":{ - "MergeToBranch": "release/6.0.4xx", - "ExtraSwitches": "-QuietComments" - }, - // Automate opening PRs to merge cli release/6.0.4xx to 8.0.1xx - "release/6.0.4xx":{ - "MergeToBranch": "release/8.0.1xx", - "ExtraSwitches": "-QuietComments" - }, // Automate opening PRs to merge cli release/8.0.1xx to 8.0.3xx "release/8.0.1xx":{ "MergeToBranch": "release/8.0.3xx", diff --git a/test/TestAssets/TestProjects/NuGetConfigRandomPackageSources/NuGet.config b/test/TestAssets/TestProjects/NuGetConfigRandomPackageSources/NuGet.config index ac2a9a61c82d..790cd0215ba5 100644 --- a/test/TestAssets/TestProjects/NuGetConfigRandomPackageSources/NuGet.config +++ b/test/TestAssets/TestProjects/NuGetConfigRandomPackageSources/NuGet.config @@ -1,8 +1,7 @@ - - - + + \ No newline at end of file diff --git a/test/dotnet.Tests/CommandTests/ToolInstallGlobalOrToolPathCommandTests.cs b/test/dotnet.Tests/CommandTests/ToolInstallGlobalOrToolPathCommandTests.cs index fdb372e27c1f..a901c2eb764c 100644 --- a/test/dotnet.Tests/CommandTests/ToolInstallGlobalOrToolPathCommandTests.cs +++ b/test/dotnet.Tests/CommandTests/ToolInstallGlobalOrToolPathCommandTests.cs @@ -106,6 +106,7 @@ public void WhenPassingIgnoreFailedSourcesItShouldNotThrow() [Fact] public void WhenDuplicateSourceIsPassedIgnore() { + var duplicateSource = "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet9/nuget/v3/index.json"; var testAsset = _testAssetsManager .CopyTestAsset("NuGetConfigRandomPackageSources", allowCopyIfPresent: true) .WithSource(); @@ -113,16 +114,16 @@ public void WhenDuplicateSourceIsPassedIgnore() var packageSourceLocation = new PackageSourceLocation( nugetConfig: new FilePath(Path.Combine(testAsset.Path, "NuGet.config")), rootConfigDirectory: new DirectoryPath(testAsset.Path), - additionalSourceFeeds: ["https://api.nuget.org/v3/invalid.json"]); + additionalSourceFeeds: [duplicateSource]); var nuGetPackageDownloader = new NuGetPackageDownloader(new DirectoryPath(testAsset.Path)); var sources = nuGetPackageDownloader.LoadNuGetSources(new ToolPackage.PackageId(PackageId), packageSourceLocation); // There should only be one source - sources.Where(s => s.SourceUri == new Uri("https://api.nuget.org/v3/invalid.json")) + sources.Where(s => s.SourceUri == new Uri(duplicateSource)) .Should().HaveCount(1); // It should be the source from the NuGet.config file - sources.Where(s => s.SourceUri == new Uri("https://api.nuget.org/v3/invalid.json")).Single().Name - .Should().Be("invalid_source"); + sources.Where(s => s.SourceUri == new Uri(duplicateSource)).Single().Name + .Should().Be("example_source"); } [Fact]