Convert to multi-target projects

Generate builds for .net 4.7.2 and .net 6 in a single
nuget package.

12 files changed, 40 insertions, 55 deletions

diff --git a/Mono.Addins.CecilReflector/Mono.Addins.CecilReflector.csproj b/Mono.Addins.CecilReflector/Mono.Addins.CecilReflector.csproj
index 10c4cd5..e764563 100644
--- a/Mono.Addins.CecilReflector/Mono.Addins.CecilReflector.csproj
+++ b/Mono.Addins.CecilReflector/Mono.Addins.CecilReflector.csproj
@@ -35,11 +35,9 @@
     <CheckForOverflowUnderflow>True</CheckForOverflowUnderflow>
     <ConsolePause>False</ConsolePause>
     <DebugSymbols>true</DebugSymbols>
-    <PackOnBuild>True</PackOnBuild>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Mono.Cecil" Version="0.10.1" />
-    <PackageReference Include="NuGet.Build.Packaging" Version="0.2.0" />
     <ProjectReference Include="..\Mono.Addins\Mono.Addins.csproj" />
   </ItemGroup>
 </Project>
diff --git a/Mono.Addins.Gui/Mono.Addins.Gui.csproj b/Mono.Addins.Gui/Mono.Addins.Gui.csproj
index d1b13c1..30c0ce2 100644
--- a/Mono.Addins.Gui/Mono.Addins.Gui.csproj
+++ b/Mono.Addins.Gui/Mono.Addins.Gui.csproj
@@ -18,7 +18,7 @@
     <DebugSymbols>True</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>..\bin</OutputPath>
+    <OutputPath>..\bin\net472</OutputPath>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <CheckForOverflowUnderflow>True</CheckForOverflowUnderflow>
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
     <Optimize>True</Optimize>
-    <OutputPath>..\bin</OutputPath>
+    <OutputPath>..\bin\net472</OutputPath>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <CheckForOverflowUnderflow>True</CheckForOverflowUnderflow>
diff --git a/Mono.Addins.MSBuild/Mono.Addins.MSBuild.csproj b/Mono.Addins.MSBuild/Mono.Addins.MSBuild.csproj
index c73f7a8..548c636 100644
--- a/Mono.Addins.MSBuild/Mono.Addins.MSBuild.csproj
+++ b/Mono.Addins.MSBuild/Mono.Addins.MSBuild.csproj
@@ -11,6 +11,7 @@
     <SignAssembly>True</SignAssembly>
     <AssemblyOriginatorKeyFile>..\mono-addins.snk</AssemblyOriginatorKeyFile>
     <AssemblyVersion>1.0.0.0</AssemblyVersion>
+    <IsPackable>False</IsPackable>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>True</DebugSymbols>
diff --git a/Mono.Addins.Setup/Mono.Addins.Setup.csproj b/Mono.Addins.Setup/Mono.Addins.Setup.csproj
index e64bf6f..a8c8581 100644
--- a/Mono.Addins.Setup/Mono.Addins.Setup.csproj
+++ b/Mono.Addins.Setup/Mono.Addins.Setup.csproj
@@ -15,6 +15,7 @@
     <SchemaVersion>2.0</SchemaVersion>
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
     <AssemblyVersion>1.0.0.0</AssemblyVersion>
+    <DocumentationFile>..\bin\$(TargetFramework)\Mono.Addins.Setup.xml</DocumentationFile>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>True</DebugSymbols>
@@ -26,7 +27,6 @@
     <CheckForOverflowUnderflow>True</CheckForOverflowUnderflow>
     <ConsolePause>False</ConsolePause>
     <NoWarn>1574;1591</NoWarn>
-    <DocumentationFile>..\bin\Mono.Addins.Setup.xml</DocumentationFile>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -38,15 +38,12 @@
     <ConsolePause>False</ConsolePause>
     <DebugSymbols>true</DebugSymbols>
     <NoWarn>1574;1591</NoWarn>
-    <DocumentationFile>..\bin\Mono.Addins.Setup.xml</DocumentationFile>
-    <PackOnBuild>True</PackOnBuild>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="SharpZipLib" Version="1.1.0" />
     <ProjectReference Include="..\Mono.Addins\Mono.Addins.csproj">
       <Private>False</Private>
     </ProjectReference>
-    <PackageReference Include="NuGet.Build.Packaging" Version="0.2.0" />
     <PackageReference Include="System.Net.Http" Version="4.3.4" />
     <PackageReference Include="System.Collections.NonGeneric" Version="4.3.0" />
     <PackageReference Include="System.Collections.Specialized" Version="4.3.0" />
diff --git a/Mono.Addins.sln b/Mono.Addins.sln
index 0ba5458..4b0685a 100644
--- a/Mono.Addins.sln
+++ b/Mono.Addins.sln
@@ -193,8 +193,6 @@ Global
 		{FEC19BDA-4904-4005-8C09-68E82E8BEF6A}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU

 		{FEC19BDA-4904-4005-8C09-68E82E8BEF6A}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU

 		{FEC19BDA-4904-4005-8C09-68E82E8BEF6A}.Release|Any CPU.ActiveCfg = Release|Any CPU

-		{FEC19BDA-4904-4005-8C09-68E82E8BEF6A}.Release|Any CPU.Build.0 = Release|Any CPU

-		{FEC19BDA-4904-4005-8C09-68E82E8BEF6A}.Debug|Any CPU.Build.0 = Debug|Any CPU

 		{25775384-98F2-474A-B943-71A0872DC53B}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU

 		{25775384-98F2-474A-B943-71A0872DC53B}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU

 		{25775384-98F2-474A-B943-71A0872DC53B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

diff --git a/Mono.Addins/Mono.Addins.csproj b/Mono.Addins/Mono.Addins.csproj
index 3134c5e..e782c4e 100644
--- a/Mono.Addins/Mono.Addins.csproj
+++ b/Mono.Addins/Mono.Addins.csproj
@@ -13,6 +13,7 @@
     <PackageId>Mono.Addins</PackageId>
     <Description>Mono.Addins is a framework for creating extensible applications, and for creating add-ins which extend applications.</Description>
     <AssemblyVersion>1.0.0.0</AssemblyVersion>
+    <DocumentationFile>..\bin\$(TargetFramework)\Mono.Addins.xml</DocumentationFile>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>True</DebugSymbols>
@@ -24,7 +25,6 @@
     <CheckForOverflowUnderflow>True</CheckForOverflowUnderflow>
     <ConsolePause>False</ConsolePause>
     <NoWarn>1574;1591</NoWarn>
-    <DocumentationFile>..\bin\Mono.Addins.xml</DocumentationFile>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -36,11 +36,8 @@
     <ConsolePause>False</ConsolePause>
     <DebugSymbols>true</DebugSymbols>
     <NoWarn>1574;1591</NoWarn>
-    <DocumentationFile>..\bin\Mono.Addins.xml</DocumentationFile>
-    <PackOnBuild>True</PackOnBuild>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="NuGet.Build.Packaging" Version="0.2.0" />
     <PackageReference Include="System.Reflection.Emit" Version="4.7.0" />
   </ItemGroup>
   <ItemGroup>
diff --git a/TargetFrameworks.props b/TargetFrameworks.props
index 0cc107f..ef0d91d 100644
--- a/TargetFrameworks.props
+++ b/TargetFrameworks.props
@@ -2,16 +2,13 @@
 <Project>
   <PropertyGroup>
     <InMonoDevelopTree>False</InMonoDevelopTree>
-    <Net6>False</Net6>
     <InMonoDevelopTree Condition="Exists('$(MSBuildThisFileDirectory)..\..\msbuild\MonoDevelop.AfterCommon.props')">True</InMonoDevelopTree>
-    <Net6 Condition="Exists('$(MSBuildThisFileDirectory)..\..\msbuild\Net6.props')">True</Net6>
 
-    <DotNetFrameworkTarget>net461</DotNetFrameworkTarget>
+    <DotNetFrameworkTarget>net472</DotNetFrameworkTarget>
     <DotNetCoreTarget>netstandard2.0</DotNetCoreTarget>
 
-    <TargetFrameworks Condition="!$(Net6)">$(DotNetFrameworkTarget)</TargetFrameworks>
-    <TargetFrameworks Condition="$(Net6)">$(DotNetCoreTarget)</TargetFrameworks>
+    <TargetFrameworks>$(DotNetCoreTarget);$(DotNetFrameworkTarget)</TargetFrameworks>
 
-    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
+    <AppendTargetFrameworkToOutputPath>true</AppendTargetFrameworkToOutputPath>
   </PropertyGroup>
 </Project>
diff --git a/Version.props b/Version.props
index ebc4522..0ab36f4 100644
--- a/Version.props
+++ b/Version.props
@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
-    <PackageVersion>1.3.8</PackageVersion>
+    <PackageVersion>1.3.9</PackageVersion>
     <Authors>Microsoft</Authors>
     <Owners>microsoft, xamarin</Owners>
     <PackageLicenseUrl>https://github.com/mono/mono-addins/blob/main/COPYING</PackageLicenseUrl>
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index b3c68a7..118361f 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -2,8 +2,6 @@ pool:
   name: Hosted Mac Internal Mojave
 
 variables:
-- name: BuildPlatform
-  value: Any CPU
 - name: BuildConfiguration
   value: DebugNoGui
 
@@ -16,33 +14,32 @@ steps:
     script: '$(Build.SourcesDirectory)/bot-provisioning/provisionator-bootstrap.sh $(Build.SourcesDirectory)/bot-provisioning/dependencies.csx'
     workingDirectory: '$(Build.SourcesDirectory)'
 
-- task: NuGetCommand@2
-  inputs:
-    command: 'restore'
-    restoreSolution: 'Mono.Addins.sln'
-    feedsToUse: 'select'
-
-- task: MSBuild@1
+- task: DotNetCoreCLI@2
   displayName: 'Build solution Mono.Addins.sln'
   inputs:
-    solution: Mono.Addins.sln
-    platform: '$(BuildPlatform)'
-    configuration: '$(BuildConfiguration)'
-
-- task: MSBuild@1
-  displayName: 'Test Assemblies Test\UnitTests\bin\Debug\UnitTests.dll'
-  inputs:
-    solution: 'Test/UnitTests/UnitTests.csproj'
-    platform: '$(BuildPlatform)'
-    configuration: '$(BuildConfiguration)'
-    msbuildArguments: '/t:Test'
+    command: build
+    arguments: '/p:Configuration=$(BuildConfiguration)'
 
-- task: PublishTestResults@2
-  displayName: 'Publish Test Results Test\UnitTests\TestResult.xml'
+- task: DotNetCoreCLI@2
+  displayName: 'Generating packages'
   inputs:
-    testResultsFormat: 'NUnit'
-    testResultsFiles: 'Test/UnitTests/TestResult.xml'
-    failTaskOnFailedTests: true
+    command: pack
+    arguments: '/p:Configuration=$(BuildConfiguration)'
+
+#- task: MSBuild@1
+#  displayName: 'Test Assemblies Test\UnitTests\bin\Debug\UnitTests.dll'
+#  inputs:
+#    solution: 'Test/UnitTests/UnitTests.csproj'
+#    platform: '$(BuildPlatform)'
+#    configuration: '$(BuildConfiguration)'
+#    msbuildArguments: '/t:Test'
+#
+#- task: PublishTestResults@2
+#  displayName: 'Publish Test Results Test\UnitTests\TestResult.xml'
+#  inputs:
+#    testResultsFormat: 'NUnit'
+#    testResultsFiles: 'Test/UnitTests/TestResult.xml'
+#    failTaskOnFailedTests: true
 
 - task: CopyFiles@1
   displayName: 'Copy Files to: $(build.artifactstagingdirectory)'
diff --git a/bot-provisioning/dependencies.csx b/bot-provisioning/dependencies.csx
index 5881839..8b5017c 100644
--- a/bot-provisioning/dependencies.csx
+++ b/bot-provisioning/dependencies.csx
@@ -5,4 +5,4 @@ using static Xamarin.Provisioning.ProvisioningScript;
 using System;
 using System.Linq;
 
-Item ("https://xamjenkinsartifact.azureedge.net/build-package-osx-mono/2020-02/99/620cf538206fe0f8cd63d76c502149b331f56f51/MonoFramework-MDK-6.12.0.93.macos10.xamarin.universal.pkg", kind: ItemDependencyKind.AtLeast);
+DotNetSdk("global.json")
\ No newline at end of file
diff --git a/global.json b/global.json
new file mode 100644
index 0000000..e52d340
--- /dev/null
+++ b/global.json
@@ -0,0 +1,5 @@
+{
+  "sdk": {
+    "version": "6.0.101"
+  }
+}
diff --git a/mautil/mautil.csproj b/mautil/mautil.csproj
index 6cb8961..c371024 100644
--- a/mautil/mautil.csproj
+++ b/mautil/mautil.csproj
@@ -7,8 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.30703</ProductVersion>
     <ProjectGuid>{EA2F08DC-8289-4A89-A405-1A70D8B4C569}</ProjectGuid>
-    <TargetFrameworks Condition="!$(Net6)">$(DotNetFrameworkTarget)</TargetFrameworks>
-    <TargetFrameworks Condition="$(Net6)">net6.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;$(DotNetFrameworkTarget)</TargetFrameworks>
     <OutputType>Exe</OutputType>
     <AssemblyName>mautil</AssemblyName>
     <SchemaVersion>2.0</SchemaVersion>
@@ -21,7 +20,7 @@
     <DebugSymbols>True</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>..\bin</OutputPath>
+    <OutputPath>..\bin\net6.0</OutputPath>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <CheckForOverflowUnderflow>True</CheckForOverflowUnderflow>
@@ -30,7 +29,7 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
     <Optimize>True</Optimize>
-    <OutputPath>..\bin</OutputPath>
+    <OutputPath>..\bin\net6.0</OutputPath>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <CheckForOverflowUnderflow>True</CheckForOverflowUnderflow>
@@ -39,12 +38,8 @@
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\Mono.Addins\Mono.Addins.csproj">
-      <Project>{91DD5A2D-9FE3-4C3C-9253-876141874DAD}</Project>
-      <Name>Mono.Addins</Name>
     </ProjectReference>
     <ProjectReference Include="..\Mono.Addins.Setup\Mono.Addins.Setup.csproj">
-      <Project>{A85C9721-C054-4BD8-A1F3-0227615F0A36}</Project>
-      <Name>Mono.Addins.Setup</Name>
     </ProjectReference>
   </ItemGroup>
 </Project>
\ No newline at end of file