Skip to content

Dotnet Core Package #81

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

Merged
merged 6 commits into from
Jan 20, 2020
Merged

Dotnet Core Package #81

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2892cf8
Step 1: Moving to .NET 4.7
Lachee May 12, 2019
0efe05b
.NET Standard 2.0 support.
PJB3005 Aug 27, 2019
0a785fe
Merge pull request #76 from Lachee/master
Lachee Oct 4, 2019
8e49924
Merge branch 'pr/73' into dotnet-core
Lachee Oct 4, 2019
a0724a7
Merge pull request #80 from Lachee/master
Lachee Jan 20, 2020
28cc31f
Fixed dotnet core scripts
Lachee Jan 20, 2020
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
6 changes: 0 additions & 6 deletions DiscordRPC.Example/App.config
View file
Open in desktop

This file was deleted.

141 changes: 8 additions & 133 deletions DiscordRPC.Example/DiscordRPC.Example.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,142 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{37FEE3CF-72FE-4450-A71A-373D3B298F0F}</ProjectGuid>
<OutputType>Exe</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>DiscordRPC.Example</RootNamespace>
<AssemblyName>DiscordRPC.Example</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworks>net45;netcoreapp2.0</TargetFrameworks>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<TargetFrameworkProfile />
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
<DebugSymbols>true</DebugSymbols>
<OutputPath>bin\x86\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<DebugType>full</DebugType>
<PlatformTarget>x86</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
<OutputPath>bin\x86\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<Optimize>true</Optimize>
<DebugType>pdbonly</DebugType>
<PlatformTarget>x86</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
<DebugSymbols>true</DebugSymbols>
<OutputPath>bin\x64\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<DebugType>full</DebugType>
<PlatformTarget>x64</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
<OutputPath>bin\x64\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<Optimize>true</Optimize>
<DebugType>pdbonly</DebugType>
<PlatformTarget>x64</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup>
<StartupObject>
</StartupObject>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Unix-Release|AnyCPU'">
<OutputPath>bin\Unix-Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<Optimize>true</Optimize>
<DebugType>pdbonly</DebugType>
<PlatformTarget>AnyCPU</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Unix-Release|x86'">
<OutputPath>bin\x86\Unix-Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<Optimize>true</Optimize>
<DebugType>pdbonly</DebugType>
<PlatformTarget>x86</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Unix-Release|x64'">
<OutputPath>bin\x64\Unix-Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<Optimize>true</Optimize>
<DebugType>pdbonly</DebugType>
<PlatformTarget>x64</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="System.Data" />
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="Program.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<ProjectReference Include="..\DiscordRPC\DiscordRPC.csproj" />
</ItemGroup>
<ItemGroup>
<None Include="App.config" />
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0-preview.2">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\DiscordRPC\DiscordRPC.csproj">
<Project>{819d20d6-8d88-45c1-a4d2-aa21f10abd19}</Project>
<Name>DiscordRPC</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
<PostBuildEvent>
</PostBuildEvent>
</PropertyGroup>
<!-- 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>
2 changes: 1 addition & 1 deletion DiscordRPC.Example/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ class Program
/// <summary>
/// The pipe to connect too.
/// </summary>
private static int discordPipe = 1;
private static int discordPipe = -1;

/// <summary>
/// The current presence to send to discord.
Expand Down
156 changes: 7 additions & 149 deletions DiscordRPC/DiscordRPC.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,155 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<Project Sdk="Microsoft.NET.Sdk" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{819D20D6-8D88-45C1-A4D2-AA21F10ABD19}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>DiscordRPC</RootNamespace>
<AssemblyName>DiscordRPC</AssemblyName>
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile />
<TargetFrameworks>net35;netstandard2.0</TargetFrameworks>
<NuspecFile>DiscordRPC.nuspec</NuspecFile>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>TRACE;DEBUG</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<LangVersion>5</LangVersion>
<DocumentationFile>bin\Debug\DiscordRPC.xml</DocumentationFile>
</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\DiscordRPC.xml</DocumentationFile>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
<DebugSymbols>true</DebugSymbols>
<OutputPath>bin\x86\Debug\</OutputPath>
<DefineConstants>TRACE;DEBUG</DefineConstants>
<DebugType>full</DebugType>
<PlatformTarget>x86</PlatformTarget>
<LangVersion>5</LangVersion>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
<DocumentationFile>bin\x86\Debug\DiscordRPC.xml</DocumentationFile>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
<OutputPath>bin\x86\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<Optimize>true</Optimize>
<DebugType>pdbonly</DebugType>
<PlatformTarget>x86</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
<DocumentationFile>bin\x86\Release\DiscordRPC.xml</DocumentationFile>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
<DebugSymbols>true</DebugSymbols>
<OutputPath>bin\x64\Debug\</OutputPath>
<DefineConstants>TRACE;DEBUG</DefineConstants>
<DebugType>full</DebugType>
<PlatformTarget>x64</PlatformTarget>
<LangVersion>5</LangVersion>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
<DocumentationFile>bin\x64\Debug\DiscordRPC.xml</DocumentationFile>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
<OutputPath>bin\x64\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<Optimize>true</Optimize>
<DebugType>pdbonly</DebugType>
<PlatformTarget>x64</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<ItemGroup>
<Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>packages\Newtonsoft.Json.12.0.2\lib\net35\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="Configuration.cs" />
<Compile Include="Converters\EnumSnakeCaseConverter.cs" />
<Compile Include="Converters\EnumValueAttribute.cs" />
<Compile Include="DiscordRpcClient.cs" />
<Compile Include="Events.cs" />
<Compile Include="EventType.cs" />
<Compile Include="Exceptions\BadPresenceException.cs" />
<Compile Include="Exceptions\InvalidConfigurationException.cs" />
<Compile Include="Exceptions\StringOutOfRangeException.cs" />
<Compile Include="Exceptions\UninitializedException.cs" />
<Compile Include="Helper\BackoffDelay.cs" />
<Compile Include="Helper\StringTools.cs" />
<Compile Include="IO\Handshake.cs" />
<Compile Include="Exceptions\InvalidPipeException.cs" />
<Compile Include="IO\INamedPipeClient.cs" />
<Compile Include="IO\ManagedNamedPipeClient.cs" />
<Compile Include="IO\Opcode.cs" />
<Compile Include="IO\PipeFrame.cs" />
<Compile Include="Logging\FileLogger.cs" />
<Compile Include="Logging\ConsoleLogger.cs" />
<Compile Include="Logging\ILogger.cs" />
<Compile Include="Logging\LogLevel.cs" />
<Compile Include="Logging\NullLogger.cs" />
<Compile Include="Message\ConnectionFailedMessage.cs" />
<Compile Include="Message\ConnectionEstablishedMessage.cs" />
<Compile Include="Message\PresenceMessage.cs" />
<Compile Include="Message\CloseMessage.cs" />
<Compile Include="Message\JoinMessage.cs" />
<Compile Include="Message\JoinRequestMessage.cs" />
<Compile Include="Message\SpectateMessage.cs" />
<Compile Include="Message\UnsubscribeMsesage.cs" />
<Compile Include="Message\SubscribeMessage.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Registry\IUriSchemeCreator.cs" />
<Compile Include="Registry\MacUriSchemeCreator.cs" />
<Compile Include="Registry\UnixUriSchemeCreator.cs" />
<Compile Include="Registry\UriScheme.cs" />
<Compile Include="Registry\WindowsUriSchemeCreator.cs" />
<Compile Include="RichPresence.cs" />
<Compile Include="RPC\Commands\ICommand.cs" />
<Compile Include="RPC\Commands\CloseCommand.cs" />
<Compile Include="RPC\Commands\RespondCommand.cs" />
<Compile Include="RPC\Commands\PresenceCommand.cs" />
<Compile Include="RPC\Commands\SubscribeCommand.cs" />
<Compile Include="Message\ReadyMessage.cs" />
<Compile Include="RPC\Payload\ClosePayload.cs" />
<Compile Include="RPC\Payload\Command.cs" />
<Compile Include="Message\IMessage.cs" />
<Compile Include="Message\MessageType.cs" />
<Compile Include="Message\ErrorMessage.cs" />
<Compile Include="RPC\Payload\PayloadArgument.cs" />
<Compile Include="RPC\Payload\IPayload.cs" />
<Compile Include="RPC\Payload\PayloadEvent.cs" />
<Compile Include="RPC\RpcConnection.cs" />
<Compile Include="RPC\Payload\ServerEvent.cs" />
<Compile Include="Web\WebRPC.cs" />
<Compile Include="User.cs" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
</ItemGroup>
<ItemGroup>
<None Include="DiscordRPC.nuspec" />
<None Include="packages.config" />
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
<PackageReference Include="Microsoft.Win32.Registry" Version="4.5.0" />
</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>
9 changes: 5 additions & 4 deletions DiscordRPC/DiscordRPC.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<package xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<metadata xmlns="http://schemas.microsoft.com/packaging/21.0.07/nuspec.xsd">
<id>DiscordRichPresence</id>
<version>0.0.0</version>
<version>1.143.0</version>
<authors>Lachee</authors>
<owners>Lachee</owners>
<title>Discord Rich Presence</title>
Expand All @@ -28,8 +28,9 @@ This is an unoffical, non-discord supported library.
</metadata>

<files>
<file src="./bin/Release/DiscordRPC.dll" target="lib\net35" />
<file src="./bin/Release/DiscordRPC.pdb" target="lib\net35" />
<file src="./bin/Release/DiscordRPC.xml" target="lib\net35" />
<file src="./bin/Release/net35/DiscordRPC.dll" target="lib\net35" />
<file src="./bin/Release/net35/DiscordRPC.pdb" target="lib\net35" />
<file src="./bin/Release/netstandard2.0/DiscordRPC.dll" target="lib\netstandard2.0" />
<file src="./bin/Release/netstandard2.0/DiscordRPC.pdb" target="lib\netstandard2.0" />
</files>
</package>
6 changes: 3 additions & 3 deletions DiscordRPC/Properties/AssemblyInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,6 @@
//
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]
// [assembly: AssemblyVersion("1.143.0")]
[assembly: AssemblyVersion("1.143.0")]
[assembly: AssemblyFileVersion("1.143.0")]
Loading