Merge pull request #67 from KiKoS0/net-core-branch

Add TargetFramework .NET Core 3.1
XamlAnimatedGif · Jan 4, 2020 · 5beda83 · 5beda83
2 parents 58bd4b9 + 214c215
commit 5beda83
Show file tree

Hide file tree

Showing 7 changed files with 103 additions and 193 deletions.
diff --git a/WpfAnimatedGif.Demo/InputBox.xaml b/WpfAnimatedGif.Demo/InputBox.xaml
@@ -0,0 +1,23 @@
+<Window x:Class="WpfAnimatedGif.Demo.InputBox"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:local="clr-namespace:WpfAnimatedGif.Demo"
+        mc:Ignorable="d"
+        SizeToContent="Height"
+        Title="InputBox" Height="100" Width="300">
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition />
+            <RowDefinition Height="30" />
+            <RowDefinition Height="30" />
+        </Grid.RowDefinitions>
+        <TextBlock Grid.Row="0" x:Name="prompt" Margin="5,3" TextWrapping="Wrap" />
+        <TextBox Grid.Row="1" x:Name="input" Margin="5,3"/>
+        <StackPanel Grid.Row="2" HorizontalAlignment="Right" Orientation="Horizontal">
+            <Button Content="OK" Click="OKButton_Click" IsDefault="True" Margin="5,3" />
+            <Button Content="Cancel" Click="CancelButton_Click" IsCancel="True" Margin="5,3" />
+        </StackPanel>
+    </Grid>
+</Window>
diff --git a/WpfAnimatedGif.Demo/InputBox.xaml.cs b/WpfAnimatedGif.Demo/InputBox.xaml.cs
@@ -0,0 +1,48 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Shapes;
+
+namespace WpfAnimatedGif.Demo
+{
+    /// <summary>
+    /// Interaction logic for InputBox.xaml
+    /// </summary>
+    public partial class InputBox : Window
+    {
+        public InputBox()
+        {
+            InitializeComponent();
+        }
+
+        private void OKButton_Click(object sender, RoutedEventArgs e)
+        {
+            DialogResult = true;
+        }
+
+        private void CancelButton_Click(object sender, RoutedEventArgs e)
+        {
+            DialogResult = false;
+        }
+
+        public static string Show(string prompt, string title)
+        {
+            var w = new InputBox();
+            w.Title = title;
+            w.prompt.Text = prompt;
+            if (w.ShowDialog() is true)
+            {
+                return w.input.Text;
+            }
+
+            return null;
+        }
+    }
+}
diff --git a/WpfAnimatedGif.Demo/MainWindow.xaml.cs b/WpfAnimatedGif.Demo/MainWindow.xaml.cs
@@ -5,7 +5,6 @@
 using System.Windows;
 using System.Windows.Media.Animation;
 using System.Windows.Threading;
-using Microsoft.VisualBasic;
 using Microsoft.Win32;
 
 namespace WpfAnimatedGif.Demo
@@ -245,7 +244,7 @@ private void SetPlayPauseEnabled(bool isPaused)
 
         private void btnOpenUrl_Click(object sender, RoutedEventArgs e)
         {
-            string url = Interaction.InputBox("Enter the URL of the image to load", "Enter URL");
+            string url = InputBox.Show("Enter the URL of the image to load", "Enter URL");
             if (!string.IsNullOrEmpty(url))
             {
                 Images.Add(url);

diff --git a/WpfAnimatedGif.Demo/WpfAnimatedGif.Demo.csproj b/WpfAnimatedGif.Demo/WpfAnimatedGif.Demo.csproj
@@ -1,127 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{F15F23F1-D349-426E-8A05-AEEF1A663599}</ProjectGuid>
     <OutputType>WinExe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>WpfAnimatedGif.Demo</RootNamespace>
-    <AssemblyName>WpfAnimatedGif.Demo</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <TargetFrameworkProfile>Client</TargetFrameworkProfile>
-    <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <WarningLevel>4</WarningLevel>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <UseWPF>true</UseWPF>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
-    <PlatformTarget>x86</PlatformTarget>
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
-    <PlatformTarget>x86</PlatformTarget>
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Microsoft.VisualBasic" />
-    <Reference Include="System" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Windows.Presentation" />
-    <Reference Include="System.Xml" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="System.Xaml">
-      <RequiredTargetFramework>4.0</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="WindowsBase" />
-    <Reference Include="PresentationCore" />
-    <Reference Include="PresentationFramework" />
-  </ItemGroup>
-  <ItemGroup>
-    <ApplicationDefinition Include="App.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </ApplicationDefinition>
-    <Compile Include="TestRelativeUri.xaml.cs">
-      <DependentUpon>TestRelativeUri.xaml</DependentUpon>
-    </Compile>
-    <Page Include="MainWindow.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Compile Include="App.xaml.cs">
-      <DependentUpon>App.xaml</DependentUpon>
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="MainWindow.xaml.cs">
-      <DependentUpon>MainWindow.xaml</DependentUpon>
-      <SubType>Code</SubType>
-    </Compile>
-    <Page Include="TestRelativeUri.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Properties\AssemblyInfo.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <AppDesigner Include="Properties\" />
-  </ItemGroup>
   <ItemGroup>
-    <Resource Include="Images\working.gif" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\WpfAnimatedGif\WpfAnimatedGif.csproj">
-      <Project>{D129789C-3096-4D0B-8DD7-FE24A4DF4B21}</Project>
-      <Name>WpfAnimatedGif</Name>
-    </ProjectReference>
+    <ProjectReference Include="..\WpfAnimatedGif\WpfAnimatedGif.csproj" />
   </ItemGroup>
   <ItemGroup>
-    <Resource Include="Images\bomb.gif" />
+    <Content Include="Images\siteoforigin.gif" CopyToOutputDirectory="PreserveNewest" />
+    <Resource Include="Images\bomb-once.gif" />
+    <Resource Include="Images\Bomb.gif" />
     <Resource Include="Images\earth.gif" />
-    <Resource Include="Images\radar.gif" />
-  </ItemGroup>
-  <ItemGroup>
+    <Resource Include="Images\monster.gif" />
     <Resource Include="Images\nonanimated.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="Images\bomb-once.gif" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="Images\play.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="Images\pause.png" />
-  </ItemGroup>
-  <ItemGroup>
     <Resource Include="Images\partialfirstframe.gif" />
-    <Resource Include="Images\monster.gif" />
-    <Content Include="Images\siteoforigin.gif">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
+    <Resource Include="Images\pause.png" />
+    <Resource Include="Images\play.png" />
+    <Resource Include="Images\radar.gif" />
+    <Resource Include="Images\working.gif" />
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- 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">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
 </Project>
diff --git a/WpfAnimatedGif.sln b/WpfAnimatedGif.sln
@@ -1,11 +1,11 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27703.2035
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.29609.76
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WpfAnimatedGif", "WpfAnimatedGif\WpfAnimatedGif.csproj", "{D129789C-3096-4D0B-8DD7-FE24A4DF4B21}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WpfAnimatedGif", "WpfAnimatedGif\WpfAnimatedGif.csproj", "{D129789C-3096-4D0B-8DD7-FE24A4DF4B21}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WpfAnimatedGif.Demo", "WpfAnimatedGif.Demo\WpfAnimatedGif.Demo.csproj", "{F15F23F1-D349-426E-8A05-AEEF1A663599}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WpfAnimatedGif.Demo", "WpfAnimatedGif.Demo\WpfAnimatedGif.Demo.csproj", "{F15F23F1-D349-426E-8A05-AEEF1A663599}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{0E0CF096-6B3E-4338-9DC7-7A52EE4D4648}"
 	ProjectSection(SolutionItems) = preProject
@@ -22,10 +22,10 @@ Global
 		{D129789C-3096-4D0B-8DD7-FE24A4DF4B21}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
 		{D129789C-3096-4D0B-8DD7-FE24A4DF4B21}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{D129789C-3096-4D0B-8DD7-FE24A4DF4B21}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{F15F23F1-D349-426E-8A05-AEEF1A663599}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
-		{F15F23F1-D349-426E-8A05-AEEF1A663599}.Debug|Mixed Platforms.Build.0 = Debug|x86
-		{F15F23F1-D349-426E-8A05-AEEF1A663599}.Release|Mixed Platforms.ActiveCfg = Release|x86
-		{F15F23F1-D349-426E-8A05-AEEF1A663599}.Release|Mixed Platforms.Build.0 = Release|x86
+		{F15F23F1-D349-426E-8A05-AEEF1A663599}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{F15F23F1-D349-426E-8A05-AEEF1A663599}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{F15F23F1-D349-426E-8A05-AEEF1A663599}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{F15F23F1-D349-426E-8A05-AEEF1A663599}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/WpfAnimatedGif/WpfAnimatedGif.csproj b/WpfAnimatedGif/WpfAnimatedGif.csproj
@@ -1,73 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{D129789C-3096-4D0B-8DD7-FE24A4DF4B21}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>WpfAnimatedGif</RootNamespace>
-    <AssemblyName>WpfAnimatedGif</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <TargetFrameworkProfile>Client</TargetFrameworkProfile>
+    <TargetFrameworks>net35;net40;netcoreapp3.0</TargetFrameworks>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <UseWPF>true</UseWPF>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <DocumentationFile>bin\Release\WpfAnimatedGif.xml</DocumentationFile>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="PresentationCore" />
-    <Reference Include="PresentationFramework" />
-    <Reference Include="System" />
-    <Reference Include="System.Xml" />
-    <Reference Include="WindowsBase" />
-  </ItemGroup>
   <ItemGroup>
-    <Compile Include="AnimationCache.cs" />
-    <Compile Include="Decoding\GifApplicationExtension.cs" />
-    <Compile Include="Decoding\GifBlock.cs" />
-    <Compile Include="Decoding\GifBlockKind.cs" />
-    <Compile Include="Decoding\GifColor.cs" />
-    <Compile Include="Decoding\GifCommentExtension.cs" />
-    <Compile Include="Decoding\GifDecoderException.cs" />
-    <Compile Include="Decoding\GifExtension.cs" />
-    <Compile Include="Decoding\GifFile.cs" />
-    <Compile Include="Decoding\GifFrame.cs" />
-    <Compile Include="Decoding\GifGraphicControlExtension.cs" />
-    <Compile Include="Decoding\GifHeader.cs" />
-    <Compile Include="Decoding\GifHelpers.cs" />
-    <Compile Include="Decoding\GifImageData.cs" />
-    <Compile Include="Decoding\GifImageDescriptor.cs" />
-    <Compile Include="Decoding\GifLogicalScreenDescriptor.cs" />
-    <Compile Include="Decoding\GifPlainTextExtension.cs" />
-    <Compile Include="Decoding\GifTrailer.cs" />
-    <Compile Include="ImageAnimationController.cs" />
-    <Compile Include="ImageBehavior.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
+    <PackageReference Include="jnm2.ReferenceAssemblies.net35" Version="1.0.0">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
+    </PackageReference>
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- 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">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
 </Project>
diff --git a/build.bat b/build.bat
@@ -1 +1,2 @@
-msbuild WpfAnimatedGif.sln /t:Clean /t:Rebuild /property:Configuration=Release
+@echo off
+dotnet build -c Release