diff options
author | Bret Johnson <bret.johnson@microsoft.com> | 2022-01-21 19:27:26 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-01-21 19:27:26 +0300 |
commit | bb51ee49a85a34fb86c9da12473a62fa241f0613 (patch) | |
tree | a28adbec487dd16c80687e723520deca38b9034d | |
parent | d1695c8a7cd61e2c624516b05f072e868ffde197 (diff) | |
parent | aa8ed0016ab40bf74d1ac4357437c64b2f3f69a6 (diff) |
Merge pull request #785 from xamarin/build-mac-with-dotnet6
Switch Mac project to .net6
-rw-r--r-- | .build/automation/stages/validate.yml | 15 | ||||
-rw-r--r-- | Directory.Build.props | 6 | ||||
-rw-r--r-- | Xamarin.PropertyEditing.Mac.Standalone/Info.plist | 5 | ||||
-rw-r--r-- | Xamarin.PropertyEditing.Mac.Standalone/MockedAppKitControlButton.cs | 43 | ||||
-rw-r--r-- | Xamarin.PropertyEditing.Mac.Standalone/MockedAppKitControlButton.designer.cs | 9 | ||||
-rw-r--r-- | Xamarin.PropertyEditing.Mac.Standalone/Xamarin.PropertyEditing.Mac.Standalone.csproj | 131 | ||||
-rw-r--r-- | Xamarin.PropertyEditing.Mac/Xamarin.PropertyEditing.Mac.csproj | 14 | ||||
-rw-r--r-- | Xamarin.PropertyEditing.Tests/Xamarin.PropertyEditing.Tests.csproj | 26 | ||||
-rw-r--r-- | Xamarin.PropertyEditing.sln | 36 | ||||
-rw-r--r-- | bot-provisioning/dependencies.csx | 16 | ||||
-rw-r--r-- | build.proj | 9 | ||||
-rw-r--r-- | global.json | 5 |
12 files changed, 73 insertions, 242 deletions
diff --git a/.build/automation/stages/validate.yml b/.build/automation/stages/validate.yml index 590824b..d59b470 100644 --- a/.build/automation/stages/validate.yml +++ b/.build/automation/stages/validate.yml @@ -12,6 +12,13 @@ stages: clean: true persistCredentials: true + - task: provisionator@2 + displayName: Provision Dependencies + inputs: + github_token: $(GitHub.Token) + 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 displayName: Build inputs: @@ -44,12 +51,6 @@ stages: - task: NuGetAuthenticate@0 - - task: CmdLine@1 - displayName: 'Set Token' - inputs: - filename: echo - arguments: '##vso[task.setvariable variable=GITHUB_TOKEN]$(GitHub.Token)' - - task: provisionator@2 displayName: Provision Dependencies inputs: @@ -75,5 +76,5 @@ stages: displayName: 'Publish Test Results' inputs: testResultsFormat: NUnit - testResultsFiles: '**/TestResult.xml' + testResultsFiles: '**/*.Tests.xml' condition: succeededOrFailed() diff --git a/Directory.Build.props b/Directory.Build.props index dfcb57f..138326c 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,3 +1,7 @@ <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <!-- Deliberately empty so we don't inherit files from whoever submodules this repository --> + <PropertyGroup> + <IsMac>$([MSBuild]::IsOSPlatform('OSX'))</IsMac> + <IsWindows>$([MSBuild]::IsOSPlatform('Windows'))</IsWindows> + <IsLinux>$([MSBuild]::IsOSPlatform('Linux'))</IsLinux> + </PropertyGroup> </Project> diff --git a/Xamarin.PropertyEditing.Mac.Standalone/Info.plist b/Xamarin.PropertyEditing.Mac.Standalone/Info.plist index a9d6ddb..3f7108c 100644 --- a/Xamarin.PropertyEditing.Mac.Standalone/Info.plist +++ b/Xamarin.PropertyEditing.Mac.Standalone/Info.plist @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="UTF-8"?> +<?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> <plist version="1.0"> <dict> @@ -11,7 +11,7 @@ <key>CFBundleVersion</key> <string>1</string> <key>LSMinimumSystemVersion</key> - <string>10.11</string> + <string>10.14</string> <key>CFBundleDevelopmentRegion</key> <string>en</string> <key>CFBundleInfoDictionaryVersion</key> @@ -28,6 +28,5 @@ <string>Main</string> <key>XSAppIconAssets</key> <string>Assets.xcassets/AppIcon.appiconset</string> - </dict> </plist> diff --git a/Xamarin.PropertyEditing.Mac.Standalone/MockedAppKitControlButton.cs b/Xamarin.PropertyEditing.Mac.Standalone/MockedAppKitControlButton.cs deleted file mode 100644 index ad2e4d0..0000000 --- a/Xamarin.PropertyEditing.Mac.Standalone/MockedAppKitControlButton.cs +++ /dev/null @@ -1,43 +0,0 @@ -using System; -using Foundation; -using AppKit; -using Xamarin.PropertyEditing.Tests.MockControls; - -namespace Xamarin.PropertyEditing.Mac.Standalone -{ - public abstract class MockedAppKitControlButton<T> : AppKit.NSButtonCell where T : MockControl - { - protected MockedAppKitControlButton (T mockedControl, IntPtr handle) : base (handle) - { - MockedControl = mockedControl; - Initialize (); - } - - protected MockedAppKitControlButton (T mockedControl, NSCoder coder) : base (coder) - { - Initialize (); - MockedControl = mockedControl; - } - - // Shared initialization code - void Initialize () - { - } - - public T MockedControl { get; } - } - - public partial class MockedAppKitButton : MockedAppKitControlButton<MockNSButton> - { - // Called when created from unmanaged code - public MockedAppKitButton (IntPtr handle) : base (new MockNSButton (), handle) - { - } - - // Called when created directly from a XIB file - [Export ("initWithCoder:")] - public MockedAppKitButton (NSCoder coder) : base (new MockNSButton (), coder) - { - } - } -} diff --git a/Xamarin.PropertyEditing.Mac.Standalone/MockedAppKitControlButton.designer.cs b/Xamarin.PropertyEditing.Mac.Standalone/MockedAppKitControlButton.designer.cs deleted file mode 100644 index c81fc16..0000000 --- a/Xamarin.PropertyEditing.Mac.Standalone/MockedAppKitControlButton.designer.cs +++ /dev/null @@ -1,9 +0,0 @@ -namespace Xamarin.PropertyEditing.Mac.Standalone -{ - - // Should subclass AppKit.NSView - [Foundation.Register ("MockedAppKitButton")] - public partial class MockedAppKitButton - { - } -} diff --git a/Xamarin.PropertyEditing.Mac.Standalone/Xamarin.PropertyEditing.Mac.Standalone.csproj b/Xamarin.PropertyEditing.Mac.Standalone/Xamarin.PropertyEditing.Mac.Standalone.csproj index a92df9b..b8f1d55 100644 --- a/Xamarin.PropertyEditing.Mac.Standalone/Xamarin.PropertyEditing.Mac.Standalone.csproj +++ b/Xamarin.PropertyEditing.Mac.Standalone/Xamarin.PropertyEditing.Mac.Standalone.csproj @@ -1,134 +1,21 @@ <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
- <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProjectGuid>{8319A66C-72AE-4C40-B737-97279D4AB899}</ProjectGuid>
- <ProjectTypeGuids>{A3F8F2AB-B479-4A4A-A458-A89E7DC349F1};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+ <TargetFramework>net6.0-macos</TargetFramework>
<OutputType>Exe</OutputType>
- <RootNamespace>Xamarin.PropertyEditing.Mac.Standalone</RootNamespace>
- <AssemblyName>Xamarin.PropertyEditing.Mac.Standalone</AssemblyName>
- <MonoMacResourcePrefix>Resources</MonoMacResourcePrefix>
- <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
- <TargetFrameworkProfile />
- <XamarinMacAnalyzerMinimumOSVersion>10.12</XamarinMacAnalyzerMinimumOSVersion>
+ <SupportedOSPlatformVersion>10.14</SupportedOSPlatformVersion>
</PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
- <DebugSymbols>true</DebugSymbols>
- <DebugType>full</DebugType>
- <Optimize>false</Optimize>
- <OutputPath>bin\Debug</OutputPath>
- <DefineConstants>DEBUG;</DefineConstants>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- <EnableCodeSigning>false</EnableCodeSigning>
- <CodeSigningKey>Mac Developer</CodeSigningKey>
- <CreatePackage>false</CreatePackage>
- <EnablePackageSigning>false</EnablePackageSigning>
- <IncludeMonoRuntime>false</IncludeMonoRuntime>
- <UseSGen>true</UseSGen>
- <UseRefCounting>true</UseRefCounting>
- <Profiling>false</Profiling>
- <HttpClientHandler></HttpClientHandler>
- <LinkMode></LinkMode>
- <XamMacArch></XamMacArch>
- <XamarinInspectorDisabled>True</XamarinInspectorDisabled>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
- <DebugType>pdbonly</DebugType>
- <Optimize>true</Optimize>
- <OutputPath>bin\Release</OutputPath>
- <DefineConstants></DefineConstants>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- <EnableCodeSigning>false</EnableCodeSigning>
- <CreatePackage>true</CreatePackage>
- <EnablePackageSigning>false</EnablePackageSigning>
- <IncludeMonoRuntime>true</IncludeMonoRuntime>
- <UseSGen>true</UseSGen>
- <UseRefCounting>true</UseRefCounting>
- <LinkMode>None</LinkMode>
- <HttpClientHandler></HttpClientHandler>
- <XamMacArch></XamMacArch>
- </PropertyGroup>
- <ItemGroup>
- <Reference Include="System" />
- <Reference Include="System.Core" />
- <Reference Include="Xamarin.Mac" />
- </ItemGroup>
- <ItemGroup>
- <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Contents.json" />
- <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\AppIcon-128.png" />
- <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\AppIcon-128%402x.png" />
- <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\AppIcon-16.png" />
- <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\AppIcon-16%402x.png" />
- <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\AppIcon-256.png" />
- <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\AppIcon-256%402x.png" />
- <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\AppIcon-32.png" />
- <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\AppIcon-32%402x.png" />
- <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\AppIcon-512.png" />
- <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\AppIcon-512%402x.png" />
- <ImageAsset Include="Assets.xcassets\Contents.json" />
- <ImageAsset Include="Assets.xcassets\Checkerboard0.colorset\Contents.json" />
- <ImageAsset Include="Assets.xcassets\Checkerboard1.colorset\Contents.json" />
- <ImageAsset Include="Assets.xcassets\ForegroundColor.colorset\Contents.json" />
- <ImageAsset Include="Assets.xcassets\PadBackgroundColor.colorset\Contents.json" />
- <ImageAsset Include="Assets.xcassets\PopoverContentBackground.colorset\Contents.json" />
- <ImageAsset Include="Assets.xcassets\ValueBlockBackgroundColor.colorset\Contents.json" />
- <ImageAsset Include="Assets.xcassets\DescriptionLabelColor.colorset\Contents.json" />
- <ImageAsset Include="Assets.xcassets\TabBorderColor.colorset\Contents.json" />
- <ImageAsset Include="Assets.xcassets\PanelTabBackground.colorset\Contents.json" />
- <ImageAsset Include="Assets.xcassets\FrameBoxBorderColor.colorset\Contents.json" />
- <ImageAsset Include="Assets.xcassets\FrameBoxBackgroundColor.colorset\Contents.json" />
- <ImageAsset Include="Assets.xcassets\FrameBoxButtonBorderColor.colorset\Contents.json" />
- <ImageAsset Include="Assets.xcassets\FrameBoxButtonBackgroundColor.colorset\Contents.json" />
- <ImageAsset Include="Assets.xcassets\ListHeaderSeparatorColor.colorset\Contents.json" />
- <ImageAsset Include="Assets.xcassets\ControlBackground.colorset\Contents.json" />
- </ItemGroup>
- <ItemGroup>
- <Folder Include="Resources\" />
- </ItemGroup>
- <ItemGroup>
- <None Include="Info.plist" />
- <None Include="Entitlements.plist" />
- </ItemGroup>
- <ItemGroup>
- <Compile Include="Main.cs" />
- <Compile Include="AppDelegate.cs" />
- <Compile Include="ViewController.cs" />
- <Compile Include="ViewController.designer.cs">
- <DependentUpon>ViewController.cs</DependentUpon>
- </Compile>
- <Compile Include="MockedControlButton.cs" />
- <Compile Include="MockedAppKitButton.cs" />
- <Compile Include="IMockedControl.cs" />
- <Compile Include="MockedSampleControlButton.cs" />
- </ItemGroup>
- <ItemGroup>
- <InterfaceDefinition Include="Main.storyboard" />
- </ItemGroup>
+
<ItemGroup>
- <ProjectReference Include="..\Xamarin.PropertyEditing.Mac\Xamarin.PropertyEditing.Mac.csproj">
- <Project>{E8F4F0EB-C2B1-4116-8459-E076E0E0E485}</Project>
- <Name>Xamarin.PropertyEditing.Mac</Name>
- </ProjectReference>
- <ProjectReference Include="..\Xamarin.PropertyEditing\Xamarin.PropertyEditing.csproj">
- <Project>{A0B6FE73-D046-4E1C-BA9D-F20683889C5A}</Project>
- <Name>Xamarin.PropertyEditing</Name>
- </ProjectReference>
- <ProjectReference Include="..\Xamarin.PropertyEditing.Tests\Xamarin.PropertyEditing.Tests.csproj">
- <Project>{84101D04-9CE4-4CE7-916E-21F86EE96898}</Project>
- <Name>Xamarin.PropertyEditing.Tests</Name>
- </ProjectReference>
+ <ProjectReference Include="..\Xamarin.PropertyEditing.Mac\Xamarin.PropertyEditing.Mac.csproj" />
+ <ProjectReference Include="..\Xamarin.PropertyEditing\Xamarin.PropertyEditing.csproj" />
+ <ProjectReference Include="..\Xamarin.PropertyEditing.Tests\Xamarin.PropertyEditing.Tests.csproj" />
</ItemGroup>
- <Import Project="$(MSBuildExtensionsPath)\Xamarin\Mac\Xamarin.Mac.CSharp.targets" />
+
<Target Name="AfterBuild">
<ItemGroup>
<PropertyEditingResourceBundlePath Include="$(OutputPath)\PropertyEditingResource.bundle\**\*" />
</ItemGroup>
- <Copy
- SourceFiles="@(PropertyEditingResourceBundlePath)"
- DestinationFiles="@(PropertyEditingResourceBundlePath->'$(OutputPath)\$(AssemblyName).app\Contents\MonoBundle\PropertyEditingResource.bundle\%(RecursiveDir)%(Filename)%(Extension)')"
- SkipUnchangedFiles="true" />
+ <Copy SourceFiles="@(PropertyEditingResourceBundlePath)" DestinationFiles="@(PropertyEditingResourceBundlePath->'$(OutputPath)\$(AssemblyName).app\Contents\MonoBundle\PropertyEditingResource.bundle\%(RecursiveDir)%(Filename)%(Extension)')" SkipUnchangedFiles="true" />
</Target>
</Project>
\ No newline at end of file diff --git a/Xamarin.PropertyEditing.Mac/Xamarin.PropertyEditing.Mac.csproj b/Xamarin.PropertyEditing.Mac/Xamarin.PropertyEditing.Mac.csproj index eee6cb9..42c433b 100644 --- a/Xamarin.PropertyEditing.Mac/Xamarin.PropertyEditing.Mac.csproj +++ b/Xamarin.PropertyEditing.Mac/Xamarin.PropertyEditing.Mac.csproj @@ -1,21 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFramework>net472</TargetFramework> - <XamarinMacAnalyzerMinimumOSVersion>10.12</XamarinMacAnalyzerMinimumOSVersion> + <TargetFramework>net6.0-macos</TargetFramework> + <SupportedOSPlatformVersion>10.14</SupportedOSPlatformVersion> </PropertyGroup> <ItemGroup> - <Reference Include="System" /> - <Reference Include="System.Core" /> - <Reference Include="System.Drawing" /> - <Reference Include="Xamarin.Mac"> - <HintPath Condition="Exists('/Library/Frameworks/Xamarin.Mac.framework/Versions/Current/lib/x86_64/full/Xamarin.Mac.dll')">/Library/Frameworks/Xamarin.Mac.framework/Versions/Current/lib/x86_64/full/Xamarin.Mac.dll</HintPath> - <HintPath Condition="Exists('/Library/Frameworks/Xamarin.Mac.framework/Versions/Current/lib/64bits/full/Xamarin.Mac.dll')">/Library/Frameworks/Xamarin.Mac.framework/Versions/Current/lib/64bits/full/Xamarin.Mac.dll</HintPath> - </Reference> - </ItemGroup> - - <ItemGroup> <ProjectReference Include="..\Xamarin.PropertyEditing\Xamarin.PropertyEditing.csproj" /> </ItemGroup> diff --git a/Xamarin.PropertyEditing.Tests/Xamarin.PropertyEditing.Tests.csproj b/Xamarin.PropertyEditing.Tests/Xamarin.PropertyEditing.Tests.csproj index ef2a41d..ddc768d 100644 --- a/Xamarin.PropertyEditing.Tests/Xamarin.PropertyEditing.Tests.csproj +++ b/Xamarin.PropertyEditing.Tests/Xamarin.PropertyEditing.Tests.csproj @@ -1,28 +1,18 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project Sdk="Microsoft.NET.Sdk"> - <PropertyGroup> + <PropertyGroup Condition=" $(IsMac)" > + <TargetFramework>net6.0</TargetFramework> + </PropertyGroup> + <PropertyGroup Condition=" $(IsWindows)" > <TargetFramework>net472</TargetFramework> - <RestorePackagesPath>$(MSBuildThisFileDirectory)packages\</RestorePackagesPath> </PropertyGroup> <ItemGroup> - <Reference Include="System" /> - <Reference Include="System.Core" /> - <Reference Include="System.Drawing" /> - <Reference Include="System.Xml.Linq" /> - <Reference Include="System.Data.DataSetExtensions" /> - <Reference Include="Microsoft.CSharp" /> - <Reference Include="System.Data" /> - <Reference Include="System.Net.Http" /> - <Reference Include="System.Xml" /> - </ItemGroup> - - <ItemGroup> <PackageReference Include="Moq" Version="4.10.1" /> <PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.2" /> - <PackageReference Include="NUnit" Version="3.11.0" /> - <PackageReference Include="NUnit.ConsoleRunner" Version="3.9.0" /> - <PackageReference Include="NUnit3TestAdapter" Version="3.13.0" /> + <PackageReference Include="NUnit" Version="3.13.2" /> + <PackageReference Include="NUnit3TestAdapter" Version="4.2.0" /> + <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" /> </ItemGroup> <ItemGroup> diff --git a/Xamarin.PropertyEditing.sln b/Xamarin.PropertyEditing.sln index 9404a75..297c815 100644 --- a/Xamarin.PropertyEditing.sln +++ b/Xamarin.PropertyEditing.sln @@ -7,14 +7,14 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.PropertyEditing", " EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.PropertyEditing.Windows", "Xamarin.PropertyEditing.Windows\Xamarin.PropertyEditing.Windows.csproj", "{60AF04BE-1B6B-411B-BCBA-C95EAFBD7AC0}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.PropertyEditing.Tests", "Xamarin.PropertyEditing.Tests\Xamarin.PropertyEditing.Tests.csproj", "{84101D04-9CE4-4CE7-916E-21F86EE96898}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.PropertyEditing.Windows.Standalone", "Xamarin.PropertyEditing.Windows.Standalone\Xamarin.PropertyEditing.Windows.Standalone.csproj", "{070E46F6-916C-4987-8F90-C0CEF1572FFE}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.PropertyEditing.Mac.Standalone", "Xamarin.PropertyEditing.Mac.Standalone\Xamarin.PropertyEditing.Mac.Standalone.csproj", "{8319A66C-72AE-4C40-B737-97279D4AB899}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.PropertyEditing.Mac", "Xamarin.PropertyEditing.Mac\Xamarin.PropertyEditing.Mac.csproj", "{E8F4F0EB-C2B1-4116-8459-E076E0E0E485}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.PropertyEditing.Tests", "Xamarin.PropertyEditing.Tests\Xamarin.PropertyEditing.Tests.csproj", "{BA78BFE9-B51A-476D-B949-BD764CB55807}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.PropertyEditing.Mac.Standalone", "Xamarin.PropertyEditing.Mac.Standalone\Xamarin.PropertyEditing.Mac.Standalone.csproj", "{A8ADFD5D-26CE-446B-AACA-99F6CA26FE45}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -37,32 +37,32 @@ Global {60AF04BE-1B6B-411B-BCBA-C95EAFBD7AC0}.Release|Any CPU.Build.0 = Release|Any CPU {60AF04BE-1B6B-411B-BCBA-C95EAFBD7AC0}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU {60AF04BE-1B6B-411B-BCBA-C95EAFBD7AC0}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU - {84101D04-9CE4-4CE7-916E-21F86EE96898}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {84101D04-9CE4-4CE7-916E-21F86EE96898}.Debug|Any CPU.Build.0 = Debug|Any CPU - {84101D04-9CE4-4CE7-916E-21F86EE96898}.Release|Any CPU.ActiveCfg = Release|Any CPU - {84101D04-9CE4-4CE7-916E-21F86EE96898}.Release|Any CPU.Build.0 = Release|Any CPU - {84101D04-9CE4-4CE7-916E-21F86EE96898}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU - {84101D04-9CE4-4CE7-916E-21F86EE96898}.DebugMac|Any CPU.Build.0 = Debug|Any CPU - {84101D04-9CE4-4CE7-916E-21F86EE96898}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU - {84101D04-9CE4-4CE7-916E-21F86EE96898}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU {070E46F6-916C-4987-8F90-C0CEF1572FFE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {070E46F6-916C-4987-8F90-C0CEF1572FFE}.Debug|Any CPU.Build.0 = Debug|Any CPU {070E46F6-916C-4987-8F90-C0CEF1572FFE}.Release|Any CPU.ActiveCfg = Release|Any CPU {070E46F6-916C-4987-8F90-C0CEF1572FFE}.Release|Any CPU.Build.0 = Release|Any CPU {070E46F6-916C-4987-8F90-C0CEF1572FFE}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU {070E46F6-916C-4987-8F90-C0CEF1572FFE}.ReleaseMac|Any CPU.ActiveCfg = Debug|Any CPU - {8319A66C-72AE-4C40-B737-97279D4AB899}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8319A66C-72AE-4C40-B737-97279D4AB899}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8319A66C-72AE-4C40-B737-97279D4AB899}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU - {8319A66C-72AE-4C40-B737-97279D4AB899}.DebugMac|Any CPU.Build.0 = Debug|Any CPU - {8319A66C-72AE-4C40-B737-97279D4AB899}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU - {8319A66C-72AE-4C40-B737-97279D4AB899}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU {E8F4F0EB-C2B1-4116-8459-E076E0E0E485}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {E8F4F0EB-C2B1-4116-8459-E076E0E0E485}.Release|Any CPU.ActiveCfg = Release|Any CPU {E8F4F0EB-C2B1-4116-8459-E076E0E0E485}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU {E8F4F0EB-C2B1-4116-8459-E076E0E0E485}.DebugMac|Any CPU.Build.0 = Debug|Any CPU {E8F4F0EB-C2B1-4116-8459-E076E0E0E485}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU {E8F4F0EB-C2B1-4116-8459-E076E0E0E485}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU + {BA78BFE9-B51A-476D-B949-BD764CB55807}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {BA78BFE9-B51A-476D-B949-BD764CB55807}.Debug|Any CPU.Build.0 = Debug|Any CPU + {BA78BFE9-B51A-476D-B949-BD764CB55807}.Release|Any CPU.ActiveCfg = Release|Any CPU + {BA78BFE9-B51A-476D-B949-BD764CB55807}.Release|Any CPU.Build.0 = Release|Any CPU + {BA78BFE9-B51A-476D-B949-BD764CB55807}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU + {BA78BFE9-B51A-476D-B949-BD764CB55807}.DebugMac|Any CPU.Build.0 = Debug|Any CPU + {BA78BFE9-B51A-476D-B949-BD764CB55807}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU + {BA78BFE9-B51A-476D-B949-BD764CB55807}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU + {A8ADFD5D-26CE-446B-AACA-99F6CA26FE45}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {A8ADFD5D-26CE-446B-AACA-99F6CA26FE45}.Release|Any CPU.ActiveCfg = Release|Any CPU + {A8ADFD5D-26CE-446B-AACA-99F6CA26FE45}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU + {A8ADFD5D-26CE-446B-AACA-99F6CA26FE45}.DebugMac|Any CPU.Build.0 = Debug|Any CPU + {A8ADFD5D-26CE-446B-AACA-99F6CA26FE45}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU + {A8ADFD5D-26CE-446B-AACA-99F6CA26FE45}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/bot-provisioning/dependencies.csx b/bot-provisioning/dependencies.csx index b082be1..3abd0b6 100644 --- a/bot-provisioning/dependencies.csx +++ b/bot-provisioning/dependencies.csx @@ -2,6 +2,16 @@ using static Xamarin.Provisioning.ProvisioningScript; -Item ("https://xamjenkinsartifact.azureedge.net/build-package-osx-mono/2020-02/77/e9d3af508e46454389cb29836d19616eae1615c0/MonoFramework-MDK-6.12.0.74.macos10.xamarin.universal.pkg"); -Item ("https://download.visualstudio.microsoft.com/download/pr/951ce94d-144e-4a6e-9c1b-31066ce2044c/6c24acc6dfa374bb5f311c46e0dddc03/xamarin.mac-7.11.2.4.pkg"); -Xcode ("12.4.0").XcodeSelect(); +if (IsMac) { + DotNetCoreSdk ("../global.json", installDirectory: Env("DOTNET_ROOT")) + .Workload( + "microsoft.net.sdk.macos", + "12.0.101-preview.10.249", + "https://aka.ms/dotnet6/nuget/index.json", + "https://api.nuget.org/v3/index.json"); + + Xcode ("13.2.1").XcodeSelect (); +} +else if (IsWindows) { + DotNetCoreSdk ("../global.json"); +} @@ -27,16 +27,13 @@ <CommonBuildProperties>$(CommonBuildProperties);Configuration=$(Configuration)</CommonBuildProperties> + <TestProjectDirectory>Xamarin.PropertyEditing.Tests\</TestProjectDirectory> <TestAssemblyBaseDirectory>Xamarin.PropertyEditing.Tests\bin\</TestAssemblyBaseDirectory> <TestAssemblyName>Xamarin.PropertyEditing.Tests.dll</TestAssemblyName> - <Out Condition="'$(Out)' == ''">out</Out> + <Out Condition="'$(Out)' == ''">$(MSBuildThisFileDirectory)out</Out> </PropertyGroup> - <ItemGroup> - <NunitConsoleRunner Include="**/nunit3-console.exe" /> - </ItemGroup> - <!-- List the sln files we need to build --> <ItemGroup> <SolutionFiles Include="$(MSBuildThisFileDirectory)Xamarin.PropertyEditing.sln" /> @@ -62,7 +59,7 @@ <TestAssembly Include="$(TestAssemblyBaseDirectory)**\$(TestAssemblyName)" /> </ItemGroup> <MakeDir Directories="$(Out)" /> - <Exec Command="$(Mono64) @(NunitConsoleRunner) @(TestAssembly) -result=$(Out)\TestResult.xml" /> + <Exec Command="dotnet test $(TestProjectDirectory)Xamarin.PropertyEditing.Tests.csproj -- NUnit.TestOutputXml='$(Out)'" /> </Target> <Target Name="TestMac" Condition=" '$(IsMac)' "> diff --git a/global.json b/global.json new file mode 100644 index 0000000..2a9ec01 --- /dev/null +++ b/global.json @@ -0,0 +1,5 @@ +{ + "sdk": { + "version": "6.0.101" + } +} |