(GH-321) Use .Net Core 3 Preview 6

Author: punker76

appveyor.yml

@@ -18,16 +18,17 @@ environment:
     secure: BSPdW2TgnQtoQXXbeDECug==
 
 skip_tags: true
-image: Visual Studio 2019 Preview
+image: Visual Studio 2019
 configuration: Release
 test: off
 
-# Install dotnet core 3.0 latest (alpha!!), as this is not provided on AppVeyor yet
 install:
+  - cinst netfx-4.7-devpack
   #- ps: Start-FileDownload 'https://dotnetcli.blob.core.windows.net/dotnet/Sdk/master/dotnet-sdk-latest-win-x64.exe'
   #- ps: Start-Process .\dotnet-sdk-latest-win-x64.exe "/install /norestart /quiet /log sdkinstall.log" -NoNewWindow -Wait
   #- ps: Start-FileDownload 'https://download.visualstudio.microsoft.com/download/pr/4032ceb5-61cd-495a-ab25-475aa2232f28/7eb614e777d87ef0d49f86be4fc8bbde/dotnet-sdk-3.0.100-preview4-011223-win-x64.exe'
   #- ps: Start-Process .\dotnet-sdk-3.0.100-preview4-011223-win-x64.exe "/install /norestart /quiet /log sdkinstall.log" -NoNewWindow -Wait
+  # Install dotnet core 3.0 latest (alpha!!), as this is not provided on AppVeyor yet
   - cinst dotnetcore-sdk --pre
 
 pull_requests:

src/Directory.build.props

@@ -15,12 +15,12 @@
 
     <!-- Add the references for all projects and targets -->
     <ItemGroup>
-        <PackageReference Include="JetBrains.Annotations" Version="2018.*" PrivateAssets="All" />
+        <PackageReference Include="JetBrains.Annotations" Version="2019.*" PrivateAssets="All" />
     </ItemGroup>
 
     <ItemGroup>
-        <None Remove="**\*.png;**\*.jpg;**\*.ico"/>
-        <Resource Include="**\*.png;**\*.jpg;**\*.ico"/>
+        <None Remove="**\*.png;**\*.jpg;**\*.ico" />
+        <Resource Include="**\*.png;**\*.jpg;**\*.ico" />
     </ItemGroup>
 
     <!-- SourceLink -->

src/GongSolutions.WPF.DragDrop/Directory.build.targets

@@ -1,7 +1,7 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
     <!-- NuGet -->
-    <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
+    <PropertyGroup>
         <Authors>Jan Karger, Steven Kirk, mitchell.jon</Authors>
         <PackageId>gong-wpf-dragdrop</PackageId>
         <PackageLicenseFile>LICENSE</PackageLicenseFile>
@@ -23,8 +23,8 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <None Include="..\..\LICENSE" Pack="true" PackagePath=""/>
+        <None Include="..\..\LICENSE" Pack="true" PackagePath="" />
     </ItemGroup>
 
-    <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.targets', '$(MSBuildThisFileDirectory)../'))"/>
+    <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.targets', '$(MSBuildThisFileDirectory)../'))" />
 </Project>

src/Showcase/Showcase.WPF.DragDrop.csproj

@@ -14,7 +14,7 @@
         <ApplicationManifest>app.manifest</ApplicationManifest>
     </PropertyGroup>
     <ItemGroup>
-        <ProjectReference Include="..\GongSolutions.WPF.DragDrop\GongSolutions.WPF.DragDrop.csproj"/>
+        <ProjectReference Include="..\GongSolutions.WPF.DragDrop\GongSolutions.WPF.DragDrop.csproj" />
     </ItemGroup>
     <!-- reference includes -->
     <ItemGroup>
@@ -24,8 +24,8 @@
         <PackageReference Include="Faker.Net" Version="1.*" />
     </ItemGroup>
     <ItemGroup>
-        <None Include="app.manifest"/>
-        <None Remove="App.config"/>
+        <None Include="app.manifest" />
+        <None Remove="App.config" />
     </ItemGroup>
     <ItemGroup Condition="'$(TargetFramework)' != 'netcoreapp3.0'">
         <AppConfigWithTargetPath Include="App.$(TargetFramework).config">

src/global.json

@@ -1,5 +1,5 @@
 {
     "sdk": {
-        "version": "3.0.100-preview5"
+        "version": "3.0.100-preview6"
     }
 }