Skip to content

Dogfood .NET6 SDK & use native SDK for Apple Silicon native builds (WIP) #47245

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

Closed
sdmaclea wants to merge 3 commits into from
Closed

Dogfood .NET6 SDK & use native SDK for Apple Silicon native builds (WIP) #47245

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
af8b4fb
Fixup dotnet-install.sh arch detection
sdmaclea Jan 20, 2021
700b9ec
Build with 6.0.100-preview.1.21103.13
sdmaclea Jan 20, 2021
276a950
change targetplatformVersion to 1.0
Anipik Feb 11, 2021
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
4 changes: 2 additions & 2 deletions Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@
<!-- The TFMs to build and test against. -->
<PropertyGroup>
<NetCoreAppCurrentVersion>$(MajorVersion).$(MinorVersion)</NetCoreAppCurrentVersion>
<AspNetCoreAppCurrentVersion>5.0</AspNetCoreAppCurrentVersion>
<NetCoreAppToolCurrentVersion>5.0</NetCoreAppToolCurrentVersion>
<AspNetCoreAppCurrentVersion>6.0</AspNetCoreAppCurrentVersion>
<NetCoreAppToolCurrentVersion>6.0</NetCoreAppToolCurrentVersion>
<NetCoreAppCurrentIdentifier>.NETCoreApp</NetCoreAppCurrentIdentifier>
<NetCoreAppCurrentTargetFrameworkMoniker>$(NetCoreAppCurrentIdentifier),Version=v$(NetCoreAppCurrentVersion)</NetCoreAppCurrentTargetFrameworkMoniker>
<NetCoreAppCurrent>net$(NetCoreAppCurrentVersion)</NetCoreAppCurrent>
Expand Down
2 changes: 1 addition & 1 deletion eng/common/dotnet-install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ if [[ "$cpuname" == "unknown" ]]; then
fi

case $cpuname in
aarch64)
aarch64|arm64)

@sdmaclea sdmaclea Jan 21, 2021

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is dotnet/install-scripts#129

buildarch=arm64
;;
amd64|x86_64)
Expand Down
2 changes: 1 addition & 1 deletion eng/targetframeworksuffix.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

<PropertyGroup Condition="'$(TargetFrameworkSuffix)' != '' and '$(TargetFrameworkSuffix)' != 'windows'">
<TargetPlatformIdentifier>$(TargetFrameworkSuffix)</TargetPlatformIdentifier>
<TargetPlatformVersion>0.0</TargetPlatformVersion>
<TargetPlatformVersion>1.0</TargetPlatformVersion>
<TargetPlatformMoniker>$(TargetFrameworkSuffix),Version=$(TargetPlatformVersion)</TargetPlatformMoniker>
</PropertyGroup>

Expand Down
4 changes: 2 additions & 2 deletions global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"sdk": {
"version": "5.0.100",
"version": "6.0.100-preview.1.21103.13",
"allowPrerelease": true,
"rollForward": "major"
},
"tools": {
"dotnet": "5.0.100"
"dotnet": "6.0.100-preview.1.21103.13"
},
"native-tools": {
"cmake": "3.16.4",
Expand Down