Merge pull request #78 from CityofSantaMonica/multiple-frameworks

v0.9.0 release

DEPLOYMENT.md

@@ -8,12 +8,12 @@ are passing, and you're happy with the state of things...
 
 1. Create a branch named `release`
 1. Update [`ReleaseNotes.md`](ReleaseNotes.md), following the existing format
-1. Bump the version number in [`SolutionInfo.cs`](SolutionInfo.cs) and the `.nuspec` and `appveyor.yml` files (if required)
+1. Bump the version number in [`Directory.build.props`](Directory.build.props) and [`appveyor.yml`](appveyor.yml)
 1. Push the branch to GitHub and create a pull request
-1. Run `.\build CreatePackages` to create the NuGet packages (locally) for the new version
+1. If the build succeeds, accept the pull request
+1. Create and push a tag from the new HEAD `git tag v#.#.#` and `git push --tags`
+1. Create the NuGet packages (in the local solution root) for the new version: `dotnet pack --output ..\`
 1. Test the NuGet packages! [How to install NuGet package locally](http://stackoverflow.com/questions/10240029/how-to-install-a-nuget-package-nupkg-file-locally)
-1. If satisfied with the release, push the new packages up to NuGet
-1. Accept the pull request
-1. Create a tag `git tag v#.#.#`. For example, to create a tag for 1.0.0 `git tag v1.0.0`
 1. [Create a new release](https://help.github.com/articles/creating-releases) using the tag
 you just created and pasting in the release notes you just wrote up. Attach a copy of the latest `.nupkg` files generated above.
+1. Push the new packages up to NuGet `dotnet nuget push`

Directory.build.props

@@ -0,0 +1,11 @@
+<Project>
+  <PropertyGroup>
+    <Company>City of Santa Monica, CA</Company>
+    <Authors>City of Santa Monica, CA</Authors>
+    <Copyright>Copyright 2019 City of Santa Monica, CA</Copyright>
+    <Product>SODA</Product>
+    <RepositoryUrl>https://github.com/CityofSantaMonica/SODA.NET</RepositoryUrl>
+    <PackageLicenseExpression>MIT</PackageLicenseExpression>
+    <Version>0.9.0</Version>
+  </PropertyGroup>
+</Project>

Net45.SODA.Tests/Net45.SODA.Tests.csproj

@@ -0,0 +1,23 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFrameworks>net45</TargetFrameworks>
+
+    <IsPackable>false</IsPackable>
+
+    <AssemblyName>Net45.SODA.Tests</AssemblyName>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="nunit" Version="3.10.1" />
+    <PackageReference Include="NUnit3TestAdapter" Version="3.10.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.8.0" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\SODA\SODA.csproj" />
+  </ItemGroup>
+
+  <Import Project="..\SODA.Tests\SODA.Tests.projitems" Label="Shared" />
+
+</Project>

Net45.Utilities.Tests/Net45.Utilities.Tests.csproj

@@ -0,0 +1,24 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFrameworks>net45</TargetFrameworks>
+
+    <IsPackable>false</IsPackable>
+
+    <AssemblyName>Net45.SODA.Utilities.Tests</AssemblyName>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="nunit" Version="3.10.1" />
+    <PackageReference Include="NUnit3TestAdapter" Version="3.10.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.8.0" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\SODA\SODA.csproj" />
+    <ProjectReference Include="..\Utilities\Utilities.csproj" />
+  </ItemGroup>
+
+  <Import Project="..\Utilities.Tests\Utilities.Tests.projitems" Label="Shared" />
+
+</Project>

NetCore22.SODA.Tests/NetCore22.SODA.Tests.csproj

@@ -0,0 +1,23 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netcoreapp2.2</TargetFramework>
+
+    <IsPackable>false</IsPackable>
+
+    <AssemblyName>NetCore22.SODA.Tests</AssemblyName>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="nunit" Version="3.10.1" />
+    <PackageReference Include="NUnit3TestAdapter" Version="3.10.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.8.0" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\SODA\SODA.csproj" />
+  </ItemGroup>
+
+  <Import Project="..\SODA.Tests\SODA.Tests.projitems" Label="Shared" />
+
+</Project>

NetCore22.Utilities.Tests/NetCore22.Utilities.Tests.csproj

@@ -0,0 +1,25 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netcoreapp2.2</TargetFramework>
+
+    <IsPackable>false</IsPackable>
+
+    <AssemblyName>NetCore22.SODA.Utilities.Tests</AssemblyName>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="nunit" Version="3.10.1" />
+    <PackageReference Include="NUnit3TestAdapter" Version="3.10.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.8.0" />
+    <PackageReference Include="System.Text.Encoding.CodePages" Version="4.5.1" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\SODA\SODA.csproj" />
+    <ProjectReference Include="..\Utilities\Utilities.csproj" />
+  </ItemGroup>
+
+  <Import Project="..\Utilities.Tests\Utilities.Tests.projitems" Label="Shared" />
+
+</Project>

ReleaseNotes.md

@@ -1,3 +1,9 @@
+### New in 0.9.0 (Released 2019/07/24)
+
+New features
+
+  - Support for .NET Core 2.2
+
 ### New in 0.8.0 (Released 2017/12/06)
 
 Bug fixes

SODA.Tests/HumanAddressTests.cs

@@ -28,11 +28,10 @@ public void New_Deserializes_Valid_HumanAddress_Json()
 
         [TestCase("not json")]
         [TestCase(@"{""not"":""a"",""human"":""address""}")]
-        [ExpectedException(typeof(ArgumentOutOfRangeException))]
         [Category("HumanAddress")]
         public void New_Throws_ArgumentOutOfRangeException_For_Invalid_HumanAddress_Json(string input)
         {
-            new HumanAddress(input);
+            Assert.That(() => new HumanAddress(input), Throws.TypeOf<ArgumentOutOfRangeException>());
         }
 
         [Test]

SODA.Tests/PhoneColumnTest.cs

@@ -88,11 +88,10 @@ public void New_Deserializes_PhoneColumn_For_No_Type_Json()
 
         [TestCase("not json")]
         [TestCase(@"{""not"":""a"",""valid"":""phone""}")]
-        [ExpectedException(typeof(ArgumentOutOfRangeException))]
         [Category("PhoneColumn")]
         public void New_Throws_ArgumentOutOfRangeException_For_Invalid_PhoneColumn_Json(string input)
         {
-            new PhoneColumn(input);
+            Assert.That(() => new PhoneColumn(input), Throws.TypeOf<ArgumentOutOfRangeException>());
         }
     }
 }

SODA.Tests/ResourceTests.cs

@@ -70,11 +70,10 @@ public void New_Gets_Metadata_Identifier()
 
         [TestCase(StringMocks.EmptyInput)]
         [TestCase(StringMocks.NullInput)]
-        [ExpectedException(typeof(ArgumentException))]
         [Category("Resource")]
         public void GetRow_With_Invalid_RowId_Throws_ArugmentException(string input)
         {
-            new Resource<object>(mockMetadata).GetRow(input);
+            Assert.That(() => new Resource<object>(mockMetadata).GetRow(input), Throws.TypeOf<ArgumentException>());
         }
     }
 }

SODA.Tests/SODA.Tests.projitems

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
+    <HasSharedItems>true</HasSharedItems>
+    <SharedGUID>1112171d-6a3f-49f6-818a-fb44195ac837</SharedGUID>
+  </PropertyGroup>
+  <PropertyGroup Label="Configuration">
+    <Import_RootNamespace>SODA.Tests</Import_RootNamespace>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="$(MSBuildThisFileDirectory)DateTimeConverterTests.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)FourByFourTests.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)HumanAddressTests.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)JsonSerializationExtensionTests.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)LocationColumnTests.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Mocks\StringMocks.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)PhoneColumnTest.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)ResourceMetadataTests.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)ResourceTests.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)SodaClientTests.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)SodaRequestTests.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)SodaUriTests.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)SoqlQueryTests.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)WebExceptionExtensionTests.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)WebsiteUrlColumnTests.cs" />
+  </ItemGroup>
+</Project>

SODA.Tests/SODA.Tests.shproj

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>1112171d-6a3f-49f6-818a-fb44195ac837</ProjectGuid>
+    <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
+  </PropertyGroup>
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.Default.props" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.props" />
+  <PropertyGroup />
+  <Import Project="SODA.Tests.projitems" Label="Shared" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.CSharp.targets" />
+</Project>