Skip to content

Commit daa05f1

Browse files
nblumhardtnblumhardt
authored
Merge pull request #10 from nblumhardt/rtmtools
Update to RTM dotnet tooling
2 parents 0eab1eb + 6157de4 commit daa05f1

14 files changed

+108
-169
lines changed

‎Build.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ foreach ($src in ls src/*) {
2020

2121
echo "build: Packaging project in $src"
2222

23-
& dotnet pack -c Release -o ..\..\artifacts --version-suffix=$suffix
23+
& dotnet pack -c Release -o ..\..\artifacts --version-suffix=$suffix --include-source
2424
if($LASTEXITCODE -ne 0) { exit 1 }
2525

2626
Pop-Location

‎appveyor.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ image: Visual Studio 2015
44
configuration: Release
55
install:
66
- ps: mkdir -Force ".\build\" | Out-Null
7-
- ps: Invoke-WebRequest "https://raw.githubusercontent.com/dotnet/cli/rel/1.0.0-preview2/scripts/obtain/dotnet-install.ps1" -OutFile ".\build\installcli.ps1"
7+
- ps: Invoke-WebRequest "https://raw.githubusercontent.com/dotnet/cli/rel/1.0.0/scripts/obtain/dotnet-install.ps1" -OutFile ".\build\installcli.ps1"
88
- ps: $env:DOTNET_INSTALL_DIR = "$pwd\.dotnetcli"
9-
- ps: '& .\build\installcli.ps1 -InstallDir "$env:DOTNET_INSTALL_DIR" -NoPath -Version 1.0.0-preview2-003121'
9+
- ps: '& .\build\installcli.ps1 -InstallDir "$env:DOTNET_INSTALL_DIR" -NoPath -Version 1.0.1'
1010
- ps: $env:Path = "$env:DOTNET_INSTALL_DIR;$env:Path"
1111
build_script:
1212
- ps: ./Build.ps1

‎example/RoundTrip/RoundTrip.csproj

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<TargetFramework>netcoreapp1.0</TargetFramework>
5+
<AssemblyName>RoundTrip</AssemblyName>
6+
<OutputType>Exe</OutputType>
7+
<PackageId>RoundTrip</PackageId>
8+
<RuntimeFrameworkVersion>1.0.4</RuntimeFrameworkVersion>
9+
<PackageTargetFallback>$(PackageTargetFallback);dnxcore50</PackageTargetFallback>
10+
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
11+
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
12+
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
13+
</PropertyGroup>
14+
15+
<ItemGroup>
16+
<ProjectReference Include="..\..\src\Serilog.Formatting.Compact.Reader\Serilog.Formatting.Compact.Reader.csproj" />
17+
</ItemGroup>
18+
19+
<ItemGroup>
20+
<PackageReference Include="Serilog.Sinks.File" Version="3.1.0" />
21+
<PackageReference Include="Serilog.Sinks.Literate" Version="2.0.0" />
22+
<PackageReference Include="Serilog.Formatting.Compact" Version="1.0.0" />
23+
</ItemGroup>
24+
25+
</Project>

‎example/RoundTrip/RoundTrip.xproj

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

‎example/RoundTrip/project.json

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

‎global.json

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

‎serilog-formatting-compact-reader.sln

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,16 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 14
4-
VisualStudioVersion = 14.0.25420.1
3+
# Visual Studio 15
4+
VisualStudioVersion = 15.0.26430.6
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E673DF37-5F53-48F6-9991-D762B8E35548}"
77
EndProject
88
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "global", "global", "{70BA4A7D-8A1E-4EAC-AA28-8FD2BD1556BD}"
99
ProjectSection(SolutionItems) = preProject
10-
global.json = global.json
10+
appveyor.yml = appveyor.yml
11+
Build.ps1 = Build.ps1
12+
LICENSE = LICENSE
13+
README.md = README.md
1114
EndProjectSection
1215
EndProject
1316
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "asset", "asset", "{71DD3779-3435-42D0-BA02-AEA04EE5B1E5}"
@@ -19,11 +22,11 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "example", "example", "{C352
1922
EndProject
2023
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{C76B8054-0892-42DA-83D5-88D731782FE8}"
2124
EndProject
22-
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Serilog.Formatting.Compact.Reader", "src\Serilog.Formatting.Compact.Reader\Serilog.Formatting.Compact.Reader.xproj", "{D6A02FA9-860A-48AC-8288-8CEBC962D4DE}"
25+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Serilog.Formatting.Compact.Reader", "src\Serilog.Formatting.Compact.Reader\Serilog.Formatting.Compact.Reader.csproj", "{D6A02FA9-860A-48AC-8288-8CEBC962D4DE}"
2326
EndProject
24-
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "RoundTrip", "example\RoundTrip\RoundTrip.xproj", "{961D5124-BBB2-4022-945E-1190BF6BE0C9}"
27+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RoundTrip", "example\RoundTrip\RoundTrip.csproj", "{961D5124-BBB2-4022-945E-1190BF6BE0C9}"
2528
EndProject
26-
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Serilog.Formatting.Compact.Reader.Tests", "test\Serilog.Formatting.Compact.Reader.Tests\Serilog.Formatting.Compact.Reader.Tests.xproj", "{3C2D8E01-5580-426A-BDD9-EC59CD98E618}"
29+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Serilog.Formatting.Compact.Reader.Tests", "test\Serilog.Formatting.Compact.Reader.Tests\Serilog.Formatting.Compact.Reader.Tests.csproj", "{3C2D8E01-5580-426A-BDD9-EC59CD98E618}"
2730
EndProject
2831
Global
2932
GlobalSection(SolutionConfigurationPlatforms) = preSolution

‎src/Serilog.Formatting.Compact.Reader/Properties/AssemblyInfo.cs

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

‎src/Serilog.Formatting.Compact.Reader/Serilog.Formatting.Compact.Reader.csproj

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<VersionPrefix>1.0.1</VersionPrefix>
5+
<TargetFrameworks>netstandard1.0;net45</TargetFrameworks>
6+
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
7+
<GenerateDocumentationFile>true</GenerateDocumentationFile>
8+
<AssemblyName>Serilog.Formatting.Compact.Reader</AssemblyName>
9+
<AssemblyOriginatorKeyFile>../../asset/Serilog.snk</AssemblyOriginatorKeyFile>
10+
<SignAssembly>true</SignAssembly>
11+
<PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
12+
<PackageId>Serilog.Formatting.Compact.Reader</PackageId>
13+
<PackageTags>serilog;json</PackageTags>
14+
<PackageIconUrl>http://serilog.net/images/serilog-extension-nuget.png</PackageIconUrl>
15+
<PackageProjectUrl>https://github.com/serilog/serilog-formatting-compact-reader</PackageProjectUrl>
16+
<PackageLicenseUrl>http://www.apache.org/licenses/LICENSE-2.0</PackageLicenseUrl>
17+
<NetStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netstandard1.0' ">1.6.0</NetStandardImplicitPackageVersion>
18+
</PropertyGroup>
19+
20+
<ItemGroup>
21+
<PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
22+
<PackageReference Include="Serilog" Version="2.3.0" />
23+
</ItemGroup>
24+
25+
<ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
26+
<Reference Include="System" />
27+
<Reference Include="Microsoft.CSharp" />
28+
</ItemGroup>
29+
30+
<ItemGroup>
31+
<Folder Include="Properties\" />
32+
</ItemGroup>
33+
34+
</Project>

‎src/Serilog.Formatting.Compact.Reader/Serilog.Formatting.Compact.Reader.xproj

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

‎src/Serilog.Formatting.Compact.Reader/project.json

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

‎test/Serilog.Formatting.Compact.Reader.Tests/Serilog.Formatting.Compact.Reader.Tests.csproj

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<TargetFrameworks>net452;netcoreapp1.0</TargetFrameworks>
5+
<AssemblyName>Serilog.Formatting.Compact.Reader.Tests</AssemblyName>
6+
<AssemblyOriginatorKeyFile>../../asset/Serilog.snk</AssemblyOriginatorKeyFile>
7+
<SignAssembly>true</SignAssembly>
8+
<PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
9+
<PackageId>Serilog.Formatting.Compact.Reader.Tests</PackageId>
10+
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
11+
<PackageTargetFallback Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">$(PackageTargetFallback);dnxcore50;portable-net45+win8</PackageTargetFallback>
12+
<RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">1.0.4</RuntimeFrameworkVersion>
13+
</PropertyGroup>
14+
15+
<ItemGroup>
16+
<None Update="*.clef">
17+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
18+
</None>
19+
</ItemGroup>
20+
21+
<ItemGroup>
22+
<ProjectReference Include="..\..\src\Serilog.Formatting.Compact.Reader\Serilog.Formatting.Compact.Reader.csproj" />
23+
</ItemGroup>
24+
25+
<ItemGroup>
26+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0-preview-20170106-08" />
27+
<PackageReference Include="xunit.runner.visualstudio" Version="2.2.0-beta5-build1225" />
28+
<PackageReference Include="xunit" Version="2.2.0-beta5-build3474" />
29+
<PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
30+
</ItemGroup>
31+
32+
<ItemGroup Condition=" '$(TargetFramework)' == 'net452' ">
33+
<Reference Include="System" />
34+
<Reference Include="Microsoft.CSharp" />
35+
</ItemGroup>
36+
37+
</Project>

‎test/Serilog.Formatting.Compact.Reader.Tests/Serilog.Formatting.Compact.Reader.Tests.xproj

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

‎test/Serilog.Formatting.Compact.Reader.Tests/project.json

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

0 commit comments

Comments
 (0)