Skip to content
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.

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

[automated] Merge branch 'release/8.0.3xx' => 'release/8.0.4xx' #44057

Merged
merged 114 commits into from
Oct 10, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
114 commits
Select commit Hold shift + click to select a range
fd29985
Merge commit '85b160e2f7f3a03d6162a2846658158796bd45d7'
Jul 29, 2024
2ad5a8d
Merge commit 'ac93f2e912f017059422118da77e6f4c1061420f'
Aug 6, 2024
b6fe276
Merge commit '48e7a560453ce37c42434153a617685b700db6f4'
Aug 6, 2024
b38adb7
Merge commit 'cb6781ba484390808b4bfa68a24b0a0e98e8a920'
Aug 7, 2024
95d5492
Merge commit '5ec1ffe779e6ab8f7d16b615f7d35ac7d39e2045'
Aug 7, 2024
8f30776
Merge commit '8bacb9fb8bf3d5b613a3bedfaa002637eb20850b'
Aug 7, 2024
6953504
Merge commit '8a14964a73ab3f059a951bd9fff63240d7d947b8'
Aug 7, 2024
c5948e2
Merge commit 'ac0b1752ec569df94fbdd8802d066e5167264ebc'
Aug 7, 2024
c614c9a
Merge commit 'bde3cf29b9821c75eb759b3487bf6ad6e94e13f9'
Aug 7, 2024
7d635b0
Merge commit '215a7ca3fc92c7ff71caeef21e5401dbe08d341a'
Aug 7, 2024
5dcc07e
Merge commit '27f07f11cf1e40a3962ad94110212178a11659ef'
Aug 8, 2024
e017620
Merge commit 'a900ffcef1fe7748c85032909e80aec103ed64e2'
Aug 9, 2024
27d2ba2
Merge commit 'a68a8fcd421e11b5f77e5ed670598a26b5669e77'
Aug 11, 2024
5f44517
Merge commit '7e240af6828cbe8b3b71b46dcb6ebbcf0ac79bcc'
Aug 12, 2024
4f591e9
Merge commit 'd1edf45dbd83e85b04ada457e2ed01814ba02147'
Aug 13, 2024
d9b8f56
Merge commit '81560bf803092c5646ded3b602984410567f4ed2'
Aug 14, 2024
6283841
Merge commit '02ecebc4947db82b6cfc2e916cdcbe0119dff3c8'
Aug 14, 2024
08d63f9
Merge commit 'aeb357b3c2d54cbe506f49b93010c7a0adb177ab'
Aug 14, 2024
70e1690
Merge commit '2b1a30bbb84cd8bb29d2c43048685cdf89fb30ca'
Aug 14, 2024
f3981a5
Merge commit 'a2bd9751d1da994db23149786d65d36139b337a6'
Aug 14, 2024
63e3680
Merge commit '8062eb1f06b1c321e369ab3803966930674e58c0'
Aug 15, 2024
b11074c
Merge commit 'f19159e74036f0c35ad4b3a69be7f4003ce9f48b'
Aug 15, 2024
35d91f6
Merged PR 41537: [internal/release/6.0.4xx] Update dependencies from …
Aug 15, 2024
691dfd4
Merged PR 41771: [internal/release/6.0.4xx] Update dependencies from …
Aug 16, 2024
a9a2051
Merge commit 'fce9b6fb74d81da36d4d76b5b369e1a692dfefad'
Aug 16, 2024
85d7e1e
Merged PR 41779: [internal/release/6.0.4xx] Update dependencies from …
Aug 16, 2024
b405dfb
Merged PR 41800: [internal/release/8.0.1xx] Update dependencies from …
Aug 16, 2024
e529830
Merged PR 41818: [internal/release/6.0.4xx] Update dependencies from …
Aug 17, 2024
082c978
Merged PR 41827: [internal/release/6.0.4xx] Update dependencies from …
Aug 17, 2024
b426ce9
Merged PR 41865: [internal/release/6.0.4xx] Update dependencies from …
Aug 19, 2024
f423d4b
Merged PR 41867: Add System.Diagnostics.EventLog to CPM
mmitche Aug 19, 2024
f863cc8
Merged PR 41917: [internal/release/8.0.1xx] Update dependencies from …
Aug 20, 2024
9deba6c
Merge commit '06037a9a5edc3de215c789416f0dfbaeae1a0dcb'
Aug 29, 2024
a42268d
Merge commit '5a306c07e593515f5d77f60925a0c8e49a372da8'
Aug 30, 2024
4917b31
Merge commit '1c5fb0eba33a387a59c8e60d1d5517fc1981b2c3'
Aug 30, 2024
42d4558
Merge commit 'd2daabf190e5ad4b315964f41b9dda27502e3871'
Aug 30, 2024
9bc4fb7
Merge commit '110f05887eb3d26f22b0fbbe991414959fc18582'
Aug 30, 2024
3aec761
Merge commit 'c7278d228c343bdc0242609a81904ceb4d9a4a73'
Aug 30, 2024
5019a77
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Sep 1, 2024
46eddb1
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Sep 3, 2024
5e1ce28
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Sep 3, 2024
5f8ccea
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Sep 4, 2024
b255dc8
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Sep 5, 2024
e1261e7
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Sep 6, 2024
01463dd
Merge commit 'b979ade394711e6c2c87530d5aaec9e09b212eec'
Sep 9, 2024
f82a725
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Sep 9, 2024
a6c6525
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Sep 9, 2024
cf51a7a
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Sep 10, 2024
c15a217
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Sep 10, 2024
e5f9136
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Sep 10, 2024
2111278
Merged PR 42558: Merge public release/6.0.4xx to internal/release/6.0…
marcpopMSFT Sep 10, 2024
06dfd5e
Merge commit '3f6b26072e0ca86e78085fee5a50bdff200a4bb0'
Sep 10, 2024
1b67ec8
Merged PR 42297: [internal/release/8.0.1xx] Update dependencies from …
Sep 11, 2024
0cdd72c
Merged PR 42392: [internal/release/6.0.4xx] Update dependencies from …
Sep 11, 2024
7285225
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Sep 11, 2024
f9229b3
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Sep 11, 2024
74f30f9
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Sep 12, 2024
24f7b1a
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Sep 12, 2024
6e3fdfe
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Sep 12, 2024
f2e520f
Merged PR 42749: [internal/release/8.0.1xx] Update dependencies from …
Sep 12, 2024
853c4ee
Merged PR 42753: [internal/release/6.0.4xx] Update dependencies from …
Sep 12, 2024
ee6f2eb
Update dependencies from https://github.com/dotnet/arcade build 20240…
dotnet-maestro[bot] Sep 12, 2024
578d95d
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Sep 12, 2024
22cfbb2
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Sep 12, 2024
29da875
Merged PR 42780: [internal/release/6.0.4xx] Update dependencies from …
Sep 12, 2024
8ac230f
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Sep 12, 2024
8e458fd
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Sep 12, 2024
2e956ef
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Sep 12, 2024
1def328
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Sep 13, 2024
bdb19eb
[release/6.0.1xx] Update dependencies from dotnet/arcade (#43394)
v-wuzhai Sep 13, 2024
283338e
Merge branch 'release/6.0.4xx' of https://github.com/dotnet/sdk into …
v-wuzhai Sep 13, 2024
e4e1329
[automated] Merge branch 'release/6.0.1xx' => 'release/6.0.4xx' (#43401)
v-wuzhai Sep 13, 2024
4621bb0
Merge commit '843e6e5fd87a50cf712cbf4ee0e6010b49639b3e'
Sep 13, 2024
73bd9f9
Merged PR 42783: [internal/release/8.0.1xx] Update dependencies from …
Sep 13, 2024
c3caa83
Merged PR 42795: [internal/release/6.0.4xx] Update dependencies from …
Sep 13, 2024
71a7d8a
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Sep 13, 2024
bd08383
Update format
Cosifne Sep 13, 2024
1ce0315
Merged PR 42831: Fix full framework and disable some tests
marcpopMSFT Sep 13, 2024
9e198e0
Merged PR 42839: [internal/release/6.0.4xx] Update dependencies from …
Sep 13, 2024
4a9baf0
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Sep 13, 2024
b9415b4
Merge commit '2c232aa093ba0136314ede8917695a00493d1e70'
Sep 16, 2024
f3d2fa7
Merged PR 42850: [internal/release/8.0.1xx] Update dependencies from …
Sep 16, 2024
0a95111
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Sep 16, 2024
142fc74
Merged PR 42873: [internal/release/6.0.4xx] Update dependencies from …
Sep 16, 2024
0f7bfed
Merged PR 42878: [internal/release/6.0.4xx] Merge from public
vseanreesermsft Sep 16, 2024
5205550
Merge remote-tracking branch 'dnceng/internal/release/6.0.4xx' into d…
Cosifne Sep 17, 2024
c52c2d3
Merged PR 42939: [internal/release/8.0.1xx] Updated Version.Details.x…
vseanreesermsft Sep 17, 2024
4c39715
Merged PR 42947: Revert "Merged PR 42939: [internal/release/8.0.1xx] …
vseanreesermsft Sep 17, 2024
aa87185
Merged PR 42718: Insert format into internal/release/6.0.4xx
Cosifne Sep 17, 2024
d404f56
Merged PR 43008: Insert format into internal/release/6.0.4xx
vseanreesermsft Sep 18, 2024
db993d2
Merged PR 42961: [internal/release/8.0.1xx] Update dependencies from …
Sep 18, 2024
50295e6
Merged PR 43029: Update format in 8.0.1xx
Cosifne Sep 19, 2024
d90806d
Merged PR 43039: Update Roslyn in 8.0.1xx branch
Cosifne Sep 19, 2024
dfe13f6
Update branding to 6.0.428
vseanreesermsft Oct 1, 2024
247ea61
Add osx14 to the latest toolset
marcpopMSFT Oct 2, 2024
620359e
Switch back to macos 13
marcpopMSFT Oct 3, 2024
50f62a1
Switch back to macos 13
marcpopMSFT Oct 3, 2024
b07b92e
remove the osx14 update
marcpopMSFT Oct 3, 2024
e50e061
Switch PRs back to macos 13
marcpopMSFT Oct 3, 2024
9542cda
Update branding to 6.0.428 (#43821)
marcpopMSFT Oct 3, 2024
170b529
Update dependencies from https://github.com/dotnet/linker build 20240…
dotnet-maestro[bot] Sep 23, 2024
b3b0789
Update dependencies from https://github.com/dotnet/linker build 20240…
dotnet-maestro[bot] Sep 24, 2024
4c28d29
Update dependencies from https://github.com/dotnet/linker build 20240…
dotnet-maestro[bot] Sep 25, 2024
892f82d
[release/6.0.4xx] Update dependencies from dotnet/linker (#43641)
nagilson Oct 4, 2024
795da3c
Merge commit 'd404f562916f5be62c6661e4f7033f26859ce939' into internal…
vseanreesermsft Oct 8, 2024
391c0f2
Merge commit 'd90806d013db39755cda355f42015d6a248456f5' into internal…
vseanreesermsft Oct 8, 2024
abee3fb
Merging internal commits for release/6.0.4xx (#43981)
mmitche Oct 9, 2024
18ffe97
Merge branch 'release/8.0.1xx' into merge/release/6.0.4xx-to-release/…
marcpopMSFT Oct 9, 2024
b316e49
Revert the macos image
marcpopMSFT Oct 9, 2024
f0a51e6
[automated] Merge branch 'release/6.0.4xx' => 'release/8.0.1xx' (#44031)
marcpopMSFT Oct 9, 2024
36e90b7
Merging internal commits for release/8.0.1xx (#43982)
mmitche Oct 10, 2024
191c4a4
Merge branch 'release/8.0.3xx' of https://github.com/dotnet/sdk into …
v-wuzhai Oct 10, 2024
eb7e837
[automated] Merge branch 'release/8.0.1xx' => 'release/8.0.3xx' (#44045)
v-wuzhai Oct 10, 2024
8fba994
Merge branch 'release/8.0.4xx' of https://github.com/dotnet/sdk into …
v-wuzhai Oct 10, 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
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ public void WhenRunOnWindowsDotnetHelpCommandShouldContainProperProcessInformati
public void WhenRunOnLinuxDotnetHelpCommandShouldContainProperProcessInformation()
{
var proc = HelpCommand.ConfigureProcess("https://aka.ms/dotnet-build");
Assert.Equal("xdg-open", proc.StartInfo.FileName);
Assert.Contains("xdg-open", proc.StartInfo.FileName);
Assert.Equal("https://aka.ms/dotnet-build", proc.StartInfo.Arguments);

}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ public void UsingDotnetForTheFirstTimeWithNonVerbsDoesNotPrintEula()
.StartWith(firstTimeNonVerbUseMessage);
}

[WindowsOnlyFact]
[WindowsOnlyFact(Skip="https://github.com/dotnet/sdk/issues/43328")]
public void ItShowsTheAppropriateMessageToTheUser()
{

Expand Down Expand Up @@ -151,7 +151,7 @@ public void ItDoesNotCreateAFirstUseSentinelFileNorAnAspNetCertificateSentinelFi
homeFolder.Should().NotExist();
}

[WindowsOnlyFact]
[WindowsOnlyFact(Skip="https://github.com/dotnet/sdk/issues/43328")]
public void ItShowsTheTelemetryNoticeWhenInvokingACommandAfterInternalReportInstallSuccessHasBeenInvoked()
{
var dotnetFirstTime = new DotNetFirstTime();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,8 @@ public void When_dotnet_command_invokes_msbuild_with_diag_verbosity_Then_arg_is_

var cmd = new DotnetCommand(Log)
.WithWorkingDirectory(testInstance.Path)
.WithEnvironmentVariable("HelixAccessToken", "")
.WithEnvironmentVariable("SYSTEM_ACCESSTOKEN", "")
.Execute(command, "-v", "diag");

cmd.Should().Pass();
Expand Down
Loading