Merge pull request #1 from NEventStore/master

Fix: NEventStore#30 fixed assembly version numbers, fixed NEventStore reference,

Changelog.md

@@ -1,5 +1,12 @@
 # NEventStore.Persistence.Sql
 
+## 7.2.0
+
+Fixes incorrect NEventStore reference, assembly version numbers and NuGet package [#30](https://github.com/NEventStore/NEventStore.Persistence.SQL/issues/30)
+
+Please do not use the previous NEventStore.Persistence.Sql 7.1.0 because the package is broken.
+Update to version 7.2.0 as soon as possible.
+
 ## 7.1.0
 
 - Updated NEventStore core library to 7.0.0 (previous 7.0.0 version was still referencing NEventStore version 6.x).

appveyor.yml

@@ -40,7 +40,9 @@ before_build:
 
     dotnet restore ./src/NEventStore.Persistence.Sql.Core.sln --verbosity m
 
-    gitversion /l console /output buildserver /updateAssemblyInfo
+    gitversion /l console /output buildserver /updateassemblyinfo
+
+    gitversion ".\dependencies\NEventStore" /updateassemblyinfo /l console
 build:
   project: src\NEventStore.Persistence.Sql.Core.sln
   verbosity: minimal
@@ -49,7 +51,7 @@ after_build:
     REM dotnet pack ./src/NEventStore.Persistence.Sql/NEventStore.Persistence.Sql.Core.csproj -c %CONFIGURATION% --no-build -o artifacts /p:PackageVersion=%GitVersion_NuGetVersion%
 
     nuget pack ./src/.nuget/NEventStore.Persistence.Sql.nuspec -properties "version=%GitVersion_NuGetVersion%;configuration=%CONFIGURATION%" -OutputDirectory artifacts
-before_test:
+test_script:
 - ps: >-
     $dbName = "NEventStore"
 
@@ -79,9 +81,33 @@ before_test:
     $pgcmd = '"C:\Program Files\PostgreSQL\9.6\bin\createdb" $dbName'
 
     iex "& $pgcmd"
-test:
-  assemblies:
-    except:
-    - NEventStore.Persistence.AcceptanceTests.dll
+
+
+    nunit3-console "C:\projects\neventstore-persistence-sql\src\NEventStore.Persistence.MsSql.Tests\bin\Release\net45\NEventStore.Persistence.MsSql.Tests.dll" "C:\projects\neventstore-persistence-sql\src\NEventStore.Persistence.MySql.Tests\bin\Release\net45\NEventStore.Persistence.MySql.Tests.dll" "C:\projects\neventstore-persistence-sql\src\NEventStore.Persistence.PostgreSql.Tests\bin\Release\net45\NEventStore.Persistence.PostgreSql.Tests.dll" "C:\projects\neventstore-persistence-sql\src\NEventStore.Persistence.Sqlite.Tests\bin\Release\net45\NEventStore.Persistence.Sqlite.Tests.dll" --workers=0 --result=testsresults.xml;
+
+
+    # upload results to AppVeyor
+
+    $wc = New-Object 'System.Net.WebClient'
+
+    $wc.UploadFile("https://ci.appveyor.com/api/testresults/nunit3/$($env:APPVEYOR_JOB_ID)", (Resolve-Path .\testsresults.xml))
+
+
+    # net451 tests need to be run on their own or they'll conflict with net45
+
+
+    nunit3-console "C:\projects\neventstore-persistence-sql\src\NEventStore.Persistence.MsSql.Tests\bin\Release\net451\NEventStore.Persistence.MsSql.Tests.dll" --workers=0 --result=testsresults451.xml;
+
+
+    # upload results to AppVeyor
+
+    $wc = New-Object 'System.Net.WebClient'
+
+    $wc.UploadFile("https://ci.appveyor.com/api/testresults/nunit3/$($env:APPVEYOR_JOB_ID)", (Resolve-Path .\testsresults451.xml))
+
+
+    # todo: fix how dotnet tests are run
+
+    # dotnet test ./src/NEventStore.Persistence.Sql.Core.sln --no-build;
 artifacts:
 - path: '**\artifacts\**\*.*'

src/NEventStore.Persistence.Sql.Core.sln

@@ -10,6 +10,7 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{A05F912F-86CC-4106-BEB4-B1856BCA6739}"
 	ProjectSection(SolutionItems) = preProject
 		.editorconfig = .editorconfig
+		..\appveyor.yml = ..\appveyor.yml
 		..\Changelog.md = ..\Changelog.md
 		.nuget\NEventStore.Persistence.Sql.nuspec = .nuget\NEventStore.Persistence.Sql.nuspec
 	EndProjectSection

src/NEventStore.Persistence.Sql/NEventStore.Persistence.Sql.Core.csproj

@@ -3,8 +3,22 @@
   <PropertyGroup>
     <TargetFrameworks>netstandard2.0;net45;net451</TargetFrameworks>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
-    <AssemblyName>NEventStore.Persistence.Sql</AssemblyName>
     <RootNamespace>NEventStore.Persistence.Sql</RootNamespace>
+    <AssemblyName>NEventStore.Persistence.Sql</AssemblyName>
+    <ApplicationIcon />
+    <OutputType>Library</OutputType>
+    <StartupObject />
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <PackageId>NEventStore.Persistence.SQL</PackageId>
+    <Title>NEventStore SQL Persistence Plugin</Title>
+    <Authors>NEventStore Dev Team</Authors>
+    <PackageProjectUrl>http://neventstore.org</PackageProjectUrl>
+    <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
+    <Description>Additional persistence provider for NEventStore using SQL databases.</Description>
+    <PackageTags>events, event sourcing, cqrs, storage, persistence, database</PackageTags>
+    <PackageReleaseNotes></PackageReleaseNotes>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">

src/NEventStore.Persistence.Sql/Properties/ProjectAssemblyInfo.cs → src/NEventStore.Persistence.Sql/Properties/AssemblyInfo.cs

@@ -1,12 +1,10 @@
 using System.Reflection;
-using System.Runtime.InteropServices;
 
 [assembly: AssemblyTitle("NEventStore.Persistence.Sql")]
 [assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("NEventStore")]
 [assembly: AssemblyCopyright("Copyright © NEventStore Dev Team 2014")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
-[assembly: ComVisible(false)]
-[assembly: Guid("943530EA-7761-4012-84B2-68AAE3B5FC7C")]