Fix several build failures (microsoft#93)

Adeian · Jul 9, 2019 · 317b152 · 317b152
1 parent 6e3ded1
commit 317b152
Show file tree

Hide file tree

Showing 11 changed files with 28 additions and 141 deletions.
diff --git a/.gitignore b/.gitignore
@@ -227,4 +227,5 @@ _Pvt_Extensions
 .paket/paket.exe
 
 # FAKE - F# Make
-.fake/
+.fake/
+*.binlog
diff --git a/Application Management/UnhandledExceptionHandling/UnhandledExceptionHandling.netcore.csproj b/Application Management/UnhandledExceptionHandling/UnhandledExceptionHandling.netcore.csproj
@@ -1,6 +1,5 @@
-<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
+<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
   <PropertyGroup>
-    <TargetFrameworks>net472</TargetFrameworks>
     <TargetFramework>netcoreapp3.0</TargetFramework>
     <UseWpf>true</UseWpf>
     <EnableDefaultItems>false</EnableDefaultItems>
@@ -36,8 +35,6 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
-  <ItemGroup>
-  </ItemGroup>
   <ItemGroup>
     <ApplicationDefinition Include="App.xaml">
       <Generator>MSBuild:Compile</Generator>
@@ -80,6 +77,9 @@
   <ItemGroup>
     <None Include="App.config" />
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="System.Diagnostics.EventLog" Version="4.6.0-preview8.19358.3" />
+  </ItemGroup>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,5 +1,5 @@
 <Project>
-   <ItemGroup Condition="$(TargetFramework.StartsWith('net4'))">   
+   <ItemGroup Condition="$(TargetFramework.StartsWith('net4')) And '$(_MicrosoftNetSdkWindowsDesktop)' == 'true'">   
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xaml" />
     <Reference Include="PresentationCore" />

diff --git a/Graphics/AITCodec/cpp/aitcodec.vcxproj b/Graphics/AITCodec/cpp/aitcodec.vcxproj
@@ -62,13 +62,11 @@
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>%(RootDir)%(Directory)\UpdatedInclude;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;AITCODEC_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <PrecompiledHeader>Create</PrecompiledHeader>
       <PrecompiledHeaderFile>precomp.hpp</PrecompiledHeaderFile>
       <WarningLevel>Level2</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
     </ClCompile>
     <Link>
       <AdditionalDependencies>windowscodecs.lib;%(AdditionalDependencies)</AdditionalDependencies>

diff --git a/Migration and Interoperability/HWNDInWPF/wpfapplication1/wpfapplication1.csproj b/Migration and Interoperability/HWNDInWPF/wpfapplication1/wpfapplication1.csproj
@@ -34,9 +34,8 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="hwndInWPF">
-      <HintPath>..\hwndinwpf\Debug\hwndInWPF.dll</HintPath>
-    </Reference>
+    <ProjectReference Include="..\hwndinwpf\hwndInWPF.vcxproj" />
+
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
     <Reference Include="System" />

diff --git a/Migration and Interoperability/HWNDInWPF/wpfapplication1/wpfapplication1.netcore.csproj b/Migration and Interoperability/HWNDInWPF/wpfapplication1/wpfapplication1.netcore.csproj
@@ -35,9 +35,7 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="hwndInWPF">
-      <HintPath>..\hwndinwpf\Debug\hwndInWPF.dll</HintPath>
-    </Reference>
+    <ProjectReference Include="..\hwndinwpf\hwndInWPF.vcxproj" />
   </ItemGroup>
   <ItemGroup>
     <ApplicationDefinition Include="MyApp.xaml">

diff --git a/Migration and Interoperability/Win32Clock/win32clock/win32clock.vcxproj b/Migration and Interoperability/Win32Clock/win32clock/win32clock.vcxproj
@@ -14,7 +14,7 @@
     <ProjectGuid>{8625A303-646D-4D87-BC14-29CD4D079CD9}</ProjectGuid>
     <RootNamespace>win32clock</RootNamespace>
     <Keyword>Win32Proj</Keyword>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
     <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

diff --git a/NuGet.config b/NuGet.config
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This file should be kept in sync across https://www.github.com/dotnet/wpf and dotnet-wpf-int repos. -->
+<configuration>
+  <packageSources>
+    <clear />
+    <add key="myget-fxlab" value="https://dotnet.myget.org/F/dotnet-corefxlab/api/v3/index.json" />
+    <add key="arcade" value="https://dotnetfeed.blob.core.windows.net/dotnet-tools-internal/index.json" />
+    <add key="dotnet-core" value="https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json" />
+    <add key="dotnet-coreclr" value="https://dotnetfeed.blob.core.windows.net/dotnet-coreclr/index.json" />
+    <add key="myget-core" value="https://dotnet.myget.org/F/dotnet-core/api/v3/index.json" />
+    <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
+    <add key="dotnet-wd" value="https://dotnetfeed.blob.core.windows.net/dotnet-windowsdesktop/index.json" />
+    <add key="aspnet-core" value="https://dotnetfeed.blob.core.windows.net/aspnet-aspnetcore/index.json" />
+  </packageSources>
+</configuration>
diff --git a/Speech and Media/UsingSpeech/UsingSpeech.netcore.csproj b/Speech and Media/UsingSpeech/UsingSpeech.netcore.csproj
diff --git a/Visual Layer/DrawingVisual/MyVisualHost.cs b/Visual Layer/DrawingVisual/MyVisualHost.cs
@@ -78,6 +78,7 @@ private System.Windows.Media.DrawingVisual CreateDrawingVisualText()
             // Retrieve the DrawingContext from the DrawingVisual.
             DrawingContext drawingContext = drawingVisual.RenderOpen();
 
+#pragma warning disable CS0618 // 'FormattedText.FormattedText(string, CultureInfo, FlowDirection, Typeface, double, Brush)' is obsolete: 'Use the PixelsPerDip override'
             // Draw a formatted text string into the DrawingContext.
             drawingContext.DrawText(
                 new FormattedText("Click Me!",
@@ -86,6 +87,7 @@ private System.Windows.Media.DrawingVisual CreateDrawingVisualText()
                     new Typeface("Verdana"),
                     36, Brushes.Black),
                 new Point(200, 116));
+#pragma warning enable CS0618 // 'FormattedText.FormattedText(string, CultureInfo, FlowDirection, Typeface, double, Brush)' is obsolete: 'Use the PixelsPerDip override'
 
             // Close the DrawingContext to persist changes to the DrawingVisual.
             drawingContext.Close();

diff --git a/WPFSamples.netcore.sln b/WPFSamples.netcore.sln
@@ -505,8 +505,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VisualsHitTesting.netcore",
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MediaGallery.netcore", "Speech and Media\MediaGallery\MediaGallery.netcore.csproj", "{1028A97F-B4CE-4D46-A73F-AB075355B2FD}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UsingSpeech.netcore", "Speech and Media\UsingSpeech\UsingSpeech.netcore.csproj", "{7A8F578F-002A-4548-849E-E91640929128}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{1114A46F-2963-4B4C-8756-DD517011FBF7}"
 	ProjectSection(SolutionItems) = preProject
 		PerMonitorDPI\Developer Guide - Per Monitor DPI - WPF Preview.docx = PerMonitorDPI\Developer Guide - Per Monitor DPI - WPF Preview.docx
@@ -4590,26 +4588,6 @@ Global
 		{1028A97F-B4CE-4D46-A73F-AB075355B2FD}.Release|Win32.Build.0 = Release|Any CPU
 		{1028A97F-B4CE-4D46-A73F-AB075355B2FD}.Release|x64.ActiveCfg = Release|Any CPU
 		{1028A97F-B4CE-4D46-A73F-AB075355B2FD}.Release|x64.Build.0 = Release|Any CPU
-		{7A8F578F-002A-4548-849E-E91640929128}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7A8F578F-002A-4548-849E-E91640929128}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7A8F578F-002A-4548-849E-E91640929128}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{7A8F578F-002A-4548-849E-E91640929128}.Debug|ARM.Build.0 = Debug|Any CPU
-		{7A8F578F-002A-4548-849E-E91640929128}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{7A8F578F-002A-4548-849E-E91640929128}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{7A8F578F-002A-4548-849E-E91640929128}.Debug|Win32.ActiveCfg = Debug|Any CPU
-		{7A8F578F-002A-4548-849E-E91640929128}.Debug|Win32.Build.0 = Debug|Any CPU
-		{7A8F578F-002A-4548-849E-E91640929128}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{7A8F578F-002A-4548-849E-E91640929128}.Debug|x64.Build.0 = Debug|Any CPU
-		{7A8F578F-002A-4548-849E-E91640929128}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7A8F578F-002A-4548-849E-E91640929128}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7A8F578F-002A-4548-849E-E91640929128}.Release|ARM.ActiveCfg = Release|Any CPU
-		{7A8F578F-002A-4548-849E-E91640929128}.Release|ARM.Build.0 = Release|Any CPU
-		{7A8F578F-002A-4548-849E-E91640929128}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{7A8F578F-002A-4548-849E-E91640929128}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{7A8F578F-002A-4548-849E-E91640929128}.Release|Win32.ActiveCfg = Release|Any CPU
-		{7A8F578F-002A-4548-849E-E91640929128}.Release|Win32.Build.0 = Release|Any CPU
-		{7A8F578F-002A-4548-849E-E91640929128}.Release|x64.ActiveCfg = Release|Any CPU
-		{7A8F578F-002A-4548-849E-E91640929128}.Release|x64.Build.0 = Release|Any CPU
 		{DF1BF5B2-38D8-47B4-9565-2122B982E3A9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{DF1BF5B2-38D8-47B4-9565-2122B982E3A9}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{DF1BF5B2-38D8-47B4-9565-2122B982E3A9}.Debug|ARM.ActiveCfg = Debug|Any CPU
@@ -4982,7 +4960,6 @@ Global
 		{9BF35AE6-1AA0-4DC8-88F2-4365A6B51E13} = {C452BE1A-E17D-49D6-8FC9-6FD31839075D}
 		{76B02080-C991-4A7E-9BB3-7AF9FFDBF6AD} = {C452BE1A-E17D-49D6-8FC9-6FD31839075D}
 		{1028A97F-B4CE-4D46-A73F-AB075355B2FD} = {0DFB8358-1737-4B60-AD1A-52615F605374}
-		{7A8F578F-002A-4548-849E-E91640929128} = {0DFB8358-1737-4B60-AD1A-52615F605374}
 		{DF1BF5B2-38D8-47B4-9565-2122B982E3A9} = {5F15F6B3-3AD7-486A-B21F-27CE3EC2F555}
 		{2E41B158-06CB-4F09-B2A8-67394C3FD22A} = {5F15F6B3-3AD7-486A-B21F-27CE3EC2F555}
 		{B420065D-BD33-4129-8981-7CC055957988} = {455CE1DE-2222-44AC-B93B-6A40A99A3E3D}