Removed explicit target frameworks and created .Net Standard 2.0 instead

Arcidev · Jun 7, 2018 · 7598c9a · 7598c9a
1 parent 5f2acf3
commit 7598c9a
Show file tree

Hide file tree

Showing 24 changed files with 167 additions and 563 deletions.
diff --git a/Arci.Networking.NetCore/Arci.Networking.NetCore.csproj b/Arci.Networking.NetCore/Arci.Networking.NetCore.csproj
diff --git a/Arci.Networking.NetCore/Properties/AssemblyInfo.cs b/Arci.Networking.NetCore/Properties/AssemblyInfo.cs
diff --git a/Arci.Networking.Tests.NetCore/Arci.Networking.Tests.NetCore.csproj b/Arci.Networking.Tests.NetCore/Arci.Networking.Tests.NetCore.csproj
@@ -2,28 +2,28 @@
 
   <PropertyGroup>
     <VersionPrefix>1.4.2</VersionPrefix>
-    <TargetFramework>netcoreapp1.0</TargetFramework>
+    <TargetFramework>netcoreapp2.0</TargetFramework>
     <AssemblyName>Arci.Networking.Tests.NetCore</AssemblyName>
     <PackageId>Arci.Networking.Tests.NetCore</PackageId>
     <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
     <RuntimeIdentifiers>win10-x64;win81-x64</RuntimeIdentifiers>
     <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
     <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
     <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
-    <Version>1.5.0</Version>
+    <Version>1.6.0</Version>
     <Copyright>Copyright ©  2018</Copyright>
   </PropertyGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\Arci.Networking.NetCore\Arci.Networking.NetCore.csproj" />
-  </ItemGroup>
-
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.2.0" />
     <PackageReference Include="xunit" Version="2.2.0" />
   </ItemGroup>
 
+  <ItemGroup>
+    <ProjectReference Include="..\Arci.Networking\Arci.Networking.csproj" />
+  </ItemGroup>
+
   <ItemGroup>
     <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
   </ItemGroup>

diff --git a/Arci.Networking.Tests.UAP/Arci.Networking.Tests.UAP.csproj b/Arci.Networking.Tests.UAP/Arci.Networking.Tests.UAP.csproj
@@ -4,20 +4,20 @@
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
-    <ProjectGuid>{A12A315E-5108-4B08-AA79-82BEBE9832AD}</ProjectGuid>
+    <ProjectGuid>{8EE20DE3-C2B0-43A9-9638-F17BB22AB139}</ProjectGuid>
     <OutputType>AppContainerExe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Arci.Networking.Tests.UAP</RootNamespace>
     <AssemblyName>Arci.Networking.Tests.UAP</AssemblyName>
     <DefaultLanguage>en-US</DefaultLanguage>
     <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
-    <TargetPlatformVersion>10.0.14393.0</TargetPlatformVersion>
-    <TargetPlatformMinVersion>10.0.10586.0</TargetPlatformMinVersion>
-    <MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
+    <TargetPlatformVersion>10.0.17134.0</TargetPlatformVersion>
+    <TargetPlatformMinVersion>10.0.17134.0</TargetPlatformMinVersion>
+    <MinimumVisualStudioVersion>15</MinimumVisualStudioVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <PackageCertificateKeyFile>Arci.Networking.Tests.UAP_TemporaryKey.pfx</PackageCertificateKeyFile>
-    <UnitTestPlatformVersion Condition="'$(UnitTestPlatformVersion)' == ''">14.0</UnitTestPlatformVersion>
+    <UnitTestPlatformVersion Condition="'$(UnitTestPlatformVersion)' == ''">$(VisualStudioVersion)</UnitTestPlatformVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
     <DebugSymbols>true</DebugSymbols>
@@ -88,16 +88,14 @@
     <Prefer32Bit>true</Prefer32Bit>
     <UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
   </PropertyGroup>
+  <PropertyGroup>
+    <RestoreProjectStyle>PackageReference</RestoreProjectStyle>
+  </PropertyGroup>
   <ItemGroup>
-    <!--A reference to the entire .Net Framework and Windows SDK are automatically included-->
-    <None Include="project.json" />
-    <SDKReference Include="MSTestFramework.Universal, Version=$(UnitTestPlatformVersion)" />
     <SDKReference Include="TestPlatform.Universal, Version=$(UnitTestPlatformVersion)" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\Arci.Networking.Tests\BuilderTests\PacketBuilderTests.cs">
-      <Link>BuilderTests\PacketBuilderTests.cs</Link>
-    </Compile>
+    <Compile Include="BuilderTests\PacketBuilderTests.cs" />
     <Compile Include="EncryptionTests\AesTests.cs" />
     <Compile Include="EncryptionTests\RsaTests.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
@@ -129,16 +127,25 @@
     <Content Include="Assets\Wide310x150Logo.scale-200.png" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Arci.Networking.UAP\Arci.Networking.UAP.csproj">
-      <Project>{7cc530c7-a1e3-4f09-b782-75849ff52b72}</Project>
-      <Name>Arci.Networking.UAP</Name>
-    </ProjectReference>
+    <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
+      <Version>6.1.5</Version>
+    </PackageReference>
+    <PackageReference Include="MSTest.TestAdapter">
+      <Version>1.3.2</Version>
+    </PackageReference>
+    <PackageReference Include="MSTest.TestFramework">
+      <Version>1.3.2</Version>
+    </PackageReference>
   </ItemGroup>
   <ItemGroup>
-    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
+    <ProjectReference Include="..\Arci.Networking\Arci.Networking.csproj">
+      <Project>{1F9C6F0F-358B-4487-83D8-40677D6FC3AB}</Project>
+      <Name>Arci.Networking</Name>
+    </ProjectReference>
   </ItemGroup>
-  <PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">
-    <VisualStudioVersion>14.0</VisualStudioVersion>
+  <ItemGroup />
+  <PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '15.0' ">
+    <VisualStudioVersion>15.0</VisualStudioVersion>
   </PropertyGroup>
   <Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

diff --git a/Arci.Networking.Tests.UAP/Arci.Networking.Tests.UAP_TemporaryKey.pfx b/Arci.Networking.Tests.UAP/Arci.Networking.Tests.UAP_TemporaryKey.pfx
diff --git a/Arci.Networking.Tests.UAP/BuilderTests/PacketBuilderTests.cs b/Arci.Networking.Tests.UAP/BuilderTests/PacketBuilderTests.cs
@@ -0,0 +1,42 @@
+using Arci.Networking.Data;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using System;
+using System.Linq;
+
+namespace Arci.Networking.Tests.UAP.BuilderTests
+{
+    [TestClass]
+    public class PacketBuilderTests
+    {
+        [TestMethod]
+        public void TestPacketBuild()
+        {
+            var buildedPacket = new Packet(0).Builder()
+                .WriteBit(false).WriteBit(true).WriteBit(9).FlushBits()
+                .WriteGuidBitStreamInOrder(123456, 1, 2, 3, 4, 5, 6, 7, 0)
+                .Write((byte)1).Write((UInt16)2).Write((UInt32)3).Write((sbyte)4).Write((Int16)5).Write(6)
+                .Write(new byte[] { 7, 8, 9 })
+                .WriteGuidByteStreamInOrder(123456, 1, 2, 3, 4, 5, 6, 7, 0)
+                .Build();
+
+            var packet = new Packet(0);
+            packet.WriteBit(false);
+            packet.WriteBit(true);
+            packet.WriteBit(9);
+            packet.FlushBits();
+            packet.WriteGuidBitStreamInOrder(123456, 1, 2, 3, 4, 5, 6, 7, 0);
+            packet.Write((byte)1);
+            packet.Write((UInt16)2);
+            packet.Write((UInt32)3);
+            packet.Write((sbyte)4);
+            packet.Write((Int16)5);
+            packet.Write(6);
+            packet.Write(new byte[] { 7, 8, 9 });
+            packet.WriteGuidByteStreamInOrder(123456, 1, 2, 3, 4, 5, 6, 7, 0);
+
+            Assert.IsTrue(buildedPacket.Data.SequenceEqual(packet.Data));
+            buildedPacket.Dispose();
+            packet.Dispose();
+        }
+    }
+}
diff --git a/Arci.Networking.Tests.UAP/EncryptionTests/AesTests.cs b/Arci.Networking.Tests.UAP/EncryptionTests/AesTests.cs
@@ -1,12 +1,12 @@
 using Arci.Networking.Data;
 using Arci.Networking.Security;
 using Arci.Networking.Security.AesOptions;
-using Microsoft.VisualStudio.TestPlatform.UnitTestFramework;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 using System.Linq;
 using System.Security.Cryptography;
 using System.Text;
 
-namespace Arci.Networking.Tests.EncryptionTests
+namespace Arci.Networking.Tests.UAP.EncryptionTests
 {
     [TestClass]
     public class AesTests

diff --git a/Arci.Networking.Tests.UAP/EncryptionTests/RsaTests.cs b/Arci.Networking.Tests.UAP/EncryptionTests/RsaTests.cs
@@ -1,10 +1,10 @@
 using Arci.Networking.Security;
-using Microsoft.VisualStudio.TestPlatform.UnitTestFramework;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Shared;
 using System.Linq;
 using System.Text;
 
-namespace Arci.Networking.Tests.EncryptionTests
+namespace Arci.Networking.Tests.UAP.EncryptionTests
 {
     [TestClass]
     public class RsaTests

diff --git a/Arci.Networking.Tests.UAP/Package.appxmanifest b/Arci.Networking.Tests.UAP/Package.appxmanifest
@@ -5,18 +5,18 @@
   xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10"
   IgnorableNamespaces="uap mp">
 
-  <Identity Name="39469f35-5924-46a4-9268-b6b12bd54c62"
+  <Identity Name="1899f8dc-e4f5-45b6-9cbe-b9923616707d"
             Publisher="CN=Andrej"
             Version="1.0.0.0" />
 
-  <mp:PhoneIdentity PhoneProductId="39469f35-5924-46a4-9268-b6b12bd54c62" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
+  <mp:PhoneIdentity PhoneProductId="1899f8dc-e4f5-45b6-9cbe-b9923616707d" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
 
   <Properties>
     <DisplayName>Arci.Networking.Tests.UAP</DisplayName>
     <PublisherDisplayName>Andrej</PublisherDisplayName>
     <Logo>Assets\StoreLogo.png</Logo>
   </Properties>
-  
+
   <Dependencies>
     <TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.0.0" MaxVersionTested="10.0.0.0" />
   </Dependencies>
@@ -25,7 +25,7 @@
     <Resource Language="x-generate" />
   </Resources>
   <Applications>
-    <Application Id="vstest.executionengine.universal.App" 
+    <Application Id="vstest.executionengine.universal.App"
         Executable="$targetnametoken$.exe"
         EntryPoint="Arci.Networking.Tests.UAP.App">
       <uap:VisualElements
@@ -40,6 +40,7 @@
     </Application>
   </Applications>
   <Capabilities>
-    <Capability Name="internetClient" />
-  </Capabilities> 
+    <Capability Name="internetClientServer" />
+    <Capability Name="privateNetworkClientServer" />
+  </Capabilities>
 </Package>
diff --git a/Arci.Networking.Tests.UAP/Properties/AssemblyInfo.cs b/Arci.Networking.Tests.UAP/Properties/AssemblyInfo.cs
@@ -1,10 +1,7 @@
-using System.Reflection;
+using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
 [assembly: AssemblyTitle("Arci.Networking.Tests.UAP")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
@@ -15,16 +12,7 @@
 [assembly: AssemblyCulture("")]
 [assembly: AssemblyMetadata("TargetPlatform","UAP")]
 
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// 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.*")]
-[assembly: AssemblyVersion("1.5.0.0")]
-[assembly: AssemblyFileVersion("1.5.0.0")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
 [assembly: ComVisible(false)]
diff --git a/Arci.Networking.Tests.UAP/project.json b/Arci.Networking.Tests.UAP/project.json
diff --git a/Arci.Networking.Tests/Arci.Networking.Tests.csproj b/Arci.Networking.Tests/Arci.Networking.Tests.csproj
@@ -62,7 +62,7 @@
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Arci.Networking\Arci.Networking.csproj">
-      <Project>{ed123dc2-0a2c-4b87-b723-23aad065d518}</Project>
+      <Project>{1f9c6f0f-358b-4487-83d8-40677d6fc3ab}</Project>
       <Name>Arci.Networking</Name>
     </ProjectReference>
     <ProjectReference Include="..\Shared\Shared.csproj">

diff --git a/Arci.Networking.Tests/Properties/AssemblyInfo.cs b/Arci.Networking.Tests/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // 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.*")]
-[assembly: AssemblyVersion("1.5.0.0")]
-[assembly: AssemblyFileVersion("1.5.0.0")]
+[assembly: AssemblyVersion("1.6.0.0")]
+[assembly: AssemblyFileVersion("1.6.0.0")]