Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update project to use .NETStandard #23

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
+16 −100
Open

Update project to use .NETStandard #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
45db8ba
Changed project to .NET Standard, and test project to .NET Framework …
Nov 1, 2018
b515d19
Added back tests removed accidently
Nov 1, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion WindowsInput.Tests/Properties/AssemblyInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;

// General Information about an assembly is controlled through the following
Expand Down
16 changes: 8 additions & 8 deletions WindowsInput.Tests/WindowsInput.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
Expand All @@ -10,7 +10,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>WindowsInput.Tests</RootNamespace>
<AssemblyName>WindowsInput.Tests</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile />
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
Expand Down Expand Up @@ -70,12 +70,6 @@
</Compile>
<Compile Include="UnicodeText\UnicodeTextTests.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\WindowsInput\WindowsInput.csproj">
<Project>{3549CD6F-80F8-450F-B99E-CF0A736B1F2A}</Project>
<Name>WindowsInput</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
<None Include="WindowsInput.Tests.snk" />
Expand All @@ -85,6 +79,12 @@
<DependentUpon>UnicodeTestForm.cs</DependentUpon>
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\WindowsInput\WindowsInput.csproj">
<Project>{3549cd6f-80f8-450f-b99e-cf0a736b1f2a}</Project>
<Name>WindowsInput</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="$(SolutionDir)\.nuget\nuget.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Expand Down
4 changes: 1 addition & 3 deletions WindowsInput/InputSimulator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
using System;

namespace WindowsInput
namespace WindowsInput
{
/// <summary>
/// Implements the <see cref="IInputSimulator"/> interface to simulate Keyboard and Mouse input and provide the state of those input devices.
Expand Down
95 changes: 7 additions & 88 deletions WindowsInput/WindowsInput.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,92 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>9.0.30729</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{3549CD6F-80F8-450F-B99E-CF0A736B1F2A}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>WindowsInput</RootNamespace>
<AssemblyName>WindowsInput</AssemblyName>
<TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<FileUpgradeFlags>
</FileUpgradeFlags>
<UpgradeBackupLocation>
</UpgradeBackupLocation>
<OldToolsVersion>3.5</OldToolsVersion>
<TargetFrameworkProfile>
</TargetFrameworkProfile>
</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>
<DocumentationFile>bin\Debug\WindowsInput.xml</DocumentationFile>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
</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\WindowsInput.xml</DocumentationFile>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<SignAssembly>true</SignAssembly>
</PropertyGroup>
<PropertyGroup>
<DelaySign>false</DelaySign>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<AssemblyOriginatorKeyFile>WindowsInput.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
</ItemGroup>
<ItemGroup>
<Compile Include="IInputSimulator.cs" />
<Compile Include="IMouseSimulator.cs" />
<Compile Include="InputSimulator.cs" />
<Compile Include="MouseButton.cs" />
<Compile Include="MouseSimulator.cs" />
<Compile Include="Native\NativeMethods.cs" />
<Compile Include="Native\HARDWAREINPUT.cs" />
<Compile Include="IInputDeviceStateAdaptor.cs" />
<Compile Include="IInputMessageDispatcher.cs" />
<Compile Include="IKeyboardSimulator.cs" />
<Compile Include="Native\INPUT.cs" />
<Compile Include="InputBuilder.cs" />
<Compile Include="KeyboardSimulator.cs" />
<Compile Include="Native\InputType.cs" />
<Compile Include="Native\KEYBDINPUT.cs" />
<Compile Include="Native\KeyboardFlag.cs" />
<Compile Include="Native\MouseFlag.cs" />
<Compile Include="Native\MOUSEINPUT.cs" />
<Compile Include="Native\MOUSEKEYBDHARDWAREINPUT.cs" />
<Compile Include="WindowsInputDeviceStateAdaptor.cs" />
<Compile Include="WindowsInputMessageDispatcher.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Native\VirtualKeyCode.cs" />
<Compile Include="Native\XButton.cs" />
</ItemGroup>
<ItemGroup>
<None Include="WindowsInput.nuspec" />
<None Include="WindowsInput.snk" />
</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>

</Project>