Merge pull request #1 from volosoft/netstandard

Netstandard

Castle.LoggingFacility.MsLogging.sln

@@ -1,20 +1,17 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25123.0
+# Visual Studio 15
+VisualStudioVersion = 15.0.26228.9
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{AB3C9DD7-3D2F-40E1-A81D-A161340E7F89}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{6B430A66-9C45-4B49-9356-A09B981795E3}"
-	ProjectSection(SolutionItems) = preProject
-		global.json = global.json
-	EndProjectSection
-EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Castle.LoggingFacility.MsLogging", "src\Castle.LoggingFacility.MsLogging\Castle.LoggingFacility.MsLogging.xproj", "{7468BC73-0841-4197-98A2-4606C9641744}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{70D1AB18-31FB-4297-9BFA-D03812F8B933}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Castle.LoggingFacility.MsLogging.TestConsoleApp", "test\Castle.LoggingFacility.MsLogging.TestConsoleApp\Castle.LoggingFacility.MsLogging.TestConsoleApp.xproj", "{8DB5588E-9156-4E63-9D56-43BDE237D9D5}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Castle.LoggingFacility.MsLogging", "src\Castle.LoggingFacility.MsLogging\Castle.LoggingFacility.MsLogging.csproj", "{7468BC73-0841-4197-98A2-4606C9641744}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Castle.LoggingFacility.MsLogging.TestConsoleApp", "test\Castle.LoggingFacility.MsLogging.TestConsoleApp\Castle.LoggingFacility.MsLogging.TestConsoleApp.csproj", "{8DB5588E-9156-4E63-9D56-43BDE237D9D5}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

nupkg/pack.ps1

@@ -0,0 +1,31 @@
+# Paths
+$packFolder = (Get-Item -Path "./" -Verbose).FullName
+$slnPath = Join-Path $packFolder "../"
+$srcPath = Join-Path $slnPath "src"
+
+# List of projects
+$projects = (
+    "Castle.LoggingFacility.MsLogging"
+)
+
+# Rebuild solution
+Set-Location $slnPath
+& dotnet msbuild /t:Rebuild /p:Configuration=Release
+
+# Copy all nuget packages to the pack folder
+foreach($project in $projects) {
+
+    $projectFolder = Join-Path $srcPath $project
+
+    # Create nuget pack
+    Set-Location $projectFolder
+    & dotnet msbuild /t:pack /p:Configuration=Release /p:IncludeSymbols=true
+
+    # Copy nuget package
+    $projectPackPath = Join-Path $projectFolder ("/bin/Release/" + $project + ".*.nupkg")
+    Move-Item $projectPackPath $packFolder
+
+}
+
+# Go back to the pack folder
+Set-Location $packFolder

src/Castle.LoggingFacility.MsLogging/Castle.LoggingFacility.MsLogging.csproj

@@ -0,0 +1,44 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <VersionPrefix>2.0.0</VersionPrefix>
+    <TargetFrameworks>net452;netstandard1.5</TargetFrameworks>
+    <AssemblyName>Castle.LoggingFacility.MsLogging</AssemblyName>
+    <PackageId>Castle.LoggingFacility.MsLogging</PackageId>
+    <PackageTags>Castle;Logging;Extensions</PackageTags>
+    <PackageProjectUrl>https://github.com/volosoft/castle-logging-ms-adapter</PackageProjectUrl>
+    <PackageLicenseUrl>https://github.com/volosoft/castle-logging-ms-adapter/blob/master/LICENSE</PackageLicenseUrl>
+    <RepositoryType>git</RepositoryType>
+    <RepositoryUrl>https://github.com/volosoft/castle-logging-ms-adapter</RepositoryUrl>
+    <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
+    <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
+    <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <None Update="bin\Release\net452\Castle.LoggingFacility.MsLogging.pdb">
+      <PackagePath>lib/net452/</PackagePath>
+      <Pack>true</Pack>
+    </None>
+    <None Update="bin\Release\netstandard1.5\Castle.LoggingFacility.MsLogging.pdb">
+      <PackagePath>lib/netstandard1.5/</PackagePath>
+      <Pack>true</Pack>
+    </None>
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="1.1.1" />
+  </ItemGroup>
+
+  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.5' ">
+    <PackageReference Include="Fortress.Facilities.Logging" Version="0.5.265" />
+  </ItemGroup>
+
+    <ItemGroup Condition=" '$(TargetFramework)' == 'net452' ">
+    <Reference Include="System.Runtime" />
+    <Reference Include="System" />
+    <Reference Include="Microsoft.CSharp" />
+    <PackageReference Include="Castle.LoggingFacility" Version="3.4.0" />
+  </ItemGroup>
+
+</Project>

test/Castle.LoggingFacility.MsLogging.TestConsoleApp/Castle.LoggingFacility.MsLogging.TestConsoleApp.csproj

@@ -0,0 +1,23 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <VersionPrefix>1.1.0</VersionPrefix>
+    <TargetFramework>net461</TargetFramework>
+    <AssemblyName>Castle.LoggingFacility.MsLogging.TestConsoleApp</AssemblyName>
+    <OutputType>Exe</OutputType>
+    <PackageId>Castle.LoggingFacility.MsLogging.TestConsoleApp</PackageId>
+    <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
+    <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
+    <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\Castle.LoggingFacility.MsLogging\Castle.LoggingFacility.MsLogging.csproj" />
+  </ItemGroup>
+
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">
+    <Reference Include="System" />
+    <Reference Include="Microsoft.CSharp" />
+  </ItemGroup>
+
+</Project>