Skip to content

Commit

Permalink
Merge branch 'main' into blazor-hang
Browse files Browse the repository at this point in the history
* main:
  Bump to xamarin/Java.Interop/main@07d5595 (dotnet#7988)
  [ci] Use hosted Linux build pool for PR builds (dotnet#7976)
  Bump to dotnet/installer@f876fb51a4 8.0.100-preview.4.23224.14 (dotnet#7979)
  • Loading branch information
grendello committed Apr 27, 2023
2 parents b68b512 + 42a57a1 commit 7eb75e3
Show file tree
Hide file tree
Showing 5 changed files with 31 additions and 19 deletions.
11 changes: 10 additions & 1 deletion build-tools/automation/azure-pipelines.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -71,13 +71,21 @@ variables:
value: Azure Pipelines
- name: MacBuildPoolImage
value: internal-macos12
- name: LinuxBuildPoolName
value: android-devdiv-ubuntu-vmss
- name: LinuxBuildPoolImage
value: ''
- ${{ if or(and(ne(variables['Build.DefinitionName'],'Xamarin.Android'), ne(variables['Build.DefinitionName'], 'Xamarin.Android-Private')), eq(variables['Build.Reason'], 'PullRequest')) }}:
- name: MicroBuildSignType
value: Test
- name: MacBuildPoolName
value: VSEng-Xamarin-RedmondMac-Android-Untrusted
- name: MacBuildPoolImage
value: ''
- name: LinuxBuildPoolName
value: Azure Pipelines
- name: LinuxBuildPoolImage
value: ubuntu-22.04
- name: DisablePipelineConfigDetector
value: true

Expand Down Expand Up @@ -277,7 +285,8 @@ stages:
# Check - "Xamarin.Android (Linux > Tests > MSBuild)"
- job: linux_tests_smoke
displayName: Linux > Tests > MSBuild
pool: android-devdiv-ubuntu-vmss
pool:
vmImage: ubuntu-22.04
timeoutInMinutes: 180
workspace:
clean: all
Expand Down
7 changes: 5 additions & 2 deletions build-tools/automation/yaml-templates/build-linux.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
parameters:
buildPool: android-devdiv-ubuntu-vmss
buildPoolName: $(LinuxBuildPoolName)
buildPoolImage: $(LinuxBuildPoolImage)
buildResultArtifactName: Build Results - Linux
checkoutCommit: ''
checkoutPath: 's/xamarin-android'
Expand All @@ -22,7 +23,9 @@ stages:
jobs:
- job: ${{ parameters.jobName }}
displayName: ${{ parameters.jobDisplayName }}
pool: ${{ parameters.buildPool }}
pool:
name: ${{ parameters.buildPoolName }}
vmImage: ${{ parameters.buildPoolImage }}
timeoutInMinutes: 180
workspace:
clean: all
Expand Down
20 changes: 10 additions & 10 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
<Dependencies>
<ProductDependencies>
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="8.0.100-preview.4.23218.1">
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="8.0.100-preview.4.23224.14">
<Uri>https://github.com/dotnet/installer</Uri>
<Sha>16c10f8115bff3fba5c74497fe135fd62c6f19d4</Sha>
<Sha>f876fb51a4fb6bc4b8db13d05e88e846ae1dad21</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="8.0.0-preview.4.23210.1" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="8.0.0-preview.4.23221.1" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>053e17a0daf4be907db34d64fc51bc133c284fae</Sha>
<Sha>ab2b80d06dd4d997df5ffa72a3c4a99cb36ccbff</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.0-preview.4.23210.1" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.0-preview.4.23221.1" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>053e17a0daf4be907db34d64fc51bc133c284fae</Sha>
<Sha>ab2b80d06dd4d997df5ffa72a3c4a99cb36ccbff</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport" Version="8.0.0-preview.4.23170.1" CoherentParentDependency="Microsoft.NETCore.App.Ref">
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport" Version="8.0.0-preview.4.23218.1" CoherentParentDependency="Microsoft.NETCore.App.Ref">
<Uri>https://github.com/dotnet/emsdk</Uri>
<Sha>a464820353b7956538b07c9b53103d793b5e15b6</Sha>
<Sha>2327f6b63d887979222f5bcf15f3322f800b9695</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Cecil" Version="0.11.4-alpha.23163.1" CoherentParentDependency="Microsoft.NET.ILLink.Tasks">
<Dependency Name="Microsoft.DotNet.Cecil" Version="0.11.4-alpha.23178.1" CoherentParentDependency="Microsoft.NET.ILLink.Tasks">
<Uri>https://github.com/dotnet/cecil</Uri>
<Sha>f32e148d67dbf348685c3076a37e8bc68ab3a30f</Sha>
<Sha>9a7551fa7ba8218affbc1148eabc4b5c9f4e1151</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
Expand Down
10 changes: 5 additions & 5 deletions eng/Versions.props
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
<Project>
<!--Package versions-->
<PropertyGroup>
<MicrosoftDotnetSdkInternalPackageVersion>8.0.100-preview.4.23218.1</MicrosoftDotnetSdkInternalPackageVersion>
<MicrosoftNETILLinkTasksPackageVersion>8.0.0-preview.4.23210.1</MicrosoftNETILLinkTasksPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>8.0.0-preview.4.23210.1</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftDotnetSdkInternalPackageVersion>8.0.100-preview.4.23224.14</MicrosoftDotnetSdkInternalPackageVersion>
<MicrosoftNETILLinkTasksPackageVersion>8.0.0-preview.4.23221.1</MicrosoftNETILLinkTasksPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>8.0.0-preview.4.23221.1</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftDotNetApiCompatPackageVersion>7.0.0-beta.22103.1</MicrosoftDotNetApiCompatPackageVersion>
<MicrosoftDotNetBuildTasksFeedPackageVersion>7.0.0-beta.22103.1</MicrosoftDotNetBuildTasksFeedPackageVersion>
<MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion>8.0.0-preview.4.23170.1</MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion>
<MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion>8.0.0-preview.4.23218.1</MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion>
<MicrosoftNETWorkloadEmscriptenPackageVersion>$(MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion)</MicrosoftNETWorkloadEmscriptenPackageVersion>
<MicrosoftTemplateEngineTasksPackageVersion>7.0.100-rc.1.22410.7</MicrosoftTemplateEngineTasksPackageVersion>
<MicrosoftDotNetCecilPackageVersion>0.11.4-alpha.23163.1</MicrosoftDotNetCecilPackageVersion>
<MicrosoftDotNetCecilPackageVersion>0.11.4-alpha.23178.1</MicrosoftDotNetCecilPackageVersion>
<SystemIOHashingPackageVersion>$(MicrosoftNETCoreAppRefPackageVersion)</SystemIOHashingPackageVersion>
</PropertyGroup>
<PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion external/Java.Interop

0 comments on commit 7eb75e3

Please sign in to comment.