Skip to content

Commit b722e86

Browse files
Move from netcoreapp3.1 to net6.0
I believe this is a good idea anyway, but this should assist with: dotnet/android#7451 Which is hitting the error: error NU1102: Unable to find package Microsoft.NETCore.App.Host.osx-x64 with version (= 3.1.31) .NET Core 3.1.31 is not released yet and is likely on a private feed. Also pass `6.0.x` to the [`UseDotNet`][0] yaml task. [0]: https://learn.microsoft.com/azure/devops/pipelines/tasks/tool/dotnet-core-tool-installer
1 parent 0be567a commit b722e86

File tree

6 files changed

+6
-6
lines changed

6 files changed

+6
-6
lines changed

azure-pipelines.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ pr:
1212

1313
# Global variables
1414
variables:
15-
DotNetCoreVersion: 3.1.100
15+
DotNetCoreVersion: 6.0.x
1616

1717
jobs:
1818
- job: build

src/Microsoft.Android.Build.BaseTasks/Microsoft.Android.Build.BaseTasks.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<Import Project="MSBuildReferences.projitems" />
44

55
<PropertyGroup>
6-
<TargetFrameworks>netstandard2.0;netcoreapp3.1</TargetFrameworks>
6+
<TargetFrameworks>netstandard2.0;net6.0</TargetFrameworks>
77
<RootNamespace>Microsoft.Android.Build.Tasks</RootNamespace>
88
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
99
<SignAssembly>true</SignAssembly>

src/Xamarin.Android.Tools.AndroidSdk/Xamarin.Android.Tools.AndroidSdk.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>netstandard2.0;netcoreapp3.1</TargetFrameworks>
4+
<TargetFrameworks>netstandard2.0;net6.0</TargetFrameworks>
55
<LangVersion>8.0</LangVersion>
66
<Nullable>enable</Nullable>
77
<DefineConstants>INTERNAL_NULLABLE_ATTRIBUTES</DefineConstants>

tests/Microsoft.Android.Build.BaseTasks-Tests/Microsoft.Android.Build.BaseTasks-Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<!-- $(TargetFrameworks) is used to allow the $(TargetFramework) check in Directory.Build.props to work.
55
If $(TargetFramework) is declared here instead, it will not be evaluated before Directory.Build.props
66
is loaded and the wrong $(TestOutputFullPath) will be used. -->
7-
<TargetFrameworks>netcoreapp3.1</TargetFrameworks>
7+
<TargetFrameworks>net6.0</TargetFrameworks>
88
<RootNamespace>Microsoft.Android.Build.BaseTasks.Tests</RootNamespace>
99
<IsPackable>false</IsPackable>
1010
<OutputPath>$(TestOutputFullPath)</OutputPath>

tests/Xamarin.Android.Tools.AndroidSdk-Tests/Xamarin.Android.Tools.AndroidSdk-Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<!-- $(TargetFrameworks) is used to allow the $(TargetFramework) check in Directory.Build.props to work.
55
If $(TargetFramework) is declared here instead, it will not be evaluated before Directory.Build.props
66
is loaded and the wrong $(TestOutputFullPath) will be used. -->
7-
<TargetFrameworks>netcoreapp3.1</TargetFrameworks>
7+
<TargetFrameworks>net6.0</TargetFrameworks>
88
<SignAssembly>true</SignAssembly>
99
<AssemblyOriginatorKeyFile>..\..\product.snk</AssemblyOriginatorKeyFile>
1010
<IsPackable>false</IsPackable>

tools/ls-jdks/ls-jdks.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFrameworks>net472;netcoreapp3.1</TargetFrameworks>
5+
<TargetFrameworks>net472;net6.0</TargetFrameworks>
66
<RootNamespace>Xamarin.Android.Tools</RootNamespace>
77
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
88
<OutputPath>$(ToolOutputFullPath)</OutputPath>

0 commit comments

Comments
 (0)