Merge pull request #626 from mjuen/master

Add .NET Core 3.0 target to Caliburn.Micro.Platform

Author: nigel-sampson

azure-pipeline.yml

@@ -29,8 +29,15 @@ steps:
   displayName: Nuget Restore
   inputs:
     solution: '$(coreSolution)'
-    configuration: '$(buildConfiguration)'
     msbuildArgs: '/t:Restore'
+    configuration: '$(buildConfiguration)'
+
+- task: PowerShell@2
+# Workaround for https://github.com/onovotny/MSBuildSdkExtras/issues/174
+  displayName: 'Resource.Designer workaround'
+  inputs:
+    targetType: 'inline'
+    script: 'New-Item -ItemType File -Path .\src\Caliburn.Micro.Core\obj\Release\MonoAndroid80\Resource.Designer.cs -Force'
 
 - task: VSBuild@1
   displayName: Build & Pack Core Solution
@@ -40,12 +47,12 @@ steps:
     platform: '$(buildPlatform)'
     msbuildArgs: '/t:Pack /p:JavaSdkDirectory="$(JAVA_HOME_8_X64)"'
 
-- task: VSTest@2
+- task: DotNetCoreCLI@2
   displayName: Run Unit Tests
   inputs:
-    testAssemblyVer2: 'bin\**\*.Tests.dll'
-    configuration: '$(buildConfiguration)'
-    platform: '$(buildPlatform)'
+    command: test
+    projects: '**/*Test*/*.csproj'
+    arguments: '--configuration $(buildConfiguration) --collect "Code coverage"'
 
 - task: NuGetCommand@2
   displayName: Restore Setup Solution
@@ -83,4 +90,4 @@ steps:
   displayName: Publish Package Artifacts
   inputs:
     pathToPublish: '$(build.artifactStagingDirectory)'
-    artifactName: Packages
+    artifactName: Packages

samples/features/Features.UWP/Features.UWP.csproj

@@ -18,7 +18,7 @@
     <ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <PackageCertificateKeyFile>Features.UWP_TemporaryKey.pfx</PackageCertificateKeyFile>
     <RuntimeIdentifiers>win10-arm;win10-arm-aot;win10-x86;win10-x86-aot;win10-x64;win10-x64-aot</RuntimeIdentifiers>
-    <PackageCertificateThumbprint>B7A25D83EAD631188A9505D2D7C411770734C52B</PackageCertificateThumbprint>
+    <PackageCertificateThumbprint>714bf81d767ae7aa7fcf3bb435b0804ad3eadb05</PackageCertificateThumbprint>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
     <DebugSymbols>true</DebugSymbols>
@@ -268,4 +268,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+</Project>

samples/setup/Setup.Forms/Setup.Forms.Droid/Setup.Forms.Droid.csproj

@@ -18,7 +18,7 @@
     <AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
     <AndroidUseLatestPlatformSdk>true</AndroidUseLatestPlatformSdk>
     <TargetFrameworkVersion>v6.0</TargetFrameworkVersion>
-    <AndroidSupportedAbis>armeabi,armeabi-v7a,x86</AndroidSupportedAbis>
+    <AndroidSupportedAbis>armeabi-v7a,x86</AndroidSupportedAbis>
     <AndroidStoreUncompressedFileExtensions />
     <MandroidI18n />
     <JavaMaximumHeapSize />

src/Caliburn.Micro.Core/Caliburn.Micro.Core.csproj

@@ -7,6 +7,11 @@
     <RootNamespace>Caliburn.Micro</RootNamespace>
   </PropertyGroup>
 
+  <!-- Workaround for https://github.com/onovotny/MSBuildSdkExtras/issues/173 -->
+  <PropertyGroup Label="Android DesignTimeBuild error workaround">
+    <DesignTimeBuild>false</DesignTimeBuild>
+  </PropertyGroup>
+
   <PropertyGroup Condition="'$(TargetFramework)' == 'net45'">
     <AssemblyOriginatorKeyFile>.\..\Caliburn.Micro.snk</AssemblyOriginatorKeyFile>
     <SignAssembly>true</SignAssembly>

src/Caliburn.Micro.Platform.Tests/Caliburn.Micro.Platform.Tests.csproj

@@ -7,6 +7,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.8.0" />
+    <PackageReference Include="System.Windows.Interactivity.WPF" Version="2.0.20525" />
     <PackageReference Include="xunit" Version="2.3.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
     <PackageReference Include="Moq" Version="4.8.3" />
@@ -21,9 +22,6 @@
   <ItemGroup>
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
-    <Reference Include="System.Windows.Interactivity">
-      <HintPath>C:\Program Files (x86)\Microsoft SDKs\Expression\Blend\.NETFramework\v4.5\Libraries\System.Windows.Interactivity.dll</HintPath>
-    </Reference>
     <Reference Include="System.Xaml" />
   </ItemGroup>
 

src/Caliburn.Micro.Platform/ActionMessage.cs

@@ -191,7 +191,7 @@ void ElementLoaded(object sender, RoutedEventArgs e) {
             }
             else currentElement = context.View;
 
-#if NET
+#if NET || NETCORE
             var binding = new Binding {
                 Path = new PropertyPath(Message.HandlerProperty), 
                 Source = currentElement

src/Caliburn.Micro.Platform/Bind.cs

@@ -154,7 +154,7 @@ static void ModelWithoutContextChanged(DependencyObject d, DependencyPropertyCha
         /// </summary>
         /// <param name="dependencyObject">The ui to apply conventions to.</param>
         /// <returns>Whether or not conventions are applied.</returns>
-#if NET
+#if NET || NETCORE
         [AttachedPropertyBrowsableForTypeAttribute(typeof(DependencyObject))]
 #endif
         public static bool GetAtDesignTime(DependencyObject dependencyObject) {

src/Caliburn.Micro.Platform/BindingScope.cs

@@ -169,7 +169,7 @@ public static bool RemoveChildResolver(ChildResolver resolver) {
                     continue;
                 }
 
-#if NET
+#if NET || NETCORE
                 var childCount = (current is Visual || current is Visual3D)
                     ? VisualTreeHelper.GetChildrenCount(current) : 0;
 #else

src/Caliburn.Micro.Platform/Caliburn.Micro.Platform.csproj

@@ -1,12 +1,17 @@
 <Project Sdk="MSBuild.Sdk.Extras">
 
   <PropertyGroup>
-    <TargetFrameworks>net45;uap10.0.16299;Xamarin.iOS10;MonoAndroid80;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net45;uap10.0.16299;Xamarin.iOS10;MonoAndroid80;netstandard2.0;netcoreapp3.0</TargetFrameworks>
     <PackageId>Caliburn.Micro</PackageId>
     <Product>Caliburn.Micro</Product>
     <RootNamespace>Caliburn.Micro</RootNamespace>
   </PropertyGroup>
 
+  <!-- Workaround for https://github.com/onovotny/MSBuildSdkExtras/issues/173 -->
+  <PropertyGroup Label="Android DesignTimeBuild error workaround">
+    <DesignTimeBuild>false</DesignTimeBuild>
+  </PropertyGroup>
+
   <PropertyGroup Condition="'$(TargetFramework)' == 'netstandard2.0' or '$(TargetFramework)' == 'Xamarin.iOS10' or '$(TargetFramework)' == 'MonoAndroid80'">
     <DefineConstants>XFORMS</DefineConstants>
   </PropertyGroup>
@@ -28,7 +33,13 @@
     <Reference Include="PresentationFramework" />
     <Reference Include="System.Xaml" />
     <Reference Include="WindowsBase" />
-    <Compile Include="Platforms\net46\**\*.cs" />
+    <Compile Include="Platforms\net46-netcore\**\*.cs" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0'">
+    <PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.0.1" />
+    <PackageReference Include="Microsoft.WindowsDesktop.App" Version="3.0.0-preview7-27912-14" />
+    <Compile Include="Platforms\net46-netcore\**\*.cs" />
   </ItemGroup>
 
   <ItemGroup Label="Package">
@@ -73,8 +84,4 @@
     <Compile Include="ViewModelLocator.cs" />
   </ItemGroup>
 
-  <ItemGroup>
-    <None Remove="Platforms\net46\AssemblyInfo.cs" />
-  </ItemGroup>
-
 </Project>

src/Caliburn.Micro.Platform/ConventionManager.cs

@@ -177,7 +177,7 @@ public static class ConventionManager {
         /// Determines whether a custom update source trigger should be applied to the binding.
         /// </summary>
         public static Action<DependencyProperty, DependencyObject, Binding, PropertyInfo> ApplyUpdateSourceTrigger = (bindableProperty, element, binding, info) => {
-#if WINDOWS_UWP || NET
+#if WINDOWS_UWP || NET || NETCORE
             binding.UpdateSourceTrigger = UpdateSourceTrigger.PropertyChanged;
 #endif
         };
@@ -363,7 +363,7 @@ public static ElementConvention GetElementConvention(Type elementType) {
         /// Determines whether a particular dependency property already has a binding on the provided element.
         /// </summary>
         public static bool HasBinding(FrameworkElement element, DependencyProperty property) {
-#if NET
+#if NET || NETCORE
             return BindingOperations.GetBindingBase(element, property) != null;
 #else
             return element.GetBindingExpression(property) != null;