Skip to content
This repository was archived by the owner on Sep 3, 2024. It is now read-only.

Commit c58a804

Browse files
thefringeninjathefringeninja
committed
getting the solution compatible with netstandard1.6
1 parent a440cc0 commit c58a804

8 files changed

Lines changed: 626 additions & 898 deletions

File tree

‎src/SqlStreamStore.HAL.Demo/Properties/AssemblyInfo.cs‎

Lines changed: 0 additions & 39 deletions
This file was deleted.

‎src/SqlStreamStore.HAL.Demo/SqlStreamStore.HAL.Demo.csproj‎

Lines changed: 15 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -1,83 +1,24 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
1+
<Project Sdk="Microsoft.NET.Sdk">
42
<PropertyGroup>
5-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
6-
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
7-
<ProjectGuid>{40942079-7C9C-4CC4-A8DA-A6643F03D82A}</ProjectGuid>
8-
<ProjectTypeGuids>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
9-
<OutputType>Exe</OutputType>
10-
<AppDesignerFolder>Properties</AppDesignerFolder>
11-
<RootNamespace>SqlStreamStore.HAL.Demo</RootNamespace>
3+
<TargetFrameworks>netcoreapp1.0</TargetFrameworks>
124
<AssemblyName>SqlStreamStore.HAL.Demo</AssemblyName>
13-
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
14-
<FileAlignment>512</FileAlignment>
15-
</PropertyGroup>
16-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
17-
<PlatformTarget>AnyCPU</PlatformTarget>
5+
<PackageId>SqlStreamStore.HAL.Demo</PackageId>
6+
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
7+
<GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
8+
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
9+
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
10+
<GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute>
11+
<GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
12+
<GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
13+
<GenerateAssemblyInformationalVersionAttribute>false</GenerateAssemblyInformationalVersionAttribute>
1814
<DebugSymbols>true</DebugSymbols>
19-
<DebugType>full</DebugType>
20-
<Optimize>false</Optimize>
21-
<OutputPath>bin\Debug\</OutputPath>
22-
<DefineConstants>DEBUG;TRACE</DefineConstants>
23-
<ErrorReport>prompt</ErrorReport>
24-
<WarningLevel>4</WarningLevel>
25-
</PropertyGroup>
26-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
27-
<PlatformTarget>AnyCPU</PlatformTarget>
28-
<DebugType>pdbonly</DebugType>
29-
<Optimize>true</Optimize>
30-
<OutputPath>bin\Release\</OutputPath>
31-
<DefineConstants>TRACE</DefineConstants>
32-
<ErrorReport>prompt</ErrorReport>
33-
<WarningLevel>4</WarningLevel>
15+
<RuntimeFrameworkVersion>1.0.4</RuntimeFrameworkVersion>
3416
</PropertyGroup>
3517
<ItemGroup>
36-
<Reference Include="Microsoft.Owin, Version=3.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35">
37-
<HintPath>..\packages\Microsoft.Owin.3.0.1\lib\net45\Microsoft.Owin.dll</HintPath>
38-
</Reference>
39-
<Reference Include="Nowin, Version=0.25.0.0, Culture=neutral, PublicKeyToken=null">
40-
<HintPath>..\packages\Nowin.0.25.0\lib\net45\Nowin.dll</HintPath>
41-
</Reference>
42-
<Reference Include="Owin, Version=1.0.0.0, Culture=neutral, PublicKeyToken=f0ebd12fd5e55cc5">
43-
<HintPath>..\packages\Owin.1.0\lib\net40\Owin.dll</HintPath>
44-
</Reference>
45-
<Reference Include="Serilog, Version=2.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10">
46-
<HintPath>..\packages\Serilog.2.4.0\lib\net46\Serilog.dll</HintPath>
47-
</Reference>
48-
<Reference Include="Serilog.Sinks.ColoredConsole, Version=2.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10">
49-
<HintPath>..\packages\Serilog.Sinks.ColoredConsole.2.0.0\lib\net45\Serilog.Sinks.ColoredConsole.dll</HintPath>
50-
</Reference>
51-
<Reference Include="SqlStreamStore, Version=0.6.0.0, Culture=neutral, PublicKeyToken=null">
52-
<HintPath>..\packages\SqlStreamStore.0.7.1\lib\net46\SqlStreamStore.dll</HintPath>
53-
</Reference>
54-
<Reference Include="System" />
55-
<Reference Include="System.Core" />
56-
<Reference Include="System.Data" />
57-
</ItemGroup>
58-
<ItemGroup>
59-
<Compile Include="Program.cs" />
60-
<Compile Include="Properties\AssemblyInfo.cs" />
61-
<Compile Include="SeedData.cs" />
62-
</ItemGroup>
63-
<ItemGroup>
64-
<Content Include="packages.config" />
65-
</ItemGroup>
66-
<ItemGroup>
67-
<ProjectReference Include="..\SqlStreamStore.HAL\SqlStreamStore.HAL.csproj">
68-
<Project>{022329C2-F59B-4350-8242-003CE480CD84}</Project>
69-
<Name>SqlStreamStore.HAL</Name>
70-
</ProjectReference>
18+
<ProjectReference Include="..\SqlStreamStore.HAL\SqlStreamStore.HAL.csproj" />
7119
</ItemGroup>
7220
<ItemGroup>
73-
<None Include="packages.config" />
21+
<PackageReference Include="Serilog" Version="2.4.0" />
22+
<PackageReference Include="Serilog.Sinks.ColoredConsole" Version="2.0.0" />
7423
</ItemGroup>
75-
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
76-
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
77-
Other similar extension points exist, see Microsoft.Common.targets.
78-
<Target Name="BeforeBuild">
79-
</Target>
80-
<Target Name="AfterBuild">
81-
</Target>
82-
-->
8324
</Project>

‎src/SqlStreamStore.HAL.Tests/Properties/AssemblyInfo.cs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66
// associated with an assembly.
77

88
[assembly: AssemblyTitle("SqlStreamStore.HAL.Tests")]
9-
[assembly: AssemblyDescription("")]
10-
[assembly: AssemblyConfiguration("")]
119
[assembly: AssemblyCompany("")]
1210
[assembly: AssemblyProduct("SqlStreamStore.HAL.Tests")]
1311
[assembly: AssemblyCopyright("Copyright © 2017")]

‎src/SqlStreamStore.HAL.Tests/SqlStreamStore.HAL.Tests.csproj‎

Lines changed: 26 additions & 82 deletions
Original file line numberDiff line numberDiff line change
@@ -1,93 +1,37 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
1+
<Project Sdk="Microsoft.NET.Sdk">
42
<PropertyGroup>
5-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
6-
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
7-
<ProjectGuid>{A2F4657C-2C11-44E8-8E19-A44AF9AE543D}</ProjectGuid>
8-
<OutputType>Library</OutputType>
9-
<AppDesignerFolder>Properties</AppDesignerFolder>
10-
<RootNamespace>SqlStreamStore.HAL.Tests</RootNamespace>
3+
<TargetFrameworks>netcoreapp1.0;net461</TargetFrameworks>
114
<AssemblyName>SqlStreamStore.HAL.Tests</AssemblyName>
12-
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
13-
<FileAlignment>512</FileAlignment>
14-
</PropertyGroup>
15-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
5+
<PackageId>SqlStreamStore.HAL.Tests</PackageId>
6+
<GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
7+
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
8+
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
9+
<GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute>
10+
<GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
11+
<GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
12+
<GenerateAssemblyInformationalVersionAttribute>false</GenerateAssemblyInformationalVersionAttribute>
1613
<DebugSymbols>true</DebugSymbols>
17-
<DebugType>full</DebugType>
18-
<Optimize>false</Optimize>
19-
<OutputPath>bin\Debug\</OutputPath>
20-
<DefineConstants>DEBUG;TRACE</DefineConstants>
21-
<ErrorReport>prompt</ErrorReport>
22-
<WarningLevel>4</WarningLevel>
23-
</PropertyGroup>
24-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
25-
<DebugType>pdbonly</DebugType>
26-
<Optimize>true</Optimize>
27-
<OutputPath>bin\Release\</OutputPath>
28-
<DefineConstants>TRACE</DefineConstants>
29-
<ErrorReport>prompt</ErrorReport>
30-
<WarningLevel>4</WarningLevel>
14+
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
15+
<RuntimeFrameworkVersion>1.0.4</RuntimeFrameworkVersion>
3116
</PropertyGroup>
3217
<ItemGroup>
33-
<Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed">
34-
<HintPath>..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
35-
</Reference>
36-
<Reference Include="OwinHttpMessageHandler, Version=1.3.6.0, Culture=neutral, PublicKeyToken=null">
37-
<HintPath>..\packages\OwinHttpMessageHandler.1.3.6\lib\net45\OwinHttpMessageHandler.dll</HintPath>
38-
</Reference>
39-
<Reference Include="Shouldly, Version=2.8.2.0, Culture=neutral, PublicKeyToken=6042cbcb05cbc941">
40-
<HintPath>..\packages\Shouldly.2.8.2\lib\net451\Shouldly.dll</HintPath>
41-
</Reference>
42-
<Reference Include="SqlStreamStore, Version=0.6.0.0, Culture=neutral, PublicKeyToken=null">
43-
<HintPath>..\packages\SqlStreamStore.0.7.1\lib\net46\SqlStreamStore.dll</HintPath>
44-
</Reference>
45-
<Reference Include="System" />
46-
<Reference Include="System.Core" />
47-
<Reference Include="Microsoft.CSharp" />
48-
<Reference Include="System.Net.Http" />
49-
<Reference Include="xunit.abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c">
50-
<HintPath>..\packages\xunit.abstractions.2.0.0\lib\net35\xunit.abstractions.dll</HintPath>
51-
</Reference>
52-
<Reference Include="xunit.assert, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c">
53-
<HintPath>..\packages\xunit.assert.2.1.0\lib\dotnet\xunit.assert.dll</HintPath>
54-
</Reference>
55-
<Reference Include="xunit.core, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c">
56-
<HintPath>..\packages\xunit.extensibility.core.2.1.0\lib\dotnet\xunit.core.dll</HintPath>
57-
</Reference>
58-
<Reference Include="xunit.execution.desktop, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c">
59-
<HintPath>..\packages\xunit.extensibility.execution.2.1.0\lib\net45\xunit.execution.desktop.dll</HintPath>
60-
</Reference>
61-
</ItemGroup>
62-
<ItemGroup>
63-
<Compile Include="AllStreamMessageTests.cs" />
64-
<Compile Include="HttpResponseMessageExtensions.cs" />
65-
<Compile Include="Link.cs" />
66-
<Compile Include="LinkAssertionExtensions.cs" />
67-
<Compile Include="MiddlewareFixture.cs" />
68-
<Compile Include="Properties\AssemblyInfo.cs" />
69-
<Compile Include="Resource.cs" />
70-
<Compile Include="StreamMessageTests.cs" />
71-
<Compile Include="StreamNavigationTests.cs" />
18+
<ProjectReference Include="..\SqlStreamStore.HAL\SqlStreamStore.HAL.csproj" />
7219
</ItemGroup>
7320
<ItemGroup>
74-
<Content Include="packages.config" />
21+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
22+
<PackageReference Include="OwinHttpMessageHandler" Version="1.3.8" />
23+
<PackageReference Include="Shouldly" Version="2.8.2" />
24+
<PackageReference Include="xunit" Version="2.3.0-beta2-build3683" />
25+
<PackageReference Include="xunit.runner.visualstudio" Version="2.3.0-beta2-build1317" />
26+
<DotNetCliToolReference Include="dotnet-xunit" Version="2.3.0-beta1-build3642" />
7527
</ItemGroup>
76-
<ItemGroup>
77-
<ProjectReference Include="..\SqlStreamStore.HAL\SqlStreamStore.HAL.csproj">
78-
<Project>{022329C2-F59B-4350-8242-003CE480CD84}</Project>
79-
<Name>SqlStreamStore.HAL</Name>
80-
</ProjectReference>
28+
<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">
29+
<PackageReference Include="System.Net.Http" Version="4.3.2" />
8130
</ItemGroup>
82-
<ItemGroup>
83-
<None Include="packages.config" />
31+
<ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">
32+
<Reference Include="System" />
33+
<Reference Include="System.Net.Http" />
34+
<Reference Include="Microsoft.CSharp" />
8435
</ItemGroup>
85-
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
86-
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
87-
Other similar extension points exist, see Microsoft.Common.targets.
88-
<Target Name="BeforeBuild">
89-
</Target>
90-
<Target Name="AfterBuild">
91-
</Target>
92-
-->
36+
9337
</Project>

‎src/SqlStreamStore.HAL.sln‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SqlStreamStore.HAL", "SqlSt
77
EndProject
88
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SqlStreamStore.HAL.Tests", "SqlStreamStore.HAL.Tests\SqlStreamStore.HAL.Tests.csproj", "{A2F4657C-2C11-44E8-8E19-A44AF9AE543D}"
99
EndProject
10-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SqlStreamStore.HAL.Demo", "SqlStreamStore.HAL.Demo\SqlStreamStore.HAL.Demo.csproj", "{40942079-7C9C-4CC4-A8DA-A6643F03D82A}"
11-
EndProject
1210
Global
1311
GlobalSection(SolutionConfigurationPlatforms) = preSolution
1412
Debug|Any CPU = Debug|Any CPU
@@ -23,10 +21,6 @@ Global
2321
{A2F4657C-2C11-44E8-8E19-A44AF9AE543D}.Debug|Any CPU.Build.0 = Debug|Any CPU
2422
{A2F4657C-2C11-44E8-8E19-A44AF9AE543D}.Release|Any CPU.ActiveCfg = Release|Any CPU
2523
{A2F4657C-2C11-44E8-8E19-A44AF9AE543D}.Release|Any CPU.Build.0 = Release|Any CPU
26-
{40942079-7C9C-4CC4-A8DA-A6643F03D82A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
27-
{40942079-7C9C-4CC4-A8DA-A6643F03D82A}.Debug|Any CPU.Build.0 = Debug|Any CPU
28-
{40942079-7C9C-4CC4-A8DA-A6643F03D82A}.Release|Any CPU.ActiveCfg = Release|Any CPU
29-
{40942079-7C9C-4CC4-A8DA-A6643F03D82A}.Release|Any CPU.Build.0 = Release|Any CPU
3024
EndGlobalSection
3125
GlobalSection(SolutionProperties) = preSolution
3226
HideSolutionNode = FALSE

0 commit comments

Comments
 (0)