Skip to content

Commit 92b178b

Browse files
jonathanpeppersjonathanpeppers
committed
Bump to .NET 8
Changes: dotnet/installer@11f6b8f...d552037 Changes: dotnet/linker@5f9bfd9...493ce62 Changes: dotnet/runtime@6d10e4c...b8d4980
1 parent 2c7d72d commit 92b178b

File tree

19 files changed

+67
-47
lines changed

19 files changed

+67
-47
lines changed

‎Directory.Build.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<DotNetTargetFramework>net$(DotNetTargetFrameworkVersion)</DotNetTargetFramework>
66
<DotNetAndroidTargetFramework>$(DotNetTargetFramework)-android</DotNetAndroidTargetFramework>
77
<!-- Used for bootstrap, command-line tooling, and desktop NUnit projects -->
8-
<DotNetStableTargetFramework>net6.0</DotNetStableTargetFramework>
8+
<DotNetStableTargetFramework>net7.0</DotNetStableTargetFramework>
99
<TargetFrameworkNETStandard>netstandard2.0</TargetFrameworkNETStandard>
1010
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
1111
<BuildOutputDirectory>$(MSBuildThisFileDirectory)bin\$(Configuration)\</BuildOutputDirectory>

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ RUNTIME := $(shell which mono64 2> /dev/null && echo mono64 || echo mono)
77
SOLUTION = Xamarin.Android.sln
88
TEST_TARGETS = build-tools/scripts/RunTests.targets
99
API_LEVEL ?=
10-
PREPARE_NET_FX = net6.0
10+
PREPARE_NET_FX = net7.0
1111
PREPARE_ARGS =
1212
PREPARE_PROJECT = build-tools/xaprepare/xaprepare/xaprepare.csproj
1313
PREPARE_MSBUILD_FLAGS = $(PREPARE_MSBUILD_ARGS) $(MSBUILD_ARGS)

‎NuGet.config‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@
55
<!-- ensure only the sources defined below are used -->
66
<add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" protocolVersion="3" />
77
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" protocolVersion="3" />
8-
<add key="dotnet7" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet7/nuget/v3/index.json" />
8+
<add key="dotnet8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8/nuget/v3/index.json" />
99
<!-- This is needed (currently) for the Xamarin.Android.Deploy.Installer dependency, getting the installer -->
1010
<!-- Android binary, to support delta APK install -->
1111
<add key="xamarin.android util" value="https://pkgs.dev.azure.com/xamarin/public/_packaging/Xamarin.Android/nuget/v3/index.json" />
12-
<!-- Added manually for dotnet/runtime 6.0.9 -->
13-
<add key="darc-pub-dotnet-emsdk-3f6c45a" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-3f6c45a2/nuget/v3/index.json" />
14-
<add key="darc-pub-dotnet-runtime-8c6bcad" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-8c6bcad1/nuget/v3/index.json" />
12+
<!-- Added manually for dotnet/runtime 6.0.11 -->
13+
<add key="darc-pub-dotnet-emsdk-c3fc739" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-c3fc739c/nuget/v3/index.json" />
14+
<add key="darc-pub-dotnet-runtime-1e1f688" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-1e1f688d/nuget/v3/index.json" />
1515
</packageSources>
1616
<disabledPackageSources />
1717
</configuration>

‎build-tools/automation/yaml-templates/use-dot-net.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ steps:
3737
$sleepTime = $sleepTime * 2
3838
}
3939
}
40-
& .\dotnet-install.ps1 -Version ${{ parameters.version }} -InstallDir $DotNetRoot -Verbose
40+
& .\dotnet-install.ps1 -Channel ${{ parameters.version }} -Quality preview -InstallDir $DotNetRoot -Verbose
4141
displayName: install .NET Core ${{ parameters.version }}
4242
condition: and(succeeded(), eq(variables['Agent.OS'], 'Windows_NT'))
4343
@@ -46,7 +46,7 @@ steps:
4646
(if [[ "${{ parameters.remove_dotnet }}" == "true" ]] ; then rm -rfv $DOTNET_ROOT; fi) &&
4747
curl -L https://dot.net/v1/dotnet-install.sh --retry 5 --retry-max-time 300 > dotnet-install.sh &&
4848
chmod +x dotnet-install.sh &&
49-
./dotnet-install.sh --version ${{ parameters.version }} --install-dir $DOTNET_ROOT --verbose &&
49+
./dotnet-install.sh --channel ${{ parameters.version }} --quality preview --install-dir $DOTNET_ROOT --verbose &&
5050
PATH="$DOTNET_ROOT:$PATH" &&
5151
echo "##vso[task.setvariable variable=DOTNET_ROOT]$DOTNET_ROOT" &&
5252
echo "##vso[task.setvariable variable=PATH]$PATH"

‎build-tools/automation/yaml-templates/variables.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ variables:
1818
- name: NUnit.NumberOfTestWorkers
1919
value: 4
2020
- name: DotNetSdkVersion
21-
value: 6.0.300
21+
value: 7.0.1xx
2222
- name: GitHub.Token
2323
value: $(github--pat--vs-mobiletools-engineering-service2)
2424
- name: HostedMacImage
@@ -32,9 +32,9 @@ variables:
3232
- name: TeamName
3333
value: XamarinAndroid
3434
- name: DotNetTargetFramework
35-
value: net7.0
35+
value: net8.0
3636
- name: DotNetStableTargetFramework
37-
value: net6.0
37+
value: net7.0
3838
# Workaround: https://devdiv.visualstudio.com/DevDiv/_workitems/edit/1585820
3939
- name: _WriteTelemetryProperties
4040
value: false

‎build-tools/xaprepare/xaprepare/ConfigAndData/Configurables.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -329,15 +329,15 @@ public static partial class Paths
329329

330330
public static string MicrosoftNETWorkloadMonoPackageDir => Path.Combine (
331331
XAPackagesDir,
332-
$"microsoft.net.workload.mono.toolchain.{{0}}.manifest-{ctx.Properties.GetRequiredValue (KnownProperties.DotNetMonoManifestVersionBand)}",
332+
$"microsoft.net.workload.mono.toolchain{{0}}.manifest-{ctx.Properties.GetRequiredValue (KnownProperties.DotNetMonoManifestVersionBand)}",
333333
ctx.Properties.GetRequiredValue (KnownProperties.MicrosoftNETCoreAppRefPackageVersion)
334334
);
335335

336336
public static string MicrosoftNETWorkloadMonoToolChainDir => Path.Combine (MicrosoftNETWorkloadMonoPackageDir, "data");
337337

338338
public static string MicrosoftNETWorkloadEmscriptenPackageDir => Path.Combine (
339339
XAPackagesDir,
340-
$"microsoft.net.workload.emscripten.{{0}}.manifest-{ctx.Properties.GetRequiredValue (KnownProperties.DotNetEmscriptenManifestVersionBand)}",
340+
$"microsoft.net.workload.emscripten{{0}}.manifest-{ctx.Properties.GetRequiredValue (KnownProperties.DotNetEmscriptenManifestVersionBand)}",
341341
ctx.Properties.GetRequiredValue (KnownProperties.MicrosoftNETWorkloadEmscriptenPackageVersion)
342342
);
343343

‎build-tools/xaprepare/xaprepare/Steps/Step_InstallDotNetPreview.cs‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -49,15 +49,18 @@ protected override async Task<bool> Execute (Context context)
4949
var sdk_manifests = Path.Combine (dotnetPath, "sdk-manifests", context.Properties.GetRequiredValue (KnownProperties.DotNetSdkManifestsFolder));
5050

5151
// Copy the WorkloadManifest.* files from the latest Microsoft.NET.Workload.* listed in package-download.proj
52-
var dotnets = new [] { "net6", "net7" };
52+
// NOTE: the packages that actually *exist* in .NET 8 are mismatched right now...
53+
var dotnets = new [] { ".net6", ".net7", "" };
5354
foreach (var dotnet in dotnets) {
54-
var destination = Path.Combine (sdk_manifests, $"microsoft.net.workload.mono.toolchain.{dotnet}");
55+
var destination = Path.Combine (sdk_manifests, $"microsoft.net.workload.mono.toolchain{dotnet}");
5556
foreach (var file in Directory.GetFiles (string.Format (Configurables.Paths.MicrosoftNETWorkloadMonoToolChainDir, dotnet), "WorkloadManifest.*")) {
5657
Utilities.CopyFileToDir (file, destination);
5758
}
58-
destination = Path.Combine (sdk_manifests, $"microsoft.net.workload.emscripten.{dotnet}");
59-
foreach (var file in Directory.GetFiles (string.Format (Configurables.Paths.MicrosoftNETWorkloadEmscriptenDir, dotnet), "WorkloadManifest.*")) {
60-
Utilities.CopyFileToDir (file, destination);
59+
if (dotnet != "") {
60+
destination = Path.Combine (sdk_manifests, $"microsoft.net.workload.emscripten{dotnet}");
61+
foreach (var file in Directory.GetFiles (string.Format (Configurables.Paths.MicrosoftNETWorkloadEmscriptenDir, dotnet), "WorkloadManifest.*")) {
62+
Utilities.CopyFileToDir (file, destination);
63+
}
6164
}
6265
}
6366

‎build-tools/xaprepare/xaprepare/package-download.proj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ Otherwise, $(MicrosoftNETCoreAppRefPackageVersion) from eng/Versions.props will
2020
<PackageDownload Include="Microsoft.NETCore.App.Runtime.Mono.android-arm64" Version="[$(DotNetRuntimePacksVersion)]" />
2121
<PackageDownload Include="Microsoft.NETCore.App.Runtime.Mono.android-x86" Version="[$(DotNetRuntimePacksVersion)]" />
2222
<PackageDownload Include="Microsoft.NETCore.App.Runtime.Mono.android-x64" Version="[$(DotNetRuntimePacksVersion)]" />
23+
<PackageDownload Include="Microsoft.NET.Workload.Mono.ToolChain.Manifest-$(DotNetMonoManifestVersionBand)" Version="[$(DotNetRuntimePacksVersion)]" />
2324
<PackageDownload Include="Microsoft.NET.Workload.Mono.ToolChain.net6.Manifest-$(DotNetMonoManifestVersionBand)" Version="[$(DotNetRuntimePacksVersion)]" />
2425
<PackageDownload Include="Microsoft.NET.Workload.Mono.ToolChain.net7.Manifest-$(DotNetMonoManifestVersionBand)" Version="[$(DotNetRuntimePacksVersion)]" />
2526
<PackageDownload Include="Microsoft.NET.Workload.Emscripten.net6.Manifest-$(DotNetEmscriptenManifestVersionBand)" Version="[$(MicrosoftNETWorkloadEmscriptenPackageVersion)]" />

‎eng/Version.Details.xml‎

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,20 @@
11
<Dependencies>
22
<ProductDependencies>
3-
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="7.0.100-rc.2.22459.2">
3+
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="8.0.100-alpha.1.22504.22">
44
<Uri>https://github.com/dotnet/installer</Uri>
5-
<Sha>11f6b8f7129e34d5317f47ccbc110b2b11c05749</Sha>
5+
<Sha>d552037815b75e01be05b6e8d269d54413363e7f</Sha>
66
</Dependency>
7-
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="7.0.100-1.22452.1" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
7+
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="7.0.100-1.22477.2" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
88
<Uri>https://github.com/dotnet/linker</Uri>
9-
<Sha>5f9bfd94d9c687207872ae03f751ea19704381c0</Sha>
9+
<Sha>493ce626f3278b2d0fd883330bf11a64254981bb</Sha>
1010
</Dependency>
11-
<Dependency Name="Microsoft.NETCore.App.Ref" Version="7.0.0-rc.2.22451.11" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
11+
<Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.0-alpha.1.22502.5" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
1212
<Uri>https://github.com/dotnet/runtime</Uri>
13-
<Sha>6d10e4c8bcd9f96ccd73748ff827561afa09af57</Sha>
13+
<Sha>b8d49801fe03b96d2fead3d97a11dce1e723dd17</Sha>
1414
</Dependency>
15-
<Dependency Name="Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100" Version="7.0.0-rc.2.22430.5" CoherentParentDependency="Microsoft.NETCore.App.Ref">
15+
<Dependency Name="Microsoft.NET.Workload.Emscripten.net7.Manifest-8.0.100" Version="8.0.0-alpha.1.22476.1" CoherentParentDependency="Microsoft.NETCore.App.Ref">
1616
<Uri>https://github.com/dotnet/emsdk</Uri>
17-
<Sha>8d8d2122b16c81df4b158fe43995f958e8fe115e</Sha>
18-
</Dependency>
19-
<Dependency Name="Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100" Version="7.0.0-rc.2.22430.5" CoherentParentDependency="Microsoft.NETCore.App.Ref">
20-
<Uri>https://github.com/dotnet/emsdk</Uri>
21-
<Sha>8d8d2122b16c81df4b158fe43995f958e8fe115e</Sha>
17+
<Sha>19cb1b2e025215a640d942b180b7cd691975d053</Sha>
2218
</Dependency>
2319
</ProductDependencies>
2420
<ToolsetDependencies>

‎eng/Versions.props‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<Project>
22
<!--Package versions-->
33
<PropertyGroup>
4-
<MicrosoftDotnetSdkInternalPackageVersion>7.0.100-rc.2.22459.2</MicrosoftDotnetSdkInternalPackageVersion>
5-
<MicrosoftNETILLinkTasksPackageVersion>7.0.100-1.22452.1</MicrosoftNETILLinkTasksPackageVersion>
6-
<MicrosoftNETCoreAppRefPackageVersion>7.0.0-rc.2.22451.11</MicrosoftNETCoreAppRefPackageVersion>
4+
<MicrosoftDotnetSdkInternalPackageVersion>8.0.100-alpha.1.22504.22</MicrosoftDotnetSdkInternalPackageVersion>
5+
<MicrosoftNETILLinkTasksPackageVersion>7.0.100-1.22477.2</MicrosoftNETILLinkTasksPackageVersion>
6+
<MicrosoftNETCoreAppRefPackageVersion>8.0.0-alpha.1.22502.5</MicrosoftNETCoreAppRefPackageVersion>
77
<MicrosoftDotNetApiCompatPackageVersion>7.0.0-beta.22103.1</MicrosoftDotNetApiCompatPackageVersion>
88
<MicrosoftDotNetBuildTasksFeedPackageVersion>7.0.0-beta.22103.1</MicrosoftDotNetBuildTasksFeedPackageVersion>
9-
<MicrosoftNETWorkloadEmscriptennet7Manifest70100Version>7.0.0-rc.2.22430.5</MicrosoftNETWorkloadEmscriptennet7Manifest70100Version>
10-
<MicrosoftNETWorkloadEmscriptenPackageVersion>$(MicrosoftNETWorkloadEmscriptennet7Manifest70100Version)</MicrosoftNETWorkloadEmscriptenPackageVersion>
9+
<MicrosoftNETWorkloadEmscriptennet7Manifest80100Version>8.0.0-alpha.1.22476.1</MicrosoftNETWorkloadEmscriptennet7Manifest80100Version>
10+
<MicrosoftNETWorkloadEmscriptenPackageVersion>$(MicrosoftNETWorkloadEmscriptennet7Manifest80100Version)</MicrosoftNETWorkloadEmscriptenPackageVersion>
1111
<MicrosoftTemplateEngineTasksPackageVersion>7.0.100-rc.1.22410.7</MicrosoftTemplateEngineTasksPackageVersion>
1212
</PropertyGroup>
1313
<PropertyGroup>

0 commit comments

Comments
 (0)