diff options
| author | Sandy Armstrong <sandy@xamarin.com> | 2022-06-13 17:31:04 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-13 17:31:04 +0300 |
| commit | facd67f222ff326c28d2db35c9c5e1141b6a9c01 (patch) | |
| tree | 9da9386bcbef903560cb7eef94eacb6729c4b51d | |
| parent | 3ba685897e82e57fa4d445ca836edcd43c4d2c7a (diff) | |
| parent | dbb3f7ab35e35851c749e87596238c6a6c74ea0f (diff) | |
Merge pull request #815 from xamarin/dev/sandy/macos-rc3
Build: Use a 6.0.300 SDK and macos workload RC3
| -rw-r--r-- | .build/automation/stages/validate.yml | 18 | ||||
| -rw-r--r-- | Xamarin.PropertyEditing.Mac/Controls/Custom/DrawingExtensions.cs | 2 | ||||
| -rw-r--r-- | bot-provisioning/dependencies.csx | 6 | ||||
| -rw-r--r-- | global.json | 2 |
4 files changed, 14 insertions, 14 deletions
diff --git a/.build/automation/stages/validate.yml b/.build/automation/stages/validate.yml index d59b470..5e55b70 100644 --- a/.build/automation/stages/validate.yml +++ b/.build/automation/stages/validate.yml @@ -42,7 +42,7 @@ stages: - job: 'MacOS' pool: - vmImage: 'macOS-latest' + vmImage: 'macos-12' steps: - checkout: self @@ -58,19 +58,19 @@ stages: provisioning_script: $(System.DefaultWorkingDirectory)/bot-provisioning/dependencies.csx provisioning_extra_args: -vv DEVDIV_PKGS_NUGET_TOKEN=$(DevDiv.NuGet.Token) SECTOOLS_PKGS_NUGET_TOKEN=$(SecTools.NuGet.Token) - - task: MSBuild@1 + - task: DotNetCoreCLI@2 displayName: Build inputs: - solution: build.proj - msbuildVersion: "15.0" - msbuildArguments: '/restore /p:Release=true /t:Build' + projects: build.proj + command: build + arguments: '/restore /p:Release=true /t:Build' - - task: MSBuild@1 + - task: DotNetCoreCLI@2 displayName: 'Run Tests' inputs: - solution: build.proj - msbuildVersion: "15.0" - msbuildArguments: '/p:Release=true /t:Test' + projects: build.proj + command: build + arguments: '/p:Release=true /t:Test' - task: PublishTestResults@2 displayName: 'Publish Test Results' diff --git a/Xamarin.PropertyEditing.Mac/Controls/Custom/DrawingExtensions.cs b/Xamarin.PropertyEditing.Mac/Controls/Custom/DrawingExtensions.cs index cf87d01..430a4f0 100644 --- a/Xamarin.PropertyEditing.Mac/Controls/Custom/DrawingExtensions.cs +++ b/Xamarin.PropertyEditing.Mac/Controls/Custom/DrawingExtensions.cs @@ -20,7 +20,7 @@ namespace Xamarin.PropertyEditing.Mac Color0 = c0, Color1 = c1, Width = (float)Math.Min (frame.Height / 2f, 10), - Center = new CIVector (new nfloat[] { 0, 0 }), + InputCenter = default, }) { using (var context = new CIContext (null)) { return context.CreateCGImage (board.OutputImage, new CGRect (0, 0, frame.Width, frame.Height)); diff --git a/bot-provisioning/dependencies.csx b/bot-provisioning/dependencies.csx index 0dd5668..78df6d7 100644 --- a/bot-provisioning/dependencies.csx +++ b/bot-provisioning/dependencies.csx @@ -5,9 +5,9 @@ using static Xamarin.Provisioning.ProvisioningScript; if (IsMac) { DotNetCoreSdk ("../global.json", installDirectory: Env("DOTNET_ROOT")) .WithWorkload( - workload: new DotNetWorkload("microsoft.net.sdk.macos", "12.1.301-preview.13.10"), + workload: new DotNetWorkload("microsoft.net.sdk.macos", "12.3.300-rc.3.83"), dependencies: new [] { - new DotNetWorkload("microsoft.net.workload.mono.toolchain", "6.0.2-mauipre.1.22102.15"), + new DotNetWorkload("microsoft.net.workload.mono.toolchain", "6.0.5"), }, // nugetConfigFilePath: "../NuGet.Config"); // TODO: Make this work and remove `sources` below sources: new [] { @@ -15,7 +15,7 @@ if (IsMac) { "https://api.nuget.org/v3/index.json", }); - Xcode ("13.2.1").XcodeSelect (); + Xcode ("13.3.1").XcodeSelect (); } else if (IsWindows) { DotNetCoreSdk ("../global.json"); diff --git a/global.json b/global.json index a2ce2ee..e96609f 100644 --- a/global.json +++ b/global.json @@ -1,5 +1,5 @@ { "sdk": { - "version": "6.0.200" + "version": "6.0.300" } } |