Bump to the .NET 6.0.300 SDK (#39)
* fix missing NuGet source by creating `bin/Debug` * Default `$(NoNFloatUsing)` to true for legacy Xamarin.iOS/Mac targets * Bump to macios-12, so we get the newer Xcode
This commit is contained in:
Родитель
6573159716
Коммит
db02b9db20
|
@ -8,7 +8,7 @@ on:
|
|||
|
||||
jobs:
|
||||
mac:
|
||||
runs-on: macos-11
|
||||
runs-on: macos-12
|
||||
|
||||
env:
|
||||
Configuration: Release
|
||||
|
@ -19,7 +19,7 @@ jobs:
|
|||
- name: install .NET
|
||||
uses: actions/setup-dotnet@v1
|
||||
with:
|
||||
dotnet-version: 6.0.100
|
||||
dotnet-version: 6.0.300
|
||||
|
||||
- name: install .NET workloads
|
||||
run: dotnet workload install android ios macos --verbosity diag
|
||||
|
@ -32,12 +32,12 @@ jobs:
|
|||
- name: build SDK
|
||||
run: dotnet build Xamarin.Legacy.Sdk.sln -bl:bin/Xamarin.Legacy.Sdk.binlog
|
||||
|
||||
- name: build samples
|
||||
run: dotnet build samples/samples.sln -bl:bin/samples.binlog
|
||||
|
||||
- name: fix missing NuGet source
|
||||
run: mkdir -p bin/Debug
|
||||
|
||||
- name: build samples
|
||||
run: dotnet build samples/samples.sln -bl:bin/samples.binlog
|
||||
|
||||
- name: build HelloMac sample
|
||||
run: dotnet build samples/HelloMac/HelloMac.csproj -bl:bin/HelloMac.binlog
|
||||
|
||||
|
|
|
@ -17,7 +17,7 @@ variables:
|
|||
- name: Configuration
|
||||
value: Release
|
||||
- name: DotNetVersion
|
||||
value: 6.0.100
|
||||
value: 6.0.300
|
||||
- name: BootsVersion
|
||||
value: 1.0.4.624
|
||||
- name: DotNet.Cli.Telemetry.OptOut
|
||||
|
@ -53,6 +53,8 @@ jobs:
|
|||
displayName: install Xamarin.Android
|
||||
- script: dotnet build Xamarin.Legacy.Sdk.sln -bl:$(System.DefaultWorkingDirectory)/bin/Xamarin.Legacy.Sdk.binlog
|
||||
displayName: build SDK
|
||||
- script: mkdir bin\Debug
|
||||
displayName: fix missing NuGet source
|
||||
- script: dotnet build samples/samples.sln -bl:$(System.DefaultWorkingDirectory)/bin/samples.binlog
|
||||
displayName: build samples
|
||||
- task: PublishPipelineArtifact@1
|
||||
|
@ -99,6 +101,8 @@ jobs:
|
|||
solution: Xamarin.Legacy.Sdk.sln
|
||||
msbuildArguments: -restore -bl:$(System.DefaultWorkingDirectory)/bin/Xamarin.Legacy.Sdk.binlog
|
||||
displayName: build SDK
|
||||
- script: mkdir bin\Debug
|
||||
displayName: fix missing NuGet source
|
||||
- task: MSBuild@1
|
||||
inputs:
|
||||
solution: samples/samples.sln
|
||||
|
|
|
@ -25,6 +25,7 @@
|
|||
<LangVersion Condition=" '$(LangVersion)' == '' ">latest</LangVersion>
|
||||
<TargetPlatformIdentifier>iOS</TargetPlatformIdentifier>
|
||||
<EnableDefaultiOSItems Condition=" '$(EnableDefaultiOSItems)' == '' ">true</EnableDefaultiOSItems>
|
||||
<NoNFloatUsing Condition=" '$(NoNFloatUsing)' == '' ">true</NoNFloatUsing>
|
||||
<AfterMicrosoftNETSdkTargets>$(AfterMicrosoftNETSdkTargets);$(MSBuildThisFileDirectory)Xamarin.Legacy.iOS.After.targets</AfterMicrosoftNETSdkTargets>
|
||||
</PropertyGroup>
|
||||
<Import Project="$(_LegacyExtensionsPath)/Xamarin/iOS/Xamarin.iOS.CSharp.targets" Condition=" '$(_FixupsNeeded)' == 'true' " />
|
||||
|
|
|
@ -25,6 +25,7 @@
|
|||
<LangVersion Condition=" '$(LangVersion)' == '' ">latest</LangVersion>
|
||||
<TargetPlatformIdentifier>macOS</TargetPlatformIdentifier>
|
||||
<EnableDefaultmacOSItems Condition=" '$(EnableDefaultmacOSItems)' == '' ">true</EnableDefaultmacOSItems>
|
||||
<NoNFloatUsing Condition=" '$(NoNFloatUsing)' == '' ">true</NoNFloatUsing>
|
||||
</PropertyGroup>
|
||||
<Import Project="$(_LegacyExtensionsPath)/Xamarin/Mac/Xamarin.Mac.CSharp.targets" Condition=" '$(_FixupsNeeded)' == 'true' " />
|
||||
<Import Project="$(MSBuildExtensionsPath)/Xamarin/Mac/Xamarin.Mac.CSharp.targets" Condition=" '$(_FixupsNeeded)' != 'true' " />
|
||||
|
|
Загрузка…
Ссылка в новой задаче