Updated referenced packages

Updated README.md Cleaned up build warnings Updated build scripts
Invisionware · Dec 23, 2018 · f7335e4 · f7335e4
1 parent ba958b3
commit f7335e4
Show file tree

Hide file tree

Showing 13 changed files with 26 additions and 118 deletions.
diff --git a/build.cake b/build.cake
@@ -5,7 +5,7 @@
 
 #l "tools/versionUtils.cake"
 #l "tools/settingsUtils.cake"
-#tool "nuget:?package=NUnit.ConsoleRunner"
+#tool "nuget:?package=NUnit.ConsoleRunner&version=3.9.0"
 
 ///////////////////////////////////////////////////////////////////////////////
 // ARGUMENTS

diff --git a/build.settings.json b/build.settings.json
@@ -27,7 +27,6 @@
 	},
 	"nuget": {
 		"BuildType": "dotnetcore",
-		"PublishType": "nuget",
 		"NuGetConfig": "./src/.nuget/NuGet.config",
 		"FeedUrl": "https://api.nuget.org/v3/index.json",
 		"FeedAPIKey": "NUGETAPIKEY",

diff --git a/build.version.json b/build.version.json
@@ -1 +1 @@
-{"Major":1,"Minor":1,"Build":8,"PreRelease":0,"ReleaseNotes":null,"Semantic":null,"Milestone":null,"CakeVersion":"0.30.0.0","IsPreRelease":false}
+{"major":1,"minor":1,"build":9,"preRelease":0,"releaseNotes":null}
diff --git a/src/AssemblyInfo.Shared.cs b/src/AssemblyInfo.Shared.cs
@@ -27,8 +27,8 @@
 //
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("1.1.8")]
-//[assembly: AssemblyFileVersion("1.1.8")]
+[assembly: AssemblyVersion("1.1.9")]
+//[assembly: AssemblyFileVersion("1.1.9")]
 
 // Setting ComVisible to false makes the types in this assembly not visible
 // to COM components.  If you need to access a type in this assembly from

diff --git a/src/Invisionware.Collections/DictionaryExtensions.cs b/src/Invisionware.Collections/DictionaryExtensions.cs
@@ -19,8 +19,7 @@ public static class DictionaryExtensions
 		public static bool RenameKey<TKey, TValue>(this IDictionary<TKey, TValue> source,
 			TKey oldKey, TKey newKey)
 		{
-			TValue value;
-			if (!source.TryGetValue(oldKey, out value))
+			if (!source.TryGetValue(oldKey, out TValue value))
 				return false;
 
 			source.Remove(oldKey);  // do not change order

diff --git a/src/Invisionware.Collections/Invisionware.Collections.csproj b/src/Invisionware.Collections/Invisionware.Collections.csproj
@@ -9,7 +9,7 @@
 		<GenerateNeutralResourcesLanguageAttribute>false</GenerateNeutralResourcesLanguageAttribute>
 		<Authors>Invisionware</Authors>
 		<PackageProjectUrl>https://github.com/Invisionware/Invisionware.Collections</PackageProjectUrl>
-		<PackageLicenseUrl>https://raw.githubusercontent.com/Invisionware/Invisionware.Collections/master/LICENSE</PackageLicenseUrl>
+		<license>Apache-2.0</license>
 		<PackageIconUrl>https://github.com/Invisionware/Invisionware.Collections/raw/master/logo.png</PackageIconUrl>
 		<Description>Contains various extension methods for collections</Description>
 		<PackageReleaseNotes></PackageReleaseNotes>
@@ -18,6 +18,5 @@
 		<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
 	</PropertyGroup>
 	<ItemGroup>
-		<PackageReference Include="Microsoft.NETCore.Portable.Compatibility" Version="1.0.2" />
 	</ItemGroup>
 </Project>
diff --git a/tests/Invisionware.Collections.Tests/Invisionware.Collections.Tests.csproj b/tests/Invisionware.Collections.Tests/Invisionware.Collections.Tests.csproj
@@ -1,97 +1,21 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\packages\NUnit3TestAdapter.3.8.0-alpha1\build\net35\NUnit3TestAdapter.props" Condition="Exists('..\..\packages\NUnit3TestAdapter.3.8.0-alpha1\build\net35\NUnit3TestAdapter.props')" />
-  <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>{913CA724-9FBC-49E4-991D-D9319B74DA05}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Invisionware.Collections.Tests</RootNamespace>
-    <AssemblyName>Invisionware.Collections.Tests</AssemblyName>
-    <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <SccProjectName>
-    </SccProjectName>
-    <SccLocalPath>
-    </SccLocalPath>
-    <SccAuxPath>
-    </SccAuxPath>
-    <SccProvider>
-    </SccProvider>
-    <NuGetPackageImportStamp>
-    </NuGetPackageImportStamp>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
+
+    <IsPackable>false</IsPackable>
   </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>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="FluentAssertions, Version=4.19.2.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\FluentAssertions.4.19.2\lib\net45\FluentAssertions.dll</HintPath>
-    </Reference>
-    <Reference Include="FluentAssertions.Core, Version=4.19.2.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\FluentAssertions.4.19.2\lib\net45\FluentAssertions.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="nunit.framework, Version=3.6.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\NUnit.3.6.1\lib\net45\nunit.framework.dll</HintPath>
-    </Reference>
-    <Reference Include="Serilog, Version=2.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Serilog.2.4.0\lib\net45\Serilog.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Configuration" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="ListExtensions.Tests.cs" />
-    <Compile Include="EnumerableExtensions.Tests.cs" />
-    <Compile Include="DictionaryExtensions.Tests.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\src\Invisionware.Collections\Invisionware.Collections.csproj">
-      <Project>{c6677d99-fa98-4f79-92e8-8247c54561f1}</Project>
-      <Name>Invisionware.Collections</Name>
-    </ProjectReference>
-  </ItemGroup>
+
   <ItemGroup>
-    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
+    <PackageReference Include="FluentAssertions" Version="5.5.3" />
+    <PackageReference Include="nunit" Version="3.11.0" />
+    <PackageReference Include="NUnit3TestAdapter" Version="3.11.2" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
+    <PackageReference Include="Serilog" Version="2.7.1" />
   </ItemGroup>
+
   <ItemGroup>
-    <None Include="packages.config" />
+    <ProjectReference Include="..\..\src\Invisionware.Collections\Invisionware.Collections.csproj" />
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('..\..\packages\NUnit3TestAdapter.3.8.0-alpha1\build\net35\NUnit3TestAdapter.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\NUnit3TestAdapter.3.8.0-alpha1\build\net35\NUnit3TestAdapter.props'))" />
-  </Target>
-  <!-- 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/tests/Invisionware.Collections.Tests/Properties/AssemblyInfo.cs b/tests/Invisionware.Collections.Tests/Properties/AssemblyInfo.cs
@@ -5,11 +5,7 @@
 // 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("Invisionware.Collections.Tests")]
 [assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("Invisionware.Collections.Tests")]
 [assembly: AssemblyCopyright("Copyright ©  2015")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
@@ -32,5 +28,3 @@
 // 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.9")]
-[assembly: AssemblyVersion("1.0.9")]
-[assembly: AssemblyFileVersion("1.0.9")]
diff --git a/tests/Invisionware.Collections.Tests/packages.config b/tests/Invisionware.Collections.Tests/packages.config
diff --git a/tools/CredentialProvider.VSS.exe b/tools/CredentialProvider.VSS.exe
diff --git a/tools/nuget.exe b/tools/nuget.exe
diff --git a/tools/settingsUtils.cake b/tools/settingsUtils.cake
@@ -1,5 +1,5 @@
-#addin "Cake.Json"
-#addin "nuget:https://www.nuget.org/api/v2?package=Newtonsoft.Json"
+#addin "Cake.Json&version=3.0.1"
+#addin "nuget:?package=Newtonsoft.Json&version=9.0.1"
 using Newtonsoft.Json;
 
 public class SettingsUtils

diff --git a/tools/versionUtils.cake b/tools/versionUtils.cake
@@ -1,7 +1,7 @@
-#addin "Cake.Json"
-#addin "Cake.FileHelpers"
-#addin "nuget:https://www.nuget.org/api/v2?package=Newtonsoft.Json"
-#tool nuget:?package=GitVersion.CommandLine
+#addin "Cake.Json&version=3.0.1"
+#addin "Cake.FileHelpers&version=3.1.0"
+#addin "nuget:?package=Newtonsoft.Json&version=9.0.1"
+#tool "nuget:?package=GitVersion.CommandLine&version=4.0.0"
 
 using Newtonsoft.Json;
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		{"Major":1,"Minor":1,"Build":8,"PreRelease":0,"ReleaseNotes":null,"Semantic":null,"Milestone":null,"CakeVersion":"0.30.0.0","IsPreRelease":false}
		{"major":1,"minor":1,"build":9,"preRelease":0,"releaseNotes":null}