Skip to content

Commit fb17eec

Browse files
committed
Merge branch 'main' into dev/grendel/cpp-tweaks
* main: [Xamarin.Android.Build.Tasks] fix net7.0 "out of support" message (#8660) [ci] Use NuGetAuthenticate@1 (#8676)
2 parents 0939db2 + cf1418d commit fb17eec

File tree

7 files changed

+9
-9
lines changed

7 files changed

+9
-9
lines changed

build-tools/automation/azure-pipelines-apidocs.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ stages:
9393

9494
- template: yaml-templates/use-dot-net.yaml
9595

96-
- task: NuGetAuthenticate@0
96+
- task: NuGetAuthenticate@1
9797
displayName: authenticate with azure artifacts
9898
inputs:
9999
forceReinstallCredentialProvider: true

build-tools/automation/azure-pipelines.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -344,7 +344,7 @@ stages:
344344
updateMono: false
345345
androidSdkPlatforms: 23,24,25,26,27,28,29,30,31,32,33,$(DefaultTestSdkPlatforms)
346346

347-
- task: NuGetAuthenticate@0
347+
- task: NuGetAuthenticate@1
348348
displayName: authenticate with azure artifacts
349349
inputs:
350350
forceReinstallCredentialProvider: true

build-tools/automation/yaml-templates/build-linux.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ stages:
6161
workingDirectory: $(System.DefaultWorkingDirectory)/xamarin-android
6262
displayName: make prepare-external-git-dependencies
6363

64-
- task: NuGetAuthenticate@0
64+
- task: NuGetAuthenticate@1
6565
displayName: authenticate with azure artifacts
6666
inputs:
6767
forceReinstallCredentialProvider: true

build-tools/automation/yaml-templates/commercial-build.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ steps:
1414
parameters:
1515
remove_dotnet: true
1616

17-
- task: NuGetAuthenticate@0
17+
- task: NuGetAuthenticate@1
1818
displayName: authenticate with azure artifacts
1919
inputs:
2020
forceReinstallCredentialProvider: true

build-tools/automation/yaml-templates/install-microbuild-tooling.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ parameters:
33
condition: succeeded()
44

55
steps:
6-
- task: NuGetAuthenticate@0
6+
- task: NuGetAuthenticate@1
77
displayName: authenticate with azure artifacts
88
inputs:
99
forceReinstallCredentialProvider: true

src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/Sdk/Eol.targets

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ Things to note:
2828
</PropertyGroup>
2929
<ItemGroup>
3030
<SdkSupportedTargetPlatformVersion Include="21.0" />
31-
<EolWorkload Include="net6.0-android" Url="https://aka.ms/maui-support-policy" />
31+
<EolWorkload Include="net$(TargetFrameworkVersion.TrimStart('vV'))-android" Url="https://aka.ms/maui-support-policy" />
3232
</ItemGroup>
3333
<Target Name="_ClearMissingWorkloads">
3434
<!--

src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/InvalidConfigTests.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,16 +58,16 @@ public void SettingCombinations (bool isRelease, bool useInterpreter, bool publi
5858
}
5959

6060
[Test]
61-
public void EolFrameworks()
61+
public void EolFrameworks ([Values ("net6.0-android", "net7.0-android")] string targetFramework)
6262
{
6363
var library = new XamarinAndroidLibraryProject () {
64-
TargetFramework = "net6.0-android",
64+
TargetFramework = targetFramework,
6565
EnableDefaultItems = true,
6666
};
6767
var builder = CreateApkBuilder ();
6868
builder.ThrowOnBuildFailure = false;
6969
Assert.IsFalse (builder.Restore (library), $"{library.ProjectName} restore should fail");
70-
Assert.IsTrue (StringAssertEx.ContainsText (builder.LastBuildOutput, "NETSDK1202"), $"{builder.BuildLogFile} should have NETSDK1202.");
70+
Assert.IsTrue (StringAssertEx.ContainsText (builder.LastBuildOutput, $"NETSDK1202: The workload '{targetFramework}' is out of support"), $"{builder.BuildLogFile} should have NETSDK1202.");
7171
}
7272

7373
[Test]

0 commit comments

Comments
 (0)