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' #44037

Merged
merged 107 commits into from
Oct 10, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
107 commits
Select commit Hold shift + click to select a range
89cdd92
Merge commit '5e5198337a4b0324c6956ed5bddcf3cfa949b0fe'
Aug 6, 2024
93b72d5
Merge commit '2c38103f15c3e32f748c46ad4eb48c918ecbbbc7'
Aug 7, 2024
4db5d51
Merge commit 'cfa17b8a2c34cbc21f9b0d29fbf475d3a895ed15'
Aug 7, 2024
ee47440
Merge commit 'dc0638fad704b7ea6ac1e1d146c412f9ba22e2f0'
Aug 7, 2024
248c4d0
Merge commit '390480356f248bad31d1d39f747ebf89ce92206f'
Aug 7, 2024
27ccba8
Merge commit '3abbe4c36216fe798dfb51eb4432393bb45bc4e2'
Aug 7, 2024
3e12c51
Merge commit 'cbd8de330699d1c41f7f2258d570e884b8417441'
Aug 7, 2024
49cc675
Merge commit '1816d2a3f6ea7d16b457c9602af7504ec2f670a8'
Aug 8, 2024
a32c1b4
Merge commit '27fd588d00bbf217a3480b1dc46a0a17754d15b9'
Aug 12, 2024
10d3709
Merge commit 'dc21427c22682216201c75e89c0c9df8a284d924'
Aug 13, 2024
82d821b
Merge commit '3ece0dfd285dee756b75806bbc5951c813ff4f70'
Aug 14, 2024
56f7f51
Merge commit 'bea802e9e19f20e694ec6a85979c2a94f8e22f4c'
Aug 14, 2024
e45a61b
Merge commit '89ac11b0cc244bb8d0cbcd837d634e9ca1ed74a7'
Aug 14, 2024
d10e9c3
Merge commit '30d40f4c5367f7d952d72e4b963a74a9642b3106'
Aug 15, 2024
8e8aa24
Merge commit '3e6fbb9b7b62f5fd96cc9929161210ea580da82a'
Aug 15, 2024
1b4f8e3
Merge commit '140e502b23fea964416768163e8619da53fd6483'
Aug 16, 2024
cf44673
Merged PR 41764: [internal/release/8.0.3xx] Update dependencies from …
Aug 16, 2024
9e0d2f7
Merged PR 41928: Add System.Diagnostics.EventLog to CPM
vseanreesermsft Aug 20, 2024
ca1ade5
Merged PR 41936: [internal/release/8.0.3xx] Update dependencies from …
Aug 21, 2024
c11baf7
Merge commit '28088a45c79f43c7e9e7981e0e3ad72c71267e54'
Aug 29, 2024
9441941
Merge commit 'd1d185479660507e8d567c6eb29d80e6600af2fa'
Aug 30, 2024
0ec148f
Merge commit 'cce26601c6f8de9f330dcc9b7a55fe6b74e89742'
Aug 30, 2024
f86d72d
Merge commit '0a876a56318717c8889a661eaca8c1af663b6e8c'
Aug 30, 2024
de5204f
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Sep 1, 2024
573bc1a
Merge commit '3d6abaeb133a7087519fa61d522ea8cf7a6a72e7'
Sep 2, 2024
5c184ae
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Sep 3, 2024
23f8983
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Sep 4, 2024
6676c0a
Merge commit '03b4628981f1017c1f6d0ac05a9e0bba49424228'
Sep 5, 2024
af51e74
Update dependencies from https://github.com/dotnet/format build 20240…
dotnet-maestro[bot] Sep 5, 2024
ffaa95d
[release/6.0.4xx] Update dependencies from dotnet/format (#43252)
v-wuzhai Sep 6, 2024
4a83630
Merge commit '9b1daaab46d25bdf00b6a8d55c5faba08eea55b9'
Sep 9, 2024
4e926f7
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Sep 9, 2024
e2ebc44
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Sep 10, 2024
0ce99a6
Merge commit 'cd242b602e4ab51da3fdacbd4e7195e267445b3b'
Sep 11, 2024
3ee5f2e
Merge commit 'd898d17581ad7cce0799113cc7d4da1a94601423'
Sep 11, 2024
eab38be
Merged PR 42300: [internal/release/8.0.3xx] Update dependencies from …
Sep 11, 2024
3c45da9
Merge commit 'f751f2133facb3e942fee9b32b429a31e261e627'
Sep 11, 2024
b6dff2a
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Sep 11, 2024
ca753d8
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Sep 12, 2024
ef3fd30
Merge commit 'e5fa5cdf30c74b37c42bbbd063af06a05f253f48'
Sep 12, 2024
6e9f5fe
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Sep 12, 2024
6113d5f
Merged PR 42750: [internal/release/8.0.3xx] Update dependencies from …
Sep 12, 2024
fd9835e
Update dependencies from https://github.com/dotnet/arcade build 20240…
dotnet-maestro[bot] Sep 12, 2024
fc825c0
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Sep 12, 2024
f629df4
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Sep 12, 2024
190da87
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Sep 12, 2024
8c89a45
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Sep 13, 2024
c2a59ab
[release/6.0.4xx] Update dependencies from dotnet/arcade (#43395)
v-wuzhai Sep 13, 2024
9415526
Merge branch 'release/8.0.1xx' of https://github.com/dotnet/sdk into …
v-wuzhai Sep 13, 2024
8498f5a
Merge commit '64510a75dfb4bec8849960d6fc6d93eec1cef6ac'
Sep 13, 2024
843e6e5
[automated] Merge branch 'release/6.0.4xx' => 'release/8.0.1xx' (#43400)
v-wuzhai Sep 13, 2024
7479f85
Update dependencies from https://github.com/dotnet/templating build 2…
dotnet-maestro[bot] Sep 13, 2024
ca91058
Update dependencies from https://github.com/dotnet/arcade build 20240…
dotnet-maestro[bot] Sep 13, 2024
8779ad5
Merged PR 42785: [internal/release/8.0.3xx] Update dependencies from …
Sep 13, 2024
fd149da
Expand EOL list to include net7 6 months after it goes OOS per design
marcpopMSFT Sep 13, 2024
49bc7fe
Updated SourceBuildPrebuiltBaseline.xml
vseanreesermsft Sep 13, 2024
5c6e6dd
Merged PR 42841: [internal/release/8.0.3xx] - Updated SourceBuildPreb…
vseanreesermsft Sep 13, 2024
b70d645
Update dependencies from https://github.com/dotnet/arcade build 20240…
dotnet-maestro[bot] Sep 13, 2024
7ca2f7c
[release/8.0.3xx] Update dependencies from dotnet/arcade (#43418)
marcpopMSFT Sep 13, 2024
11ba46e
Merge commit '7ca2f7cf5dcb94cf852a964b2d003bbd4a684836'
Sep 13, 2024
e6ff8ee
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Sep 13, 2024
2c232aa
[release/8.0.1xx] Update dependencies from dotnet/arcade (#43443)
marcpopMSFT Sep 16, 2024
0e7a1bf
Merged PR 42849: [internal/release/8.0.3xx] Update dependencies from …
Sep 16, 2024
9522277
Remove 7.0 from the templating tests
marcpopMSFT Sep 16, 2024
38848ae
Merged PR 42940: [internal/release/8.0.3xx] Updated Version.Details.x…
vseanreesermsft Sep 17, 2024
2001a1a
Merged PR 42948: Revert "Merged PR 42940: [internal/release/8.0.3xx] …
vseanreesermsft Sep 17, 2024
d082977
Merged PR 42962: [internal/release/8.0.3xx] Update dependencies from …
Sep 18, 2024
be56db5
Merged PR 43028: Update format in 8.0.3xx
Cosifne Sep 19, 2024
5cad18d
Merged PR 43037: Update Roslyn in 8.0.3xx
Cosifne Sep 19, 2024
bc72f77
Update branding to 8.0.111
vseanreesermsft Oct 1, 2024
02cc547
Update branding to 8.0.307
vseanreesermsft Oct 1, 2024
27a5660
Update dependencies from https://github.com/dotnet/roslyn build 20241…
dotnet-maestro[bot] Oct 1, 2024
c1f738a
Update branding to 8.0.111 (#43822)
marcpopMSFT Oct 2, 2024
f81a95b
Update branding to 8.0.307 (#43823)
marcpopMSFT Oct 2, 2024
fe9b151
[release/8.0.1xx] Update dependencies from dotnet/roslyn (#43825)
nagilson Oct 2, 2024
dee97cb
Update dependencies from https://github.com/dotnet/arcade build 20240…
dotnet-maestro[bot] Oct 2, 2024
38570ea
Update dependencies from https://github.com/dotnet/templating build 2…
dotnet-maestro[bot] Oct 2, 2024
97e39cc
[release/8.0.3xx] Update dependencies from dotnet/templating (#43417)
marcpopMSFT Oct 2, 2024
bd285fb
Update dependencies from https://github.com/dotnet/templating build 2…
dotnet-maestro[bot] Oct 3, 2024
d432cdb
[release/8.0.3xx] Update dependencies from dotnet/templating (#43863)
nagilson Oct 3, 2024
2a615dd
Merge remote-tracking branch 'upstream/release/8.0.3xx' into merge/re…
nagilson Oct 3, 2024
43bf55f
[release/8.0.1xx] Update dependencies from dotnet/arcade (#43850)
nagilson Oct 3, 2024
a028ac7
[release/8.0.1xx] Update dependencies from dotnet/templating (#43851)
nagilson Oct 3, 2024
62bea71
Update dependencies from https://github.com/dotnet/roslyn build 20241…
dotnet-maestro[bot] Oct 3, 2024
97ab07c
Update dependencies from https://github.com/dotnet/razor build 202410…
dotnet-maestro[bot] Oct 4, 2024
f677f0e
Update dependencies from https://github.com/dotnet/roslyn build 20241…
dotnet-maestro[bot] Oct 4, 2024
b16ea70
[release/8.0.1xx] Update dependencies from dotnet/roslyn (#43888)
nagilson Oct 4, 2024
4ecfaf0
[release/8.0.3xx] Update dependencies from dotnet/razor (#43894)
nagilson Oct 4, 2024
6ddcd47
[release/8.0.3xx] Update dependencies from dotnet/roslyn (#43895)
nagilson Oct 4, 2024
b1fc3d4
[automated] Merge branch 'release/8.0.1xx' => 'release/8.0.3xx' (#43843)
nagilson Oct 4, 2024
7b4cb33
Update dependencies from https://github.com/dotnet/arcade build 20240…
dotnet-maestro[bot] Oct 4, 2024
339a3b2
Update dependencies from https://github.com/dotnet/roslyn build 20241…
dotnet-maestro[bot] Oct 5, 2024
ff1ca6d
[release/8.0.3xx] Update dependencies from dotnet/arcade (#43919)
nagilson Oct 7, 2024
cc42269
Merge branch 'release/8.0.3xx' into darc-release/8.0.3xx-cc80f70f-873…
nagilson Oct 7, 2024
1101fb6
[release/8.0.3xx] Update dependencies from dotnet/roslyn (#43922)
nagilson Oct 7, 2024
be3f513
Update dependencies from https://github.com/dotnet/arcade build 20241…
dotnet-maestro[bot] Oct 8, 2024
f1f7542
Update dependencies from https://github.com/dotnet/arcade build 20241…
dotnet-maestro[bot] Oct 8, 2024
2711b98
[release/8.0.3xx] Update dependencies from dotnet/arcade (#43966)
nagilson Oct 8, 2024
5811dfc
[release/8.0.1xx] Update dependencies from dotnet/arcade (#43965)
nagilson Oct 8, 2024
7e83e06
Merge commit '5cad18dfda0ff1c3051dcf9d35945c853b0063a0' into internal…
vseanreesermsft Oct 8, 2024
ed388fa
Update dependencies from https://github.com/dotnet/templating build 2…
dotnet-maestro[bot] Oct 9, 2024
a359a4c
Expand EOL list to include net7 6 months after it goes OOS per design…
marcpopMSFT Oct 9, 2024
3ff290c
Merge branch 'release/8.0.3xx' into merge/release/8.0.1xx-to-release/…
marcpopMSFT Oct 9, 2024
f0b0912
Merging internal commits for release/8.0.3xx (#43983)
mmitche Oct 9, 2024
475dd9b
[automated] Merge branch 'release/8.0.1xx' => 'release/8.0.3xx' (#44030)
marcpopMSFT Oct 9, 2024
6fd9501
[release/8.0.3xx] Update dependencies from dotnet/templating (#44013)
nagilson Oct 9, 2024
5bc6473
Merge remote-tracking branch 'origin/release/8.0.4xx' into merge/rele…
nagilson Oct 9, 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 @@ -21,7 +21,7 @@ Copyright (c) .NET Foundation. All rights reserved.
receive servicing updates and security fixes.
-->
<ItemGroup>
<_EolNetCoreTargetFrameworkVersions Include="1.0;1.1;2.0;2.1;2.2;3.0;3.1;5.0" />
<_EolNetCoreTargetFrameworkVersions Include="1.0;1.1;2.0;2.1;2.2;3.0;3.1;5.0;7.0" />
</ItemGroup>
<PropertyGroup>
<_MinimumNonEolSupportedNetCoreTargetFramework>net6.0</_MinimumNonEolSupportedNetCoreTargetFramework>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ public GivenThatWeWantToTargetEolFrameworks(ITestOutputHelper log) : base(log)
[InlineData("netcoreapp3.0")]
[InlineData("netcoreapp3.1")]
[InlineData("net5.0")]
[InlineData("net7.0")]
public void It_warns_that_framework_is_out_of_support(string targetFrameworks)
{
var testProject = new TestProject()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ public void NativeAot_hw_runs_with_no_warnings_when_PublishAot_is_enabled(string

var publishCommand = new PublishCommand(Log, Path.Combine(testAsset.TestRoot, testProject.Name));
publishCommand
.Execute($"/p:UseCurrentRuntimeIdentifier=true", "/p:SelfContained=true")
.Execute($"/p:UseCurrentRuntimeIdentifier=true", "/p:SelfContained=true", "/p:CheckEolTargetFramework=false")
.Should().Pass()
.And.NotHaveStdOutContaining("IL2026")
.And.NotHaveStdErrContaining("NETSDK1179")
Expand Down Expand Up @@ -87,7 +87,7 @@ public void NativeAot_hw_runs_with_no_warnings_when_PublishAot_is_false(string t

var publishCommand = new PublishCommand(testAsset);
publishCommand
.Execute($"/p:RuntimeIdentifier={rid}", "/p:SelfContained=true")
.Execute($"/p:RuntimeIdentifier={rid}", "/p:SelfContained=true", "/p:CheckEolTargetFramework=false")
.Should().Pass()
.And.NotHaveStdOutContaining("IL2026")
.And.NotHaveStdErrContaining("NETSDK1179")
Expand Down
10 changes: 5 additions & 5 deletions src/Tests/dotnet-new.Tests/CommonTemplatesTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -230,8 +230,8 @@ public async void AotVariants(string name, string language)

var templatesToTest = new[]
{
new { Template = consoleTemplateShortname, Frameworks = new[] { null, "net6.0", "net7.0", "net8.0" } },
new { Template = "classlib", Frameworks = new[] { null, "net6.0", "net7.0", "net8.0", "netstandard2.0", "netstandard2.1" } }
new { Template = consoleTemplateShortname, Frameworks = new[] { null, "net6.0", "net8.0" } },
new { Template = "classlib", Frameworks = new[] { null, "net6.0", "net8.0", "netstandard2.0", "netstandard2.1" } }
};

//features: top-level statements; nullables; implicit usings; filescoped namespaces
Expand All @@ -240,9 +240,9 @@ public async void AotVariants(string name, string language)
//C# 12 is not supported yet - https://github.com/dotnet/sdk/issues/29195
string?[] supportedLanguageVersions = { null, "ISO-2", "2", "3", "4", "5", "6", "7", "7.1", "7.2", "7.3", "8.0", "9.0", "10.0", "11.0", "11", /*"12",*/ "latest", "latestMajor", "default", "preview" };

string?[] nullableSupportedInFrameworkByDefault = { null, "net6.0", "net7.0", "net8.0", "netstandard2.1" };
string?[] implicitUsingsSupportedInFramework = { null, "net6.0", "net7.0", "net8.0" };
string?[] fileScopedNamespacesSupportedFrameworkByDefault = { null, "net6.0", "net7.0", "net8.0" };
string?[] nullableSupportedInFrameworkByDefault = { null, "net6.0", "net8.0", "netstandard2.1" };
string?[] implicitUsingsSupportedInFramework = { null, "net6.0", "net8.0" };
string?[] fileScopedNamespacesSupportedFrameworkByDefault = { null, "net6.0", "net8.0" };

string?[] nullableSupportedLanguages = { "8.0", "9.0", "10.0", "11.0", "11", /*"12",*/ "latest", "latestMajor", "default", "preview" };
string?[] topLevelStatementSupportedLanguages = { null, "9.0", "10.0", "11", "11.0", /*"12",*/ "latest", "latestMajor", "default", "preview" };
Expand Down