From 21f658e92c9af5d92d6802bb462ea26fc7b58603 Mon Sep 17 00:00:00 2001
From: Rolf Bjarne Kvinge <rolf@xamarin.com>
Date: Wed, 18 Dec 2019 07:51:34 +0100
Subject: [PATCH 1/3] Use package references instead of packages.conf in
 preparation for move to short-form csprojs.

---
 Xamarin.MacDev/Xamarin.MacDev.csproj | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/Xamarin.MacDev/Xamarin.MacDev.csproj b/Xamarin.MacDev/Xamarin.MacDev.csproj
index c7486c7..d74c77d 100644
--- a/Xamarin.MacDev/Xamarin.MacDev.csproj
+++ b/Xamarin.MacDev/Xamarin.MacDev.csproj
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(PackagesDirectory)\MicroBuild.Core.0.3.0\build\MicroBuild.Core.props" Condition="Exists('$(PackagesDirectory)\MicroBuild.Core.0.3.0\build\MicroBuild.Core.props')"/>
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -32,6 +31,12 @@
     <ConsolePause>false</ConsolePause>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="MicroBuild.Core" Version="0.3.0">
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
+  </ItemGroup>
   <ItemGroup>
     <FilesToSign Include="$(OutDir)\$(AssemblyName).dll">
       <Authenticode>Microsoft400</Authenticode>
@@ -79,5 +84,4 @@
     <Compile Include="XamMacSdk.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(PackagesDirectory)\MicroBuild.Core.0.3.0\build\MicroBuild.Core.targets" Condition="Exists('$(PackagesDirectory)\MicroBuild.Core.0.3.0\build\MicroBuild.Core.targets')"/>
 </Project>

From 463dfa1bda0f9a264dbdcdb561330bff1700952f Mon Sep 17 00:00:00 2001
From: Rolf Bjarne Kvinge <rolf@xamarin.com>
Date: Wed, 18 Dec 2019 07:52:15 +0100
Subject: [PATCH 2/3] Move to short-form csproj.

---
 UnitTests/UnitTests.csproj           | 41 ++-------------
 Xamarin.MacDev/Xamarin.MacDev.csproj | 74 ++--------------------------
 2 files changed, 7 insertions(+), 108 deletions(-)

diff --git a/UnitTests/UnitTests.csproj b/UnitTests/UnitTests.csproj
index f707aa2..4def257 100644
--- a/UnitTests/UnitTests.csproj
+++ b/UnitTests/UnitTests.csproj
@@ -1,50 +1,17 @@
 <?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>{39DBAAF8-57A5-49A3-9E9A-11B545906AED}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <RootNamespace>UnitTests</RootNamespace>
-    <AssemblyName>UnitTests</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
-  </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>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release</OutputPath>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
+    <TargetFramework>net461</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="System" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="NUnit.ConsoleRunner" Version="3.10.0" />
   </ItemGroup>
-  <ItemGroup>
-    <Compile Include="TestMobileProvisionIndex.cs" />
-  </ItemGroup>
   <ItemGroup>
     <None Include="TestData\Provisioning Profiles\29cbf4b4-a170-4c74-a29a-64ecd55b102e.mobileprovision" />
     <None Include="TestData\Provisioning Profiles\7079f389-6ff4-4290-bf76-c8a222947616.mobileprovision" />
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="TestData\" />
-    <Folder Include="TestData\Provisioning Profiles\" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Xamarin.MacDev\Xamarin.MacDev.csproj">
-      <Project>{CC3D9353-20C4-467A-8522-A9DED6F0C753}</Project>
-      <Name>Xamarin.MacDev</Name>
-    </ProjectReference>
+    <ProjectReference Include="..\Xamarin.MacDev\Xamarin.MacDev.csproj" />
   </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-</Project>
\ No newline at end of file
+</Project>
diff --git a/Xamarin.MacDev/Xamarin.MacDev.csproj b/Xamarin.MacDev/Xamarin.MacDev.csproj
index d74c77d..6ddcc72 100644
--- a/Xamarin.MacDev/Xamarin.MacDev.csproj
+++ b/Xamarin.MacDev/Xamarin.MacDev.csproj
@@ -1,35 +1,9 @@
 <?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>{CC3D9353-20C4-467A-8522-A9DED6F0C753}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <RootNamespace>Xamarin.MacDev</RootNamespace>
-    <AssemblyName>Xamarin.MacDev</AssemblyName>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-  </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>
-    <ConsolePause>false</ConsolePause>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>full</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release</OutputPath>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <ConsolePause>false</ConsolePause>
+    <TargetFrameworks>net461</TargetFrameworks>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="MicroBuild.Core" Version="0.3.0">
@@ -42,46 +16,4 @@
       <Authenticode>Microsoft400</Authenticode>
     </FilesToSign>
   </ItemGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml" />
-    <Reference Include="Mono.Posix" />
-    <Reference Include="System.Xml.Linq" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="AnalyticsService.cs" />
-    <Compile Include="AppleCodeSigningIdentity.cs" />
-    <Compile Include="AppleIPhoneSdk.cs" />
-    <Compile Include="AppleSdk.cs" />
-    <Compile Include="AppleSdkSettings.cs" />
-    <Compile Include="AppleTVOSSdk.cs" />
-    <Compile Include="AppleWatchSdk.cs" />
-    <Compile Include="EntitlementExtensions.cs" />
-    <Compile Include="ExtendedVersion.cs" />
-    <Compile Include="HttpMessageHandler.cs" />
-    <Compile Include="IMonoMacSdk.cs" />
-    <Compile Include="IPhoneArchitecture.cs" />
-    <Compile Include="IPhoneCertificate.cs" />
-    <Compile Include="IPhoneDeviceCapabilities.cs" />
-    <Compile Include="IPhoneDeviceType.cs" />
-    <Compile Include="IPhoneImageSizes.cs" />
-    <Compile Include="IPhoneSdkVersion.cs" />
-    <Compile Include="Keychain.cs" />
-    <Compile Include="LoggingService.cs" />
-    <Compile Include="MacOSXSdk.cs" />
-    <Compile Include="MacOSXSdkVersion.cs" />
-    <Compile Include="ManifestExtensions.cs" />
-    <Compile Include="MobileProvision.cs" />
-    <Compile Include="MobileProvisionIndex.cs" />
-    <Compile Include="MonoMacSdk.cs" />
-    <Compile Include="MonoTouchSdk.cs" />
-    <Compile Include="PlatformAvailability.cs" />
-    <Compile Include="PListObject.cs" />
-    <Compile Include="ProcessArgumentBuilder.cs" />
-    <Compile Include="SQLite.cs" />
-    <Compile Include="XamMacSdk.cs" />
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
 </Project>

From 64a9c8bcce096e2a0ce2f608a5a458638e605fe3 Mon Sep 17 00:00:00 2001
From: Rolf Bjarne Kvinge <rolf@xamarin.com>
Date: Wed, 18 Dec 2019 13:28:14 +0100
Subject: [PATCH 3/3] Build for netstandard2.0.

---
 Xamarin.MacDev/Xamarin.MacDev.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Xamarin.MacDev/Xamarin.MacDev.csproj b/Xamarin.MacDev/Xamarin.MacDev.csproj
index 6ddcc72..a210116 100644
--- a/Xamarin.MacDev/Xamarin.MacDev.csproj
+++ b/Xamarin.MacDev/Xamarin.MacDev.csproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net461</TargetFrameworks>
+    <TargetFrameworks>net461;netstandard2.0</TargetFrameworks>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
   </PropertyGroup>