Skip to content

Commit ed984e3

Browse files
authored
Update SDK to 8.0.100-preview.6.23305.3 (#48619)
* Update SDK to 8.0.100-preview.6.23305.3 * Fix build for new 8.0 SDK - Add static keyword for method that doesn't need to be an instance method. - Change workaround for dotnet/linker#3175 to use net7.0 instead of net8.0. The ILLink.Analysis package no longer ships in net8.0. So use net7.0, like the rest of the "unsupported" TFMs use.
1 parent 110522a commit ed984e3

File tree

4 files changed

+5
-4
lines changed

4 files changed

+5
-4
lines changed

NuGet.config

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
66
<add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
77
<add key="dotnet8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8/nuget/v3/index.json" />
8+
<add key="dotnet7" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet7/nuget/v3/index.json" />
89
<add key="dotnet8-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8-transport/nuget/v3/index.json" />
910
<add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" />
1011
<!-- Used for the SiteExtension bits that are included in the 8.0 build -->

eng/tools/GenerateFiles/Directory.Build.targets.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@
139139
BeforeTargets="ProcessFrameworkReferences">
140140
<ItemGroup>
141141
<KnownILLinkPack Include="@(KnownILLinkPack)"
142-
Condition="'%(TargetFramework)' == '${DefaultNetCoreTargetFramework}'"
142+
Condition="'%(TargetFramework)' == 'net7.0'"
143143
TargetFramework="netstandard2.1"
144144
ILLinkPackVersion="%(KnownILLinkPack.ILLinkPackVersion)" />
145145
</ItemGroup>

global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
22
"sdk": {
3-
"version": "8.0.100-preview.5.23275.15"
3+
"version": "8.0.100-preview.6.23305.3"
44
},
55
"tools": {
6-
"dotnet": "8.0.100-preview.5.23275.15",
6+
"dotnet": "8.0.100-preview.6.23305.3",
77
"runtimes": {
88
"dotnet/x86": [
99
"$(MicrosoftNETCoreBrowserDebugHostTransportVersion)"

src/Mvc/Mvc.Core/src/Routing/ActionConstraintMatcherPolicy.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ public Task ApplyAsync(HttpContext httpContext, CandidateSet candidateSet)
151151
return EvaluateActionConstraintsCore(httpContext, candidateSet, items, startingOrder: null);
152152
}
153153

154-
private IReadOnlyList<(int index, ActionSelectorCandidate candidate)>? EvaluateActionConstraintsCore(
154+
private static IReadOnlyList<(int index, ActionSelectorCandidate candidate)>? EvaluateActionConstraintsCore(
155155
HttpContext httpContext,
156156
CandidateSet candidateSet,
157157
IReadOnlyList<(int index, ActionSelectorCandidate candidate)> items,

0 commit comments

Comments
 (0)