Skip to content

Commit baf8cc2

Browse files
grendellogrendello
committed
Merge branch 'main' into dev/grendel/blobs-in-lib
* main: Bump to dotnet/installer@5680e93cb2 9.0.100-preview.2.24073.12 (#8666) $(AndroidPackVersionSuffix)=preview.2; net9 is 34.99.0.preview.2 (#8678) [Xamarin.Android.Build.Tasks] fix net7.0 "out of support" message (#8660) [ci] Use NuGetAuthenticate@1 (#8676)
2 parents 30e7420 + 6d33103 commit baf8cc2

File tree

10 files changed

+25
-25
lines changed

10 files changed

+25
-25
lines changed

‎Directory.Build.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
* Bump first digit of the patch version for feature releases (and reset the first two digits to 0)
3737
-->
3838
<AndroidPackVersion>34.99.0</AndroidPackVersion>
39-
<AndroidPackVersionSuffix>preview.1</AndroidPackVersionSuffix>
39+
<AndroidPackVersionSuffix>preview.2</AndroidPackVersionSuffix>
4040
</PropertyGroup>
4141

4242
<!-- Common <PackageReference/> versions -->

‎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

‎eng/Version.Details.xml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
11
<Dependencies>
22
<ProductDependencies>
3-
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="9.0.100-alpha.1.24070.3">
3+
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="9.0.100-preview.2.24073.12">
44
<Uri>https://github.com/dotnet/installer</Uri>
5-
<Sha>f91d4ca399ea4389d04b4700965d207f3a8d5c3b</Sha>
5+
<Sha>5680e93cb251d7741e19f2d759f04141e9d95a93</Sha>
66
</Dependency>
7-
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="9.0.0-alpha.1.24066.33" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
7+
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="9.0.0-preview.2.24072.10" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
88
<Uri>https://github.com/dotnet/runtime</Uri>
9-
<Sha>dbb335c6ba14b38400b2d8c3a5876698021ec089</Sha>
9+
<Sha>e3547f1d3ac768a14a0598abf7868641ecf0c9d7</Sha>
1010
</Dependency>
11-
<Dependency Name="Microsoft.NETCore.App.Ref" Version="9.0.0-alpha.1.24066.33" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
11+
<Dependency Name="Microsoft.NETCore.App.Ref" Version="9.0.0-preview.2.24072.10" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
1212
<Uri>https://github.com/dotnet/runtime</Uri>
13-
<Sha>dbb335c6ba14b38400b2d8c3a5876698021ec089</Sha>
13+
<Sha>e3547f1d3ac768a14a0598abf7868641ecf0c9d7</Sha>
1414
</Dependency>
15-
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport" Version="9.0.0-alpha.1.24053.1" CoherentParentDependency="Microsoft.NETCore.App.Ref">
15+
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport" Version="9.0.0-alpha.1.24068.1" CoherentParentDependency="Microsoft.NETCore.App.Ref">
1616
<Uri>https://github.com/dotnet/emsdk</Uri>
17-
<Sha>5cda86493ac07dce11dcb04323d2b57eecff00b7</Sha>
17+
<Sha>fd99e59a43cfd6fe323c98ff267b620a67e71e67</Sha>
1818
</Dependency>
19-
<Dependency Name="Microsoft.DotNet.Cecil" Version="0.11.4-alpha.24052.1" CoherentParentDependency="Microsoft.NET.ILLink.Tasks">
19+
<Dependency Name="Microsoft.DotNet.Cecil" Version="0.11.4-alpha.24065.1" CoherentParentDependency="Microsoft.NET.ILLink.Tasks">
2020
<Uri>https://github.com/dotnet/cecil</Uri>
21-
<Sha>81facb3f6009be2cdce70df30452bb75e9a8f993</Sha>
21+
<Sha>b8c2293cd1cbd9d0fe6f32d7b5befbd526b5a175</Sha>
2222
</Dependency>
2323
</ProductDependencies>
2424
<ToolsetDependencies>

‎eng/Versions.props

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
<Project>
22
<!--Package versions-->
33
<PropertyGroup>
4-
<MicrosoftDotnetSdkInternalPackageVersion>9.0.100-alpha.1.24070.3</MicrosoftDotnetSdkInternalPackageVersion>
5-
<MicrosoftNETILLinkTasksPackageVersion>9.0.0-alpha.1.24066.33</MicrosoftNETILLinkTasksPackageVersion>
6-
<MicrosoftNETCoreAppRefPackageVersion>9.0.0-alpha.1.24066.33</MicrosoftNETCoreAppRefPackageVersion>
4+
<MicrosoftDotnetSdkInternalPackageVersion>9.0.100-preview.2.24073.12</MicrosoftDotnetSdkInternalPackageVersion>
5+
<MicrosoftNETILLinkTasksPackageVersion>9.0.0-preview.2.24072.10</MicrosoftNETILLinkTasksPackageVersion>
6+
<MicrosoftNETCoreAppRefPackageVersion>9.0.0-preview.2.24072.10</MicrosoftNETCoreAppRefPackageVersion>
77
<MicrosoftDotNetApiCompatPackageVersion>7.0.0-beta.22103.1</MicrosoftDotNetApiCompatPackageVersion>
88
<MicrosoftDotNetBuildTasksFeedPackageVersion>7.0.0-beta.22103.1</MicrosoftDotNetBuildTasksFeedPackageVersion>
9-
<MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportVersion>9.0.0-alpha.1.24053.1</MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportVersion>
9+
<MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportVersion>9.0.0-alpha.1.24068.1</MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportVersion>
1010
<MicrosoftNETWorkloadEmscriptenPackageVersion>$(MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportVersion)</MicrosoftNETWorkloadEmscriptenPackageVersion>
1111
<MicrosoftTemplateEngineTasksPackageVersion>7.0.100-rc.1.22410.7</MicrosoftTemplateEngineTasksPackageVersion>
12-
<MicrosoftDotNetCecilPackageVersion>0.11.4-alpha.24052.1</MicrosoftDotNetCecilPackageVersion>
12+
<MicrosoftDotNetCecilPackageVersion>0.11.4-alpha.24065.1</MicrosoftDotNetCecilPackageVersion>
1313
<SystemIOHashingPackageVersion>$(MicrosoftNETCoreAppRefPackageVersion)</SystemIOHashingPackageVersion>
1414
</PropertyGroup>
1515
<PropertyGroup>

‎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)