Skip to content

Commit

Permalink
tool version bumps
Browse files Browse the repository at this point in the history
  • Loading branch information
@moljac
moljac committed May 15, 2022
1 parent 043b855 commit bb7a1f1
Show file tree
Hide file tree
Showing 5 changed files with 21 additions and 21 deletions.
10 changes: 5 additions & 5 deletions .ci/build.steps.v1.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,11 @@ parameters:
windowsImage: 'windows-latest' # the name of the Windows VM image
windowsImageOverride: '' # used to access 1ES hardened images: name of ImageOverride demand to use such as AzurePipelinesWindows2022compliant when windowsAgentPoolName set to the AzurePipelines-EO pool
mono: 'Latest' # the version of mono to use
xcode: '13.1' # the version of Xcode to use
dotnet: '6.0.100' # the version of .NET Core to use
dotnetStable: '3.1.415' # the stable version of .NET Core to use
cake: '0.38.5' # the version of Cake to use
apiTools: '1.1.0-preview.1' # the version of the api-tools CLI to use
xcode: '13.3.1' # the version of Xcode to use
dotnet: '6.0.300' # the version of .NET Core to use
dotnetStable: '6.0.300' # the stable version of .NET Core to use
cake: '2.2.0' # the version of Cake to use
apiTools: '1.3.4' # the version of the api-tools CLI to use
xharness: '1.0.0-prerelease.20602.1'
tools: [] # a list of any additional .NET Core tools needed
cakeTemplatesBranch: 'main' # the branch of XamarinComponents that has the templates
Expand Down
10 changes: 5 additions & 5 deletions .ci/build.v1.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,11 @@ parameters:
windowsImage: 'windows-latest' # the name of the Windows VM image
windowsImageOverride: '' # used to access 1ES hardened images: name of ImageOverride demand to use such as AzurePipelinesWindows2022compliant when windowsAgentPoolName set to the AzurePipelines-EO pool
mono: 'Latest' # the version of mono to use
xcode: '13.1' # the version of Xcode to use
dotnet: '6.0.100' # the version of .NET Core to use
dotnetStable: '3.1.415' # the stable version of .NET Core to use
cake: '0.38.5' # the version of Cake to use
apiTools: '1.1.0-preview.1' # the version of the api-tools CLI to use
xcode: '13.3.1' # the version of Xcode to use
dotnet: '6.0.300' # the version of .NET Core to use
dotnetStable: '6.0.300' # the stable version of .NET Core to use
cake: '2.2.0' # the version of Cake to use
apiTools: '1.3.4' # the version of the api-tools CLI to use
xharness: '1.0.0-prerelease.20602.1'
tools: [] # a list of any additional .NET Core tools needed
cakeTemplatesBranch: 'main' # the branch of XamarinComponents that has the templates
Expand Down
10 changes: 5 additions & 5 deletions .ci/build.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,11 @@ parameters:
# macOS-11 required for XCode 13.1
windowsImage: 'windows-latest' # the name of the Windows VM image
mono: 'Latest' # the version of mono to use
xcode: '13.1' # the version of Xcode to use
dotnet: '6.0.200' # the version of .NET Core to use
dotnetStable: '3.1.416' # the stable version of .NET Core to use
cake: '0.38.5' # the version of Cake to use
apiTools: '1.1.0-preview.1' # the version of the api-tools CLI to use
xcode: '13.3.1' # the version of Xcode to use
dotnet: '6.0.300' # the version of .NET Core to use
dotnetStable: '6.0.300' # the stable version of .NET Core to use
cake: '2.2.0' # the version of Cake to use
apiTools: '1.3.4' # the version of the api-tools CLI to use
xharness: '1.0.0-prerelease.20602.1'
tools: [] # a list of any additional .NET Core tools needed
cakeTemplatesBranch: 'main' # the branch of XamarinComponents that has the templates
Expand Down
8 changes: 4 additions & 4 deletions azure-pipelines.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ resources:
ref: refs/heads/main

variables:
DotNet6Version: 6.0.200
DotNet6Version: 6.0.300
XamarinAndroidVsix: https://aka.ms/xamarin-android-commercial-d17-1-windows
# NOTE: there wasn't a public release of 16.11 for macOS
XamarinAndroidPkg: https://dl.internalx.com/vsts-devdiv/Xamarin.Android/public/5673868/d17-1/19b97b7614b275a84d9e38096bd1fe0e25a494d4/xamarin.android-12.2.0.4.pkg
Expand All @@ -34,7 +34,7 @@ jobs:
windowsImage: ''
windowsImageOverride: AzurePipelinesWindows2019compliant

xcode: 13.1
xcode: 13.3.1
buildType: 'manifest'

linuxAgentPoolName: AzurePipelines-EO
Expand Down Expand Up @@ -81,8 +81,8 @@ jobs:
displayName: install .NET 6 Android Workload
condition: ne(variables['System.JobName'], 'linux')
tools:
- 'xamarin.androidbinderator.tool': '0.5.3'
- 'xamarin.androidx.migration.tool': '1.0.8'
- 'xamarin.androidbinderator.tool': '0.5.4'
- 'xamarin.androidx.migration.tool': '1.0.9'
- ${{ if eq(variables['System.TeamProject'], 'devdiv') }}:
- template: sign-artifacts/jobs/v2.yml@internal-templates
parameters:
Expand Down
4 changes: 2 additions & 2 deletions global.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
"msbuild-sdks":
{
"MSBuild.Sdk.Extras": "3.0.44",
"Microsoft.Build.Traversal": "3.1.3",
"Microsoft.Build.NoTargets": "3.3.0",
"Microsoft.Build.Traversal": "3.1.6",
"Microsoft.Build.NoTargets": "3.4.0",
"Xamarin.Legacy.Sdk": "0.1.2-alpha6"
}
}

0 comments on commit bb7a1f1

Please sign in to comment.