Skip to content

Update .NET8 to p6 #15594

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.

Sign up for GitHub

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

Merged
merged 4 commits into from
Jul 14, 2023
Merged

Update .NET8 to p6 #15594

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cd198aa
Update .NET8 to p6
vzarytovskii Jul 13, 2023
5e645a3
Update prebuilds
vzarytovskii Jul 13, 2023
3cf12d6
nugetaudit off for sdk tests
KevinRansom Jul 13, 2023
c7606f3
Merge branch 'main' into update-dotnet-8-preview6
KevinRansom Jul 13, 2023
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
2 changes: 1 addition & 1 deletion .devcontainer/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Licensed under the MIT License. See https://go.microsoft.com/fwlink/?linkid=2090316 for license information.
#-------------------------------------------------------------------------------------------------------------

ARG VARIANT=7.0.203-bullseye-slim-amd64
ARG VARIANT=8.0.100-preview.6-bookworm-slim-amd64
FROM mcr.microsoft.com/dotnet/sdk:${VARIANT}

# Avoid warnings by switching to noninteractive
Expand Down
4 changes: 2 additions & 2 deletions .devcontainer/devcontainer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
// For format details, see https://aka.ms/vscode-remote/devcontainer.json or this file's README at:
{
"name": "F# (.NET 7)",
"name": "F# (.NET 8)",
"build": {
"dockerfile": "Dockerfile",
"args": {
// Update 'VARIANT' to pick a .NET Core version: 3.1, 5.0, 6.0, 7.0
// Append -bullseye(-slim), -focal, or -jammy to pin to an OS version.
"VARIANT": "7.0.203-bullseye-slim-amd64"
"VARIANT": "8.0.100-preview.6-bookworm-slim-amd64"
}
},
"hostRequirements": {
Expand Down
4 changes: 2 additions & 2 deletions .vscode/settings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@
"csharp.suppressDotnetRestoreNotification": true,
"csharp.suppressHiddenDiagnostics": true,
"omnisharp.autoStart": false,
"omnisharp.defaultLaunchSolution": "FSharp.Compiler.Service.sln",
"omnisharp.enableMsBuildLoadProjectsOnDemand": true,
"omnisharp.disableMSBuildDiagnosticWarning": true,
"omnisharp.enableRoslynAnalyzers": false,
Expand All @@ -53,5 +52,6 @@
"front_matter_title": ""
}
},
"editor.inlayHints.enabled": "offUnlessPressed"
"editor.inlayHints.enabled": "offUnlessPressed",
"dotnet.defaultSolution": "FSharp.Compiler.Service.sln"
}
6 changes: 3 additions & 3 deletions eng/SourceBuildPrebuiltBaseline.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@
These will go away when repo updates targeting to net8.0
Tracked with https://github.com/dotnet/fsharp/issues/14765
-->
<UsagePattern IdentityGlob="Microsoft.AspNetCore.App.Ref/7.0.5" />
<UsagePattern IdentityGlob="Microsoft.NETCore.App.Host.linux-x64/7.0.5" />
<UsagePattern IdentityGlob="Microsoft.NETCore.App.Ref/7.0.5" />
<UsagePattern IdentityGlob="Microsoft.AspNetCore.App.Ref/7.0.8" />
<UsagePattern IdentityGlob="Microsoft.NETCore.App.Host.linux-x64/7.0.8" />
<UsagePattern IdentityGlob="Microsoft.NETCore.App.Ref/7.0.8" />
<UsagePattern IdentityGlob="System.Configuration.ConfigurationManager/7.0.0" />
<UsagePattern IdentityGlob="System.Diagnostics.EventLog/7.0.0" />
<UsagePattern IdentityGlob="System.Security.Cryptography.ProtectedData/7.0.0" />
Expand Down
8 changes: 3 additions & 5 deletions global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,14 @@
{
"sdk": {
"version": "8.0.100-preview.5.23303.2",
"version": "8.0.100-preview.6.23330.14",
"allowPrerelease": true,
"rollForward": "latestPatch"
},
"tools": {
"dotnet": "8.0.100-preview.5.23303.2",
"dotnet": "8.0.100-preview.6.23330.14",
"vs": {
"version": "17.6",
"components": [
"Microsoft.VisualStudio.Component.FSharp"
]
"components": ["Microsoft.VisualStudio.Component.FSharp"]
},
"xcopy-msbuild": "17.6.0-2"
},
Expand Down
4 changes: 4 additions & 0 deletions tests/fsharp/SDKTests/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
<Project>
<!-- empty to prevent directory crawling -->
<PropertyGroup>
<NuGetAudit>false</NuGetAudit>
</PropertyGroup>

</Project>