Updated to 1.0.0-rc3 tooling

2017-01-25 22:27:24 -04:00
parent 3bc2520095
commit eb2a946dd6
11 changed files with 36 additions and 57 deletions
--- a/pack.ps1
+++ b/pack.ps1
@@ -1,12 +1,3 @@
-#dotnet restore "src\Discord.Net\Discord.Net.csproj" /p:BuildNumber="$Env:BUILD"
-#dotnet restore "src\Discord.Net.Core\Discord.Net.Core.csproj" /p:BuildNumber="$Env:BUILD"
-#dotnet restore "src\Discord.Net.Commands\Discord.Net.Commands.csproj" /p:BuildNumber="$Env:BUILD"
-#dotnet restore "src\Discord.Net.Rest\Discord.Net.Rest.csproj" /p:BuildNumber="$Env:BUILD"
-#dotnet restore "src\Discord.Net.WebSocket\Discord.Net.WebSocket.csproj" /p:BuildNumber="$Env:BUILD"
-#dotnet restore "src\Discord.Net.Rpc\Discord.Net.Rpc.csproj" /p:BuildNumber="$Env:BUILD"
-#dotnet restore "src\Discord.Net.Providers.WS4Net\Discord.Net.Providers.WS4Net.csproj" /p:BuildNumber="$Env:BUILD"
-#dotnet restore "src\Discord.Net.Providers.UdpClient\Discord.Net.Providers.UdpClient.csproj" /p:BuildNumber="$Env:BUILD"
-
 dotnet pack "src\Discord.Net\Discord.Net.csproj" -c "Release" -o "../../artifacts" --no-build /p:BuildNumber="$Env:BUILD"
 dotnet pack "src\Discord.Net.Core\Discord.Net.Core.csproj" -c "Release" -o "../../artifacts" --no-build /p:BuildNumber="$Env:BUILD"
 dotnet pack "src\Discord.Net.Commands\Discord.Net.Commands.csproj" -c "Release" -o "../../artifacts" --no-build /p:BuildNumber="$Env:BUILD"
--- a/src/Discord.Net.Commands/Discord.Net.Commands.csproj
+++ b/src/Discord.Net.Commands/Discord.Net.Commands.csproj
@@ -1,8 +1,9 @@
 <Project ToolsVersion="15.0" Sdk="Microsoft.NET.Sdk" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <Description>A Discord.Net extension adding support for bot commands.</Description>
-    <VersionPrefix Condition="'$(BuildNumber)' == ''">1.0.0-rc-dev</VersionPrefix>
-    <VersionPrefix Condition="'$(BuildNumber)' != ''">1.0.0-rc-$(BuildNumber)</VersionPrefix>
+    <VersionPrefix>1.0.0</VersionPrefix>
+    <VersionSuffix Condition="'$(BuildNumber)' == ''">rc-dev</VersionSuffix>
+    <VersionSuffix Condition="'$(BuildNumber)' != ''">rc-$(BuildNumber)</VersionSuffix>
    <TargetFrameworks>netstandard1.1;netstandard1.3</TargetFrameworks>
    <AssemblyName>Discord.Net.Commands</AssemblyName>
    <PackageTags>discord;discordapp</PackageTags>
@@ -11,10 +12,8 @@
    <RepositoryType>git</RepositoryType>
    <RepositoryUrl>git://github.com/RogueException/Discord.Net</RepositoryUrl>
    <RootNamespace>Discord.Commands</RootNamespace>
+    <DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
  </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="**\*.cs" />
-  </ItemGroup>
  <ItemGroup>
    <ProjectReference Include="..\Discord.Net.Core\Discord.Net.Core.csproj" />
  </ItemGroup>
--- a/src/Discord.Net.Core/Discord.Net.Core.csproj
+++ b/src/Discord.Net.Core/Discord.Net.Core.csproj
@@ -1,8 +1,9 @@
 <Project ToolsVersion="15.0" Sdk="Microsoft.NET.Sdk" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <Description>A .Net API wrapper and bot framework for Discord.</Description>
-    <VersionPrefix Condition="'$(BuildNumber)' == ''">1.0.0-rc-dev</VersionPrefix>
-    <VersionPrefix Condition="'$(BuildNumber)' != ''">1.0.0-rc-$(BuildNumber)</VersionPrefix>
+    <VersionPrefix>1.0.0</VersionPrefix>
+    <VersionSuffix Condition="'$(BuildNumber)' == ''">rc-dev</VersionSuffix>
+    <VersionSuffix Condition="'$(BuildNumber)' != ''">rc-$(BuildNumber)</VersionSuffix>
    <TargetFrameworks>netstandard1.1;netstandard1.3</TargetFrameworks>
    <AssemblyName>Discord.Net.Core</AssemblyName>
    <PackageTags>discord;discordapp</PackageTags>
@@ -11,10 +12,8 @@
    <RepositoryType>git</RepositoryType>
    <RepositoryUrl>git://github.com/RogueException/Discord.Net</RepositoryUrl>
    <RootNamespace>Discord</RootNamespace>
+    <DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
  </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="**\*.cs" />
-  </ItemGroup>
  <ItemGroup>
    <PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
    <PackageReference Include="System.Collections.Concurrent" Version="4.3.0" />
--- a/src/Discord.Net.Providers.UdpClient/Discord.Net.Providers.UdpClient.csproj
+++ b/src/Discord.Net.Providers.UdpClient/Discord.Net.Providers.UdpClient.csproj
@@ -1,10 +1,10 @@
 <Project ToolsVersion="15.0" Sdk="Microsoft.NET.Sdk" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <Description>An optional UDP client provider for Discord.Net using System.Net.UdpClient</Description>
-    <VersionPrefix Condition="'$(BuildNumber)' == ''">1.0.0-rc-dev</VersionPrefix>
-    <VersionPrefix Condition="'$(BuildNumber)' != ''">1.0.0-rc-$(BuildNumber)</VersionPrefix>
+    <VersionPrefix>1.0.0</VersionPrefix>
+    <VersionSuffix Condition="'$(BuildNumber)' == ''">rc-dev</VersionSuffix>
+    <VersionSuffix Condition="'$(BuildNumber)' != ''">rc-$(BuildNumber)</VersionSuffix>
    <TargetFrameworks>net45</TargetFrameworks>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
    <AssemblyName>Discord.Net.Providers.UDPClient</AssemblyName>
    <PackageTags>discord;discordapp</PackageTags>
    <PackageProjectUrl>https://github.com/RogueException/Discord.Net</PackageProjectUrl>
@@ -12,10 +12,8 @@
    <RepositoryType>git</RepositoryType>
    <RepositoryUrl>git://github.com/RogueException/Discord.Net</RepositoryUrl>
    <RootNamespace>Discord.Providers.UDPClient</RootNamespace>
+    <DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
  </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="**\*.cs" />
-  </ItemGroup>
  <ItemGroup>
    <ProjectReference Include="..\Discord.Net.Core\Discord.Net.Core.csproj" />
  </ItemGroup>
--- a/src/Discord.Net.Providers.WS4Net/Discord.Net.Providers.WS4Net.csproj
+++ b/src/Discord.Net.Providers.WS4Net/Discord.Net.Providers.WS4Net.csproj
@@ -1,8 +1,9 @@
 <Project ToolsVersion="15.0" Sdk="Microsoft.NET.Sdk" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <Description>An optional WebSocket client provider for Discord.Net using WebSocket4Net</Description>
-    <VersionPrefix Condition="'$(BuildNumber)' == ''">1.0.0-rc-dev</VersionPrefix>
-    <VersionPrefix Condition="'$(BuildNumber)' != ''">1.0.0-rc-$(BuildNumber)</VersionPrefix>
+    <VersionPrefix>1.0.0</VersionPrefix>
+    <VersionSuffix Condition="'$(BuildNumber)' == ''">rc-dev</VersionSuffix>
+    <VersionSuffix Condition="'$(BuildNumber)' != ''">rc-$(BuildNumber)</VersionSuffix>
    <TargetFrameworks>net45</TargetFrameworks>
    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
    <AssemblyName>Discord.Net.Providers.WS4Net</AssemblyName>
@@ -12,10 +13,8 @@
    <RepositoryType>git</RepositoryType>
    <RepositoryUrl>git://github.com/RogueException/Discord.Net</RepositoryUrl>
    <RootNamespace>Discord.Providers.WS4Net</RootNamespace>
+    <DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
  </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="**\*.cs" />
-  </ItemGroup>
  <ItemGroup>
    <ProjectReference Include="..\Discord.Net.Core\Discord.Net.Core.csproj" />
  </ItemGroup>
--- a/src/Discord.Net.Rest/Discord.Net.Rest.csproj
+++ b/src/Discord.Net.Rest/Discord.Net.Rest.csproj
@@ -1,8 +1,9 @@
 <Project ToolsVersion="15.0" Sdk="Microsoft.NET.Sdk" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <Description>A core Discord.Net library containing the REST client and models.</Description>
-    <VersionPrefix Condition="'$(BuildNumber)' == ''">1.0.0-rc-dev</VersionPrefix>
-    <VersionPrefix Condition="'$(BuildNumber)' != ''">1.0.0-rc-$(BuildNumber)</VersionPrefix>
+    <VersionPrefix>1.0.0</VersionPrefix>
+    <VersionSuffix Condition="'$(BuildNumber)' == ''">rc-dev</VersionSuffix>
+    <VersionSuffix Condition="'$(BuildNumber)' != ''">rc-$(BuildNumber)</VersionSuffix>
    <TargetFrameworks>netstandard1.1;netstandard1.3</TargetFrameworks>
    <AssemblyName>Discord.Net.Rest</AssemblyName>
    <PackageTags>discord;discordapp</PackageTags>
@@ -11,11 +12,8 @@
    <RepositoryType>git</RepositoryType>
    <RepositoryUrl>git://github.com/RogueException/Discord.Net</RepositoryUrl>
    <RootNamespace>Discord.Rest</RootNamespace>
+    <DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
  </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="**\*.cs" />
-    <EmbeddedResource Include="**\*.resx" />
-  </ItemGroup>
  <ItemGroup>
    <ProjectReference Include="..\Discord.Net.Core\Discord.Net.Core.csproj" />
  </ItemGroup>
--- a/src/Discord.Net.Rpc/Discord.Net.Rpc.csproj
+++ b/src/Discord.Net.Rpc/Discord.Net.Rpc.csproj
@@ -1,8 +1,9 @@
 <Project ToolsVersion="15.0" Sdk="Microsoft.NET.Sdk" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <Description>A core Discord.Net library containing the RPC client and models.</Description>
-    <VersionPrefix Condition="'$(BuildNumber)' == ''">1.0.0-rc-dev</VersionPrefix>
-    <VersionPrefix Condition="'$(BuildNumber)' != ''">1.0.0-rc-$(BuildNumber)</VersionPrefix>
+    <VersionPrefix>1.0.0</VersionPrefix>
+    <VersionSuffix Condition="'$(BuildNumber)' == ''">rc-dev</VersionSuffix>
+    <VersionSuffix Condition="'$(BuildNumber)' != ''">rc-$(BuildNumber)</VersionSuffix>
    <TargetFrameworks>netstandard1.1;netstandard1.3</TargetFrameworks>
    <AssemblyName>Discord.Net.Rpc</AssemblyName>
    <PackageTags>discord;discordapp</PackageTags>
@@ -11,10 +12,8 @@
    <RepositoryType>git</RepositoryType>
    <RepositoryUrl>git://github.com/RogueException/Discord.Net</RepositoryUrl>
    <RootNamespace>Discord.Rpc</RootNamespace>
+    <DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
  </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="**\*.cs" />
-  </ItemGroup>
  <ItemGroup>
    <Compile Include="..\Discord.Net.WebSocket\Net\DefaultWebSocketClient.cs">
      <Link>Net\DefaultWebSocketClient.cs</Link>
--- a/src/Discord.Net.WebSocket/Discord.Net.WebSocket.csproj
+++ b/src/Discord.Net.WebSocket/Discord.Net.WebSocket.csproj
@@ -1,10 +1,10 @@
 <Project ToolsVersion="15.0" Sdk="Microsoft.NET.Sdk" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <Description>A core Discord.Net library containing the WebSocket client and models.</Description>
-    <VersionPrefix Condition="'$(BuildNumber)' == ''">1.0.0-rc-dev</VersionPrefix>
-    <VersionPrefix Condition="'$(BuildNumber)' != ''">1.0.0-rc-$(BuildNumber)</VersionPrefix>
+    <VersionPrefix>1.0.0</VersionPrefix>
+    <VersionSuffix Condition="'$(BuildNumber)' == ''">rc-dev</VersionSuffix>
+    <VersionSuffix Condition="'$(BuildNumber)' != ''">rc-$(BuildNumber)</VersionSuffix>
    <TargetFrameworks>netstandard1.1;netstandard1.3</TargetFrameworks>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
    <AssemblyName>Discord.Net.WebSocket</AssemblyName>
    <PackageTags>discord;discordapp</PackageTags>
    <PackageProjectUrl>https://github.com/RogueException/Discord.Net</PackageProjectUrl>
@@ -12,10 +12,9 @@
    <RepositoryType>git</RepositoryType>
    <RepositoryUrl>git://github.com/RogueException/Discord.Net</RepositoryUrl>
    <RootNamespace>Discord.WebSocket</RootNamespace>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
  </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="**\*.cs" />
-  </ItemGroup>
  <ItemGroup>
    <ProjectReference Include="..\Discord.Net.Core\Discord.Net.Core.csproj" />
    <ProjectReference Include="..\Discord.Net.Rest\Discord.Net.Rest.csproj" />
--- a/src/Discord.Net/Discord.Net.csproj
+++ b/src/Discord.Net/Discord.Net.csproj
@@ -1,8 +1,9 @@
 <Project ToolsVersion="15.0" Sdk="Microsoft.NET.Sdk" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <Description>An aynchronous API wrapper for Discord. This metapackage includes all of the optional Discord.Net components.</Description>
-    <VersionPrefix Condition="'$(BuildNumber)' == ''">1.0.0-rc-dev</VersionPrefix>
-    <VersionPrefix Condition="'$(BuildNumber)' != ''">1.0.0-rc-$(BuildNumber)</VersionPrefix>
+    <VersionPrefix>1.0.0</VersionPrefix>
+    <VersionSuffix Condition="'$(BuildNumber)' == ''">rc-dev</VersionSuffix>
+    <VersionSuffix Condition="'$(BuildNumber)' != ''">rc-$(BuildNumber)</VersionSuffix>
    <TargetFrameworks>netstandard1.1;netstandard1.3</TargetFrameworks>
    <AssemblyName>Discord.Net</AssemblyName>
    <PackageTags>discord;discordapp</PackageTags>
@@ -11,10 +12,8 @@
    <RepositoryType>git</RepositoryType>
    <RepositoryUrl>git://github.com/RogueException/Discord.Net</RepositoryUrl>
    <RootNamespace>Discord</RootNamespace>
+    <DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
  </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="**\*.cs" />
-  </ItemGroup>
  <ItemGroup>
    <ProjectReference Include="..\Discord.Net.Core\Discord.Net.Core.csproj" />
    <ProjectReference Include="..\Discord.Net.Rest\Discord.Net.Rest.csproj" />
--- a/test.ps1
+++ b/test.ps1
@@ -1,2 +1,2 @@
-dotnet test test/Discord.Net.Tests/Discord.Net.Tests.csproj -c "Release" --noBuild /p:BuildNumber="$Env:BUILD"
+dotnet test test/Discord.Net.Tests/Discord.Net.Tests.csproj -c "Release" --no-build /p:BuildNumber="$Env:BUILD"
 if ($LastExitCode -ne 0) { $host.SetShouldExit($LastExitCode) }
--- a/test/Discord.Net.Tests/Discord.Net.Tests.csproj
+++ b/test/Discord.Net.Tests/Discord.Net.Tests.csproj
@@ -1,11 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
  <PropertyGroup>
+    <OutputType>Exe</OutputType>
    <TargetFramework>netcoreapp1.1</TargetFramework>
    <PackageTargetFallback>$(PackageTargetFallback);portable-net45+win8+wp8+wpa81</PackageTargetFallback>
+    <RootNamespace>Discord</RootNamespace>
  </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="**\*.cs" />
-  </ItemGroup>
  <ItemGroup>
    <ProjectReference Include="../../src/Discord.Net.Commands/Discord.Net.Commands.csproj" />
    <ProjectReference Include="../../src/Discord.Net.Core/Discord.Net.Core.csproj" />
@@ -13,7 +12,6 @@
  </ItemGroup>
  <ItemGroup>
    <PackageReference Include="Akavache" Version="5.0.0" />
-    <PackageReference Include="Microsoft.NETCore.App" Version="1.1.0" />
    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0-preview-20170123-02" />
    <PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
    <PackageReference Include="xunit" Version="2.2.0-beta4-build3444" />