Merge branch 'net8.0' into bump-main-in-net8.0-2023-05-19
This commit is contained in:
Rolf Bjarne Kvinge
GitHub
Коммит
48f22eb1ed
|
|
@ -125,7 +125,7 @@ endif
|
|||
##
|
||||
## Note that the prerelease identifier should be as short as possible, because otherwise
|
||||
## the resulting package name can become too long for MSIs.
|
||||
NUGET_HARDCODED_PRERELEASE_IDENTIFIER=net8-p5
|
||||
NUGET_HARDCODED_PRERELEASE_IDENTIFIER=net8-p6
|
||||
NUGET_HARDCODED_PRERELEASE_BRANCH=net8.0
|
||||
|
||||
# compute the alphanumeric version of branch names
|
||||
|
|
|
|||
|
|
@ -1,47 +1,47 @@
|
|||
<Dependencies>
|
||||
<ProductDependencies>
|
||||
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="8.0.100-preview.5.23267.7">
|
||||
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="8.0.100-preview.5.23273.15">
|
||||
<Uri>https://github.com/dotnet/installer</Uri>
|
||||
<Sha>dda516cbd77ab9dc3c6048a1893b4321cdcda195</Sha>
|
||||
<Sha>4b48b408f9b777eddd4e87f6b9efab4b5b1723a6</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="8.0.0-preview.5.23260.3" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
|
||||
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="8.0.0-preview.5.23272.14" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>888bac304442e1a6883cfb922d21a74df910112d</Sha>
|
||||
<Sha>8163d1643afe2c029c1783b5f92548e6dc6828ff</Sha>
|
||||
</Dependency>
|
||||
<!-- Set TRACKING_DOTNET_RUNTIME_SEPARATELY to something in Make.config if removing the CoherentParentDependency on Microsoft.Dotnet.Sdk.Internal -->
|
||||
<Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.0-preview.5.23260.3" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
|
||||
<Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.0-preview.5.23272.14" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>888bac304442e1a6883cfb922d21a74df910112d</Sha>
|
||||
<Sha>8163d1643afe2c029c1783b5f92548e6dc6828ff</Sha>
|
||||
</Dependency>
|
||||
<!-- This is required for our test apps to build; in some cases Microsoft.AspNetCore.App is pulled in, and when building test apps the build needs to be able to resolve that -->
|
||||
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="8.0.0-preview.5.23262.1" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
|
||||
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="8.0.0-preview.5.23273.2" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
|
||||
<Uri>https://github.com/dotnet/aspnetcore</Uri>
|
||||
<Sha>059939bda419646cb5e826df887f55b198963f6f</Sha>
|
||||
<Sha>39564d529f84f7a3bbac5b28ba11060e8ac30375</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport" Version="8.0.0-preview.5.23252.1" CoherentParentDependency="Microsoft.NETCore.App.Ref">
|
||||
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport" Version="8.0.0-preview.5.23265.1" CoherentParentDependency="Microsoft.NETCore.App.Ref">
|
||||
<Uri>https://github.com/dotnet/emsdk</Uri>
|
||||
<Sha>ab09b0b8d6768d58e09c033beea1570d4ca74c1f</Sha>
|
||||
<Sha>7a90ec9edc7bad6f54ee57a4ab10787c1b989a54</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.Cecil" Version="0.11.4-alpha.23252.1" CoherentParentDependency="Microsoft.NETCore.App.Ref">
|
||||
<Dependency Name="Microsoft.DotNet.Cecil" Version="0.11.4-alpha.23265.2" CoherentParentDependency="Microsoft.NETCore.App.Ref">
|
||||
<Uri>https://github.com/dotnet/cecil</Uri>
|
||||
<Sha>c32f0be86d4e72dfc0967ef08913889cfdbc8dc4</Sha>
|
||||
<Sha>f283c6229347f2dc3a25b04f6611014d8871d0b0</Sha>
|
||||
</Dependency>
|
||||
<!-- This is a subscription of the .NET 7 versions of our packages -->
|
||||
<Dependency Name="Microsoft.MacCatalyst.Sdk" Version="16.4.7060">
|
||||
<Dependency Name="Microsoft.MacCatalyst.Sdk" Version="16.4.7062">
|
||||
<Uri>https://github.com/xamarin/xamarin-macios</Uri>
|
||||
<Sha>edd059428ce051ae1a7d4092978e0c3ec6c7697d</Sha>
|
||||
<Sha>8587acbf77b76933b7099c4a126ee9904d2ae934</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.macOS.Sdk" Version="13.3.7060">
|
||||
<Dependency Name="Microsoft.macOS.Sdk" Version="13.3.7062">
|
||||
<Uri>https://github.com/xamarin/xamarin-macios</Uri>
|
||||
<Sha>edd059428ce051ae1a7d4092978e0c3ec6c7697d</Sha>
|
||||
<Sha>8587acbf77b76933b7099c4a126ee9904d2ae934</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.iOS.Sdk" Version="16.4.7060">
|
||||
<Dependency Name="Microsoft.iOS.Sdk" Version="16.4.7062">
|
||||
<Uri>https://github.com/xamarin/xamarin-macios</Uri>
|
||||
<Sha>edd059428ce051ae1a7d4092978e0c3ec6c7697d</Sha>
|
||||
<Sha>8587acbf77b76933b7099c4a126ee9904d2ae934</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.tvOS.Sdk" Version="16.4.7060">
|
||||
<Dependency Name="Microsoft.tvOS.Sdk" Version="16.4.7062">
|
||||
<Uri>https://github.com/xamarin/xamarin-macios</Uri>
|
||||
<Sha>edd059428ce051ae1a7d4092978e0c3ec6c7697d</Sha>
|
||||
<Sha>8587acbf77b76933b7099c4a126ee9904d2ae934</Sha>
|
||||
</Dependency>
|
||||
</ProductDependencies>
|
||||
<ToolsetDependencies>
|
||||
|
|
|
|||
|
|
@ -2,21 +2,21 @@
|
|||
<!--Package versions-->
|
||||
<PropertyGroup>
|
||||
<!-- Versions updated by maestro -->
|
||||
<MicrosoftDotnetSdkInternalPackageVersion>8.0.100-preview.5.23267.7</MicrosoftDotnetSdkInternalPackageVersion>
|
||||
<MicrosoftNETILLinkTasksPackageVersion>8.0.0-preview.5.23260.3</MicrosoftNETILLinkTasksPackageVersion>
|
||||
<MicrosoftDotnetSdkInternalPackageVersion>8.0.100-preview.5.23273.15</MicrosoftDotnetSdkInternalPackageVersion>
|
||||
<MicrosoftNETILLinkTasksPackageVersion>8.0.0-preview.5.23272.14</MicrosoftNETILLinkTasksPackageVersion>
|
||||
<MicrosoftDotNetBuildTasksFeedPackageVersion>6.0.0-beta.21212.6</MicrosoftDotNetBuildTasksFeedPackageVersion>
|
||||
<MicrosoftNETILStripTasksPackageVersion>6.0.0-rc.2.21468.3</MicrosoftNETILStripTasksPackageVersion>
|
||||
<MicrosoftNETCoreAppRefPackageVersion>8.0.0-preview.5.23260.3</MicrosoftNETCoreAppRefPackageVersion>
|
||||
<MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion>8.0.0-preview.5.23252.1</MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion>
|
||||
<MicrosoftNETCoreAppRefPackageVersion>8.0.0-preview.5.23272.14</MicrosoftNETCoreAppRefPackageVersion>
|
||||
<MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion>8.0.0-preview.5.23265.1</MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion>
|
||||
<MicrosoftTemplateEngineTasksVersion>7.0.100-alpha.1.21601.1</MicrosoftTemplateEngineTasksVersion>
|
||||
<MicrosoftDotNetCecilPackageVersion>0.11.4-alpha.23252.1</MicrosoftDotNetCecilPackageVersion>
|
||||
<MicrosoftDotNetCecilPackageVersion>0.11.4-alpha.23265.2</MicrosoftDotNetCecilPackageVersion>
|
||||
<!-- Manually updated versions -->
|
||||
<Emscriptennet7WorkloadVersion>$(MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion)</Emscriptennet7WorkloadVersion>
|
||||
<EmscriptenWorkloadVersion>$(MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion)</EmscriptenWorkloadVersion>
|
||||
<!-- This is a subscription of the .NET 7 versions of our packages -->
|
||||
<MicrosoftMacCatalystSdkPackageVersion>16.4.7060</MicrosoftMacCatalystSdkPackageVersion>
|
||||
<MicrosoftmacOSSdkPackageVersion>13.3.7060</MicrosoftmacOSSdkPackageVersion>
|
||||
<MicrosoftiOSSdkPackageVersion>16.4.7060</MicrosoftiOSSdkPackageVersion>
|
||||
<MicrosofttvOSSdkPackageVersion>16.4.7060</MicrosofttvOSSdkPackageVersion>
|
||||
<MicrosoftMacCatalystSdkPackageVersion>16.4.7062</MicrosoftMacCatalystSdkPackageVersion>
|
||||
<MicrosoftmacOSSdkPackageVersion>13.3.7062</MicrosoftmacOSSdkPackageVersion>
|
||||
<MicrosoftiOSSdkPackageVersion>16.4.7062</MicrosoftiOSSdkPackageVersion>
|
||||
<MicrosofttvOSSdkPackageVersion>16.4.7062</MicrosofttvOSSdkPackageVersion>
|
||||
</PropertyGroup>
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
"sdk": {
|
||||
"version": "8.0.100-preview.5.23267.7"
|
||||
"version": "8.0.100-preview.5.23273.15"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -496,7 +496,7 @@ namespace Xamarin.Tests {
|
|||
[Test]
|
||||
[TestCase (ApplePlatform.iOS, "win10-x86", null)]
|
||||
[TestCase (ApplePlatform.TVOS, "win10-x64", null)]
|
||||
[TestCase (ApplePlatform.MacOSX, "win10-arm", null)]
|
||||
[TestCase (ApplePlatform.MacOSX, "win10-arm64", null)]
|
||||
[TestCase (ApplePlatform.MacCatalyst, "win10-arm64", "Unable to find package Microsoft.NETCore.App.Runtime.Mono.win-arm64. No packages exist with this id in source[(]s[)]:.*")]
|
||||
public void InvalidRuntimeIdentifier_Restore (ApplePlatform platform, string runtimeIdentifier, string? failureMessagePattern)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -154,10 +154,12 @@ steps:
|
|||
|
||||
- bash: |
|
||||
set -ex
|
||||
ls -Rla $(Build.SourcesDirectory)/artifacts/tmp
|
||||
ls -Rla@ $(Build.SourcesDirectory)/artifacts/tmp
|
||||
xattr -s -c -r $(Build.SourcesDirectory)/artifacts/tmp/${{ parameters.uploadPrefix }}mac-test-package/mac-test-package.7z
|
||||
7z x $(Build.SourcesDirectory)/artifacts/tmp/${{ parameters.uploadPrefix }}mac-test-package/mac-test-package.7z -o$(Build.SourcesDirectory)/artifacts/ -bb1
|
||||
# no prefix! we did expand to the exact name we are using
|
||||
ls -Rla $(Build.SourcesDirectory)/artifacts/mac-test-package
|
||||
xattr -s -c -r $(Build.SourcesDirectory)/artifacts/mac-test-package
|
||||
ls -Rla@ $(Build.SourcesDirectory)/artifacts/mac-test-package
|
||||
displayName: Expand tests.
|
||||
|
||||
- bash: |
|
||||
|
|
|
|||
|
|
@ -116,8 +116,11 @@ steps:
|
|||
|
||||
# expand all the prebuilt test dependencies
|
||||
- bash: |
|
||||
ls -Rla $(Build.SourcesDirectory)/artifacts/tmp
|
||||
ls -Rla@ $(Build.SourcesDirectory)/artifacts/tmp
|
||||
xattr -s -c -r $(Build.SourcesDirectory)/artifacts/tmp/${{ parameters.uploadPrefix }}package-test-libraries/package-test-libraries.zip
|
||||
unzip -o $(Build.SourcesDirectory)/artifacts/tmp/${{ parameters.uploadPrefix }}package-test-libraries/package-test-libraries.zip -d .
|
||||
ls -Rla@ .
|
||||
xattr -s -c -r .
|
||||
workingDirectory: $(System.DefaultWorkingDirectory)/xamarin-macios
|
||||
displayName: Expand test libraries.
|
||||
timeoutInMinutes: 10
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче