Skip to content
This repository has been archived by the owner on Nov 3, 2021. It is now read-only.

Commit

Permalink
Build fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
nblumhardt committed Jun 30, 2017
1 parent e0e47b0 commit dba6440
Show file tree
Hide file tree
Showing 6 changed files with 53 additions and 20 deletions.
11 changes: 0 additions & 11 deletions Build.ps1
Expand Up @@ -26,17 +26,6 @@ foreach ($src in ls src/*) {
Pop-Location
}

foreach ($test in ls test/*.PerformanceTests) {
Push-Location $test

echo "build: Building performance test project in $test"

& dotnet build -c Release
if($LASTEXITCODE -ne 0) { exit 2 }

Pop-Location
}

foreach ($test in ls test/*.Tests) {
Push-Location $test

Expand Down
8 changes: 1 addition & 7 deletions appveyor.yml
@@ -1,13 +1,7 @@
version: '{build}'
skip_tags: true
image: Visual Studio 2015
image: Visual Studio 2017
configuration: Release
install:
- ps: mkdir -Force ".\build\" | Out-Null
- ps: Invoke-WebRequest "https://dot.net/v1/dotnet-install.ps1" -OutFile ".\build\installcli.ps1"
- ps: $env:DOTNET_INSTALL_DIR = "$pwd\.dotnetcli"
- ps: '& .\build\installcli.ps1 -InstallDir "$env:DOTNET_INSTALL_DIR" -NoPath -Version 1.0.3'
- ps: $env:Path = "$env:DOTNET_INSTALL_DIR;$env:Path"
build_script:
- ps: ./Build.ps1
test: off
Expand Down
Expand Up @@ -8,8 +8,8 @@ EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "assets", "assets", "{E9D1B5E1-DEB9-4A04-8BAB-24EC7240ADAF}"
ProjectSection(SolutionItems) = preProject
.editorconfig = .editorconfig
appveyor.yml = appveyor.yml
Build.ps1 = Build.ps1
NuGet.Config = NuGet.Config
README.md = README.md
assets\Serilog.snk = assets\Serilog.snk
EndProjectSection
Expand All @@ -20,6 +20,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "sample", "sample", "{91E1E7
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ColoredConsoleDemo", "sample\ColoredConsoleDemo\ColoredConsoleDemo.csproj", "{B72A390C-9C40-4306-9EA8-FC5043DC4067}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{63039932-3511-4964-BD21-05F9B7CB5CDA}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Serilog.Sinks.ColoredConsole.Tests", "test\Serilog.Sinks.ColoredConsole.Tests\Serilog.Sinks.ColoredConsole.Tests.csproj", "{9278D11E-281C-4FAA-AB61-2B06F5FB9980}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand All @@ -34,12 +38,17 @@ Global
{B72A390C-9C40-4306-9EA8-FC5043DC4067}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B72A390C-9C40-4306-9EA8-FC5043DC4067}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B72A390C-9C40-4306-9EA8-FC5043DC4067}.Release|Any CPU.Build.0 = Release|Any CPU
{9278D11E-281C-4FAA-AB61-2B06F5FB9980}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{9278D11E-281C-4FAA-AB61-2B06F5FB9980}.Debug|Any CPU.Build.0 = Debug|Any CPU
{9278D11E-281C-4FAA-AB61-2B06F5FB9980}.Release|Any CPU.ActiveCfg = Release|Any CPU
{9278D11E-281C-4FAA-AB61-2B06F5FB9980}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{50B24ACA-D8F0-4268-A477-871B0A92A04A} = {037440DE-440B-4129-9F7A-09B42D00397E}
{B72A390C-9C40-4306-9EA8-FC5043DC4067} = {91E1E741-BB92-490C-85F4-02CD410B2A8A}
{9278D11E-281C-4FAA-AB61-2B06F5FB9980} = {63039932-3511-4964-BD21-05F9B7CB5CDA}
EndGlobalSection
EndGlobal
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<Description>The colored console sink for Serilog</Description>
<Description>Now replaced by Serilog.Sinks.Console, please use that package instead. The colored console sink for Serilog</Description>
<AssemblyVersion>3.0.0</AssemblyVersion>
<VersionPrefix>3.0.0</VersionPrefix>
<RootNamespace>Serilog</RootNamespace>
Expand Down
12 changes: 12 additions & 0 deletions test/Serilog.Sinks.ColoredConsole.Tests/Example.cs
@@ -0,0 +1,12 @@
using Xunit;

namespace Serilog.Sinks.ColoredConsole.Tests
{
public class Example
{
[Fact]
public void ExampleTest()
{
}
}
}
@@ -0,0 +1,29 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>netcoreapp1.0;net46</TargetFrameworks>
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\..\src\Serilog.Sinks.ColoredConsole\Serilog.Sinks.ColoredConsole.csproj" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.2.0" />
<PackageReference Include="xunit" Version="2.2.0" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'net46' ">
<Reference Include="System" />
<Reference Include="Microsoft.CSharp" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">
</ItemGroup>

<ItemGroup>
<Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
</ItemGroup>

</Project>

0 comments on commit dba6440

Please sign in to comment.