Skip to content

Commit 48ad22c

Browse files
lbussellCopilot
lbussell
and
Copilot
committed
Merge upstream/main into nightly
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
2 parents 0bc267f + 82488db commit 48ad22c

339 files changed

Lines changed: 1548 additions & 1534 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎README.aspnet.md‎

Lines changed: 158 additions & 158 deletions
Large diffs are not rendered by default.

‎README.runtime-deps.md‎

Lines changed: 84 additions & 84 deletions
Large diffs are not rendered by default.

‎README.runtime.md‎

Lines changed: 100 additions & 100 deletions
Large diffs are not rendered by default.

‎README.sdk.md‎

Lines changed: 59 additions & 59 deletions
Large diffs are not rendered by default.

‎manifest.versions.json‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -18,23 +18,23 @@
1818
"alpine|9.0|floating-tag-version": "$(alpine|floating-tag-version)",
1919
"alpine|8.0|floating-tag-version": "$(alpine|floating-tag-version)",
2020

21-
"aspire-dashboard|build-version": "13.3.0-preview.1.26174.7",
21+
"aspire-dashboard|build-version": "13.3.0-preview.1.26256.5",
2222
"aspire-dashboard|product-version": "13.3.0",
23-
"aspire-dashboard|fixed-tag": "13.3.0",
23+
"aspire-dashboard|fixed-tag": "$(aspire-dashboard|product-version)",
2424
"aspire-dashboard|minor-tag": "13.3",
2525
"aspire-dashboard|major-tag": "13",
26-
"aspire-dashboard|linux|x64|sha": "080be00132d97cfcf6c01a85aa60952e6a3d620863c479d3094f93bf21b561764e9f2773465636d29dfed231a3906b26f4aaabc576c01a93b98d7d0d06308f1c",
27-
"aspire-dashboard|linux|arm64|sha": "84a2501019a9ef7c6dfb995a9c3b4e3b50878e27ce7d0397e12731b70c4e20c62a72d05322b1a621663d031445c438a8692353e2eed03d641347f1ba3c4eb937",
26+
"aspire-dashboard|linux|x64|sha": "cfafa97f3d8bca6a3e0d20d29d5d1a2c119ac2fd45650569bc596182598603512f46df91fd623d5818ed5795816419ddd7a0bd30b831df44e3256fcb30021557",
27+
"aspire-dashboard|linux|arm64|sha": "e03dd6d54b9df414a70ffa16d962dddb4b83c516c8e8342ccf57aafb24c7c80fc3f0938ef98b2c1c7edbe221aa48cf66f302b719facffc62f2229356639667ac",
2828
"aspire-dashboard|base-url|main": "$(base-url|public|preview|nightly)",
2929
"aspire-dashboard|base-url|nightly": "$(base-url|public|preview|nightly)",
3030

31-
"aspnet|8.0|build-version": "8.0.26",
31+
"aspnet|8.0|build-version": "8.0.27",
3232
"aspnet-composite|8.0|build-version": "$(aspnet|8.0|build-version)",
3333

34-
"aspnet|9.0|build-version": "9.0.15",
34+
"aspnet|9.0|build-version": "9.0.16",
3535
"aspnet-composite|9.0|build-version": "$(aspnet|9.0|build-version)",
3636

37-
"aspnet|10.0|build-version": "10.0.7",
37+
"aspnet|10.0|build-version": "10.0.8",
3838
"aspnet-composite|10.0|build-version": "$(aspnet|10.0|build-version)",
3939

4040
"aspnet|11.0|build-version": "11.0.0-preview.4.26230.115",
@@ -74,7 +74,7 @@
7474
"chisel|8.0|arm|sha384": "$(chisel|latest|arm|sha384)",
7575
"chisel|8.0|arm64|sha384": "$(chisel|latest|arm64|sha384)",
7676

77-
"dotnet|8.0|product-version": "8.0.26",
77+
"dotnet|8.0|product-version": "8.0.27",
7878
"dotnet|8.0|fixed-tag": "$(dotnet|8.0|product-version)",
7979
"dotnet|8.0|minor-tag": "8.0",
8080
"dotnet|8.0|base-url|main": "$(base-url|public|maintenance|main)",
@@ -83,7 +83,7 @@
8383
"dotnet|8.0|base-url|checksums|nightly": "$(dotnet|8.0|base-url|nightly)",
8484
"dotnet|8.0|aggregate-checksums": "/checksums/$(dotnet|8.0|product-version)-sha.txt",
8585

86-
"dotnet|9.0|product-version": "9.0.15",
86+
"dotnet|9.0|product-version": "9.0.16",
8787
"dotnet|9.0|fixed-tag": "$(dotnet|9.0|product-version)",
8888
"dotnet|9.0|minor-tag": "9.0",
8989
"dotnet|9.0|base-url|main": "$(base-url|public|maintenance|main)",
@@ -92,7 +92,7 @@
9292
"dotnet|9.0|base-url|checksums|nightly": "$(dotnet|9.0|base-url|nightly)",
9393
"dotnet|9.0|aggregate-checksums": "/checksums/$(dotnet|9.0|product-version)-sha.txt",
9494

95-
"dotnet|10.0|product-version": "10.0.7",
95+
"dotnet|10.0|product-version": "10.0.8",
9696
"dotnet|10.0|fixed-tag": "$(dotnet|10.0|product-version)",
9797
"dotnet|10.0|minor-tag": "10.0",
9898
"dotnet|10.0|base-url|main": "$(base-url|public|maintenance|main)",
@@ -225,31 +225,31 @@
225225
"rocks-toolbox|10.0|version": "$(rocks-toolbox|latest|version)",
226226
"rocks-toolbox|11.0|version": "$(rocks-toolbox|latest|version)",
227227

228-
"runtime|8.0|build-version": "8.0.26",
229-
"runtime|9.0|build-version": "9.0.15",
230-
"runtime|10.0|build-version": "10.0.7",
228+
"runtime|8.0|build-version": "8.0.27",
229+
"runtime|9.0|build-version": "9.0.16",
230+
"runtime|10.0|build-version": "10.0.8",
231231
"runtime|11.0|build-version": "11.0.0-preview.4.26230.115",
232232

233-
"sdk|8.0|build-version": "8.0.420",
234-
"sdk|8.0|product-version": "8.0.420",
233+
"sdk|8.0|build-version": "8.0.421",
234+
"sdk|8.0|product-version": "8.0.421",
235235
"sdk|8.0|base-url|main": "$(dotnet|8.0|base-url|main)",
236236
"sdk|8.0|base-url|nightly": "$(dotnet|8.0|base-url|nightly)",
237237
"sdk|8.0|base-url|checksums|main": "$(sdk|8.0|base-url|main)",
238238
"sdk|8.0|base-url|checksums|nightly": "$(sdk|8.0|base-url|nightly)",
239239
"sdk|8.0|fixed-tag": "$(sdk|8.0|product-version)",
240240
"sdk|8.0|minor-tag": "$(dotnet|8.0|minor-tag)",
241241

242-
"sdk|9.0|build-version": "9.0.313",
243-
"sdk|9.0|product-version": "9.0.313",
242+
"sdk|9.0|build-version": "9.0.314",
243+
"sdk|9.0|product-version": "9.0.314",
244244
"sdk|9.0|base-url|main": "$(dotnet|9.0|base-url|main)",
245245
"sdk|9.0|base-url|nightly": "$(dotnet|9.0|base-url|nightly)",
246246
"sdk|9.0|base-url|checksums|main": "$(sdk|9.0|base-url|main)",
247247
"sdk|9.0|base-url|checksums|nightly": "$(sdk|9.0|base-url|nightly)",
248248
"sdk|9.0|fixed-tag": "$(sdk|9.0|product-version)",
249249
"sdk|9.0|minor-tag": "$(dotnet|9.0|minor-tag)",
250250

251-
"sdk|10.0|build-version": "10.0.203",
252-
"sdk|10.0|product-version": "10.0.203",
251+
"sdk|10.0|build-version": "10.0.300",
252+
"sdk|10.0|product-version": "10.0.300",
253253
"sdk|10.0|base-url|main": "$(dotnet|10.0|base-url|main)",
254254
"sdk|10.0|base-url|nightly": "$(dotnet|10.0|base-url|nightly)",
255255
"sdk|10.0|base-url|checksums|main": "$(dotnet|10.0|base-url|checksums|main)",

‎samples/complexapp/Dockerfile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ WORKDIR /source
88

99
# Copy project file and restore as distinct layers
1010
COPY --link Directory.Build.props .
11+
COPY --link NuGet.config .
1112
COPY --link complexapp/*.csproj complexapp/
1213
COPY --link libfoo/*.csproj libfoo/
1314
COPY --link libbar/*.csproj libbar/

‎samples/complexapp/NuGet.config‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<configuration>
3+
<packageSources>
4+
<clear />
5+
<add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" />
6+
</packageSources>
7+
</configuration>

samples/releasesapi/nuget.config renamed to samples/releasesapi/NuGet.config

File renamed without changes.

‎samples/releasesapi/ReportGenerator.cs‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ public static async IAsyncEnumerable<MajorVersion> GetVersionsAsync()
1515
await foreach(MajorRelease release in GetMajorReleasesAsync())
1616
{
1717
int supportDays = release.EolDate is null ? 0 : GetDaysAgo(release.EolDate);
18-
bool supported = release.SupportPhase is "active" or "maintainence";
18+
bool supported = IsSupported(release);
1919
MajorVersion version = new(release.ChannelVersion, supported, release.EolDate ?? "", supportDays, GetReleases(release).ToList());
2020
yield return version;
2121
}
@@ -43,7 +43,7 @@ public static async IAsyncEnumerable<MajorRelease> GetMajorReleasesAsync()
4343

4444
public static MajorVersion GetVersion(MajorRelease release) =>
4545
new(release.ChannelVersion,
46-
release.SupportPhase is "active" or "maintainence",
46+
IsSupported(release),
4747
release.EolDate ?? "",
4848
release.EolDate is null ? 0 : GetDaysAgo(release.EolDate),
4949
GetReleases(release).ToList()
@@ -81,6 +81,9 @@ static int GetDaysAgo(string date, bool positiveNumber = false)
8181
return positiveNumber ? Math.Abs(daysAgo) : daysAgo;
8282
}
8383

84+
static bool IsSupported(MajorRelease release) =>
85+
release.SupportPhase is "active" or "maintenance";
86+
8487
}
8588

8689
[JsonSourceGenerationOptions(PropertyNamingPolicy = JsonKnownNamingPolicy.KebabCaseLower)]

‎samples/releasesapp/ReportGenerator.cs‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ public static async IAsyncEnumerable<MajorVersion> GetVersionsAsync()
1616
await foreach(MajorRelease release in GetMajorReleasesAsync())
1717
{
1818
int supportDays = release.EolDate is null ? 0 : GetDaysAgo(release.EolDate);
19-
bool supported = release.SupportPhase is "active" or "maintainence";
19+
bool supported = IsSupported(release);
2020
MajorVersion version = new(release.ChannelVersion, supported, release.EolDate ?? "", supportDays, GetReleases(release).ToList());
2121
yield return version;
2222
}
@@ -44,7 +44,7 @@ public static async IAsyncEnumerable<MajorRelease> GetMajorReleasesAsync()
4444

4545
public static MajorVersion GetVersion(MajorRelease release) =>
4646
new(release.ChannelVersion,
47-
release.SupportPhase is "active" or "maintainence",
47+
IsSupported(release),
4848
release.EolDate ?? "",
4949
release.EolDate is null ? 0 : GetDaysAgo(release.EolDate),
5050
GetReleases(release).ToList()
@@ -82,6 +82,9 @@ static int GetDaysAgo(string date, bool positiveNumber = false)
8282
return positiveNumber ? Math.Abs(daysAgo) : daysAgo;
8383
}
8484

85+
static bool IsSupported(MajorRelease release) =>
86+
release.SupportPhase is "active" or "maintenance";
87+
8588
}
8689

8790
[JsonSourceGenerationOptions(

0 commit comments

Comments
 (0)