Skip to content

Commit ffd38c1

Browse files
merblamerbla
committed
New Project for http://dotnet.github.io/ 
1 parent 2cef112 commit ffd38c1

23 files changed

+1445
-1001
lines changed

‎.vs/config/applicationhost.config

Lines changed: 1019 additions & 0 deletions
Large diffs are not rendered by default.

‎Build.ps1

Lines changed: 87 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -1,73 +1,109 @@
1-
param(
2-
[String] $majorMinor = "0.0", # 2.0
3-
[String] $patch = "0", # $env:APPVEYOR_BUILD_VERSION
4-
[String] $customLogger = "", # C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll
5-
[Switch] $notouch
6-
)
7-
8-
function Set-AssemblyVersions($informational, $assembly)
1+
$root = $(Get-Item $($MyInvocation.MyCommand.Path)).DirectoryName
2+
3+
function Install-Dnvm
94
{
10-
(Get-Content assets/CommonAssemblyInfo.cs) |
11-
ForEach-Object { $_ -replace """1.0.0.0""", """$assembly""" } |
12-
ForEach-Object { $_ -replace """1.0.0""", """$informational""" } |
13-
ForEach-Object { $_ -replace """1.1.1.1""", """$($informational).0""" } |
14-
Set-Content assets/CommonAssemblyInfo.cs
5+
& where.exe dnvm 2>&1 | Out-Null
6+
if(($LASTEXITCODE -ne 0) -Or ((Test-Path Env:\APPVEYOR) -eq $true))
7+
{
8+
Write-Host "DNVM not found"
9+
&{$Branch='dev';iex ((New-Object net.webclient).DownloadString('https://raw.githubusercontent.com/aspnet/Home/dev/dnvminstall.ps1'))}
10+
11+
# Normally this happens automatically during install but AppVeyor has
12+
# an issue where you may need to manually re-run setup from within this process.
13+
if($env:DNX_HOME -eq $NULL)
14+
{
15+
Write-Host "Initial DNVM environment setup failed; running manual setup"
16+
$tempDnvmPath = Join-Path $env:TEMP "dnvminstall"
17+
$dnvmSetupCmdPath = Join-Path $tempDnvmPath "dnvm.ps1"
18+
& $dnvmSetupCmdPath setup
19+
}
20+
}
1521
}
1622

17-
function Install-NuGetPackages()
23+
function Get-DnxVersion
1824
{
19-
nuget restore serilog-sinks-splunk.sln
25+
$globalJson = Join-Path $PSScriptRoot "global.json"
26+
$jsonData = Get-Content -Path $globalJson -Raw | ConvertFrom-JSON
27+
return $jsonData.sdk.version
2028
}
2129

22-
function Invoke-MSBuild($solution, $customLogger)
30+
function Restore-Packages
2331
{
24-
if ($customLogger)
25-
{
26-
msbuild "$solution" /verbosity:minimal /p:Configuration=Release /logger:"$customLogger"
27-
}
28-
else
29-
{
30-
msbuild "$solution" /verbosity:minimal /p:Configuration=Release
31-
}
32+
param([string] $DirectoryName)
33+
& dnu restore ("""" + $DirectoryName + """")
3234
}
3335

34-
function Invoke-NuGetPackProj($csproj)
36+
function Build-Projects
3537
{
36-
nuget pack -Prop Configuration=Release -Symbols $csproj
38+
param($Directory, $pack)
39+
40+
$DirectoryName = $Directory.DirectoryName
41+
$artifactsFolder = join-path $root "artifacts"
42+
$projectsFolder = join-path $artifactsFolder $Directory.Name
43+
$buildFolder = join-path $projectsFolder "testbin"
44+
$packageFolder = join-path $projectsFolder "packages"
45+
46+
& dnu build ("""" + $DirectoryName + """") --configuration Release --out $buildFolder; if($LASTEXITCODE -ne 0) { exit 1 }
47+
48+
if($pack){
49+
& dnu pack ("""" + $DirectoryName + """") --configuration Release --out $packageFolder; if($LASTEXITCODE -ne 0) { exit 1 }
50+
}
3751
}
38-
39-
function Invoke-NuGetPackSpec($nuspec, $version)
52+
53+
function Test-Projects
4054
{
41-
nuget pack $nuspec -Version $version -OutputDirectory ..\..\
55+
param([string] $DirectoryName)
56+
& dnx -p ("""" + $DirectoryName + """") test; if($LASTEXITCODE -ne 0) { exit 2 }
4257
}
4358

44-
function Invoke-NuGetPack($version)
45-
{
46-
pushd .\src\Serilog.Sinks.Splunk
47-
Invoke-NuGetPackSpec "Serilog.Sinks.Splunk.nuspec" $version
48-
popd
59+
function Remove-PathVariable
60+
{
61+
param([string] $VariableToRemove)
62+
$path = [Environment]::GetEnvironmentVariable("PATH", "User")
63+
$newItems = $path.Split(';') | Where-Object { $_.ToString() -inotlike $VariableToRemove }
64+
[Environment]::SetEnvironmentVariable("PATH", [System.String]::Join(';', $newItems), "User")
65+
$path = [Environment]::GetEnvironmentVariable("PATH", "Process")
66+
$newItems = $path.Split(';') | Where-Object { $_.ToString() -inotlike $VariableToRemove }
67+
[Environment]::SetEnvironmentVariable("PATH", [System.String]::Join(';', $newItems), "Process")
4968
}
5069

51-
function Invoke-Build($majorMinor, $patch, $customLogger, $notouch)
52-
{
53-
$package="$majorMinor.$patch"
70+
Push-Location $PSScriptRoot
5471

55-
Write-Output "Building Serilog.Sinks.Splunk $package"
72+
$dnxVersion = Get-DnxVersion
5673

57-
if (-not $notouch)
58-
{
59-
$assembly = "$majorMinor.0.0"
74+
# Clean
75+
if(Test-Path .\artifacts) { Remove-Item .\artifacts -Force -Recurse }
6076

61-
Write-Output "Assembly version will be set to $assembly"
62-
Set-AssemblyVersions $package $assembly
63-
}
77+
# Remove the installed DNVM from the path and force use of
78+
# per-user DNVM (which we can upgrade as needed without admin permissions)
79+
Remove-PathVariable "*Program Files\Microsoft DNX\DNVM*"
6480

65-
Install-NuGetPackages
66-
67-
Invoke-MSBuild "serilog-sinks-splunk.sln" $customLogger
81+
# Make sure per-user DNVM is installed
82+
Install-Dnvm
6883

69-
Invoke-NuGetPack $package
70-
}
84+
# Install DNX
85+
dnvm install $dnxVersion -r CoreCLR -NoNative
86+
dnvm install $dnxVersion -r CLR -NoNative
87+
dnvm use $dnxVersion -r CLR
88+
89+
# Package restore
90+
Get-ChildItem -Path . -Filter *.xproj -Recurse | ForEach-Object { Restore-Packages $_.DirectoryName }
91+
92+
# Set build number
93+
$env:DNX_BUILD_VERSION = @{ $true = $env:APPVEYOR_BUILD_NUMBER; $false = 1 }[$env:APPVEYOR_BUILD_NUMBER -ne $NULL];
94+
Write-Host "Build number: " $env:DNX_BUILD_VERSION
95+
96+
# Build/package
97+
Get-ChildItem -Path .\src -Filter *.xproj -Recurse | ForEach-Object { Build-Projects $_ $true }
98+
Get-ChildItem -Path .\test -Filter *.xproj -Recurse | ForEach-Object { Build-Projects $_ $false }
99+
100+
# Test
101+
Get-ChildItem -Path .\test -Filter *.xproj -Recurse | ForEach-Object { Test-Projects $_.DirectoryName }
102+
103+
# Switch to Core CLR
104+
dnvm use $dnxVersion -r CoreCLR
105+
106+
# Test again
107+
Get-ChildItem -Path .\test -Filter *.xproj -Recurse | ForEach-Object { Test-Projects $_.DirectoryName }
71108

72-
$ErrorActionPreference = "Stop"
73-
Invoke-Build $majorMinor $patch $customLogger $notouch
109+
Pop-Location

‎CHANGES.md

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,20 @@
1-
##1.5.0
2-
- Moved the sink from its [original location](https://github.com/serilog/serilog)
1+
##2.0 Support for DotNet Core
2+
- Event Collector Sink targeting core
3+
- TCP/UDP Sinks targeting 4.5
34

4-
##1.5.30
5-
- Added switch for template rendering
5+
##1.7
6+
- Better support for formatting including [#578](https://github.com/serilog/serilog/issues/578)
7+
- Cleanup on Event Collector
68

9+
##1.6.50
10+
- Streaming support for Event Collector
11+
712
##1.6.42
813
- Added support for Splunk 6.3 Event Collector
914
- Deprecated Splunk HTTP Sink using Management Port/API
1015

11-
##1.6.50
12-
- Streaming support for Event Collector
13-
14-
##1.7
15-
- Better support for formatting including [#578](https://github.com/serilog/serilog/issues/578)
16-
- Cleanup on Event Collector
16+
##1.5.30
17+
- Added switch for template rendering
18+
19+
##1.5.0
20+
- Moved the sink from its [original location](https://github.com/serilog/serilog)

‎global.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"sdk": {
3+
"version": "1.0.0-rc1-update1"
4+
}
5+
}

‎sample/Serilog.Sinks.Splunk.Sample/Serilog.Sinks.Splunk.Sample.csproj

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -72,12 +72,6 @@
7272
<None Include="App.config" />
7373
<None Include="packages.config" />
7474
</ItemGroup>
75-
<ItemGroup>
76-
<ProjectReference Include="..\..\src\Serilog.Sinks.Splunk.FullNetFx\Serilog.Sinks.Splunk.FullNetFx.csproj">
77-
<Project>{17deed0f-f9cb-48fb-b4dc-53fb6aee64d7}</Project>
78-
<Name>Serilog.Sinks.Splunk.FullNetFx</Name>
79-
</ProjectReference>
80-
</ItemGroup>
8175
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
8276
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
8377
Other similar extension points exist, see Microsoft.Common.targets.

‎serilog-sinks-splunk.sln

Lines changed: 9 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,57 +1,41 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio 14
4-
VisualStudioVersion = 14.0.23107.0
4+
VisualStudioVersion = 14.0.24720.0
55
MinimumVisualStudioVersion = 10.0.40219.1
6-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Serilog.Sinks.Splunk", "src\Serilog.Sinks.Splunk\Serilog.Sinks.Splunk.csproj", "{1493ABC3-811C-46C7-92ED-CEB7567FB588}"
7-
EndProject
8-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Serilog.Sinks.Splunk.FullNetFx", "src\Serilog.Sinks.Splunk.FullNetFx\Serilog.Sinks.Splunk.FullNetFx.csproj", "{17DEED0F-F9CB-48FB-B4DC-53FB6AEE64D7}"
9-
EndProject
106
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{7A774CBB-A6E9-4854-B4DB-4CF860B0C1C5}"
117
EndProject
128
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "assets", "assets", "{B9B13339-749C-4098-8845-780ED4FA488A}"
139
ProjectSection(SolutionItems) = preProject
1410
Build.ps1 = Build.ps1
1511
CHANGES.md = CHANGES.md
16-
assets\CommonAssemblyInfo.cs = assets\CommonAssemblyInfo.cs
12+
global.json = global.json
1713
README.md = README.md
1814
assets\Serilog.snk = assets\Serilog.snk
1915
EndProjectSection
2016
EndProject
21-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Sample", "Sample", "{EBB6CE48-09B0-4789-9627-45A1D4D377F7}"
22-
EndProject
23-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Serilog.Sinks.Splunk.Sample", "sample\Serilog.Sinks.Splunk.Sample\Serilog.Sinks.Splunk.Sample.csproj", "{F0B0E4EF-CF01-46FC-A64C-FE3528F14238}"
24-
EndProject
2517
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{B16AD407-36C8-4286-A3E9-CACEBF359731}"
2618
ProjectSection(SolutionItems) = preProject
2719
.nuget\packages.config = .nuget\packages.config
2820
EndProjectSection
2921
EndProject
22+
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Serilog.Sinks.Splunk", "src\Serilog.Sinks.Splunk\Serilog.Sinks.Splunk.xproj", "{32CF915C-3ECD-496C-8FDB-1214581274A6}"
23+
EndProject
3024
Global
3125
GlobalSection(SolutionConfigurationPlatforms) = preSolution
3226
Debug|Any CPU = Debug|Any CPU
3327
Release|Any CPU = Release|Any CPU
3428
EndGlobalSection
3529
GlobalSection(ProjectConfigurationPlatforms) = postSolution
36-
{1493ABC3-811C-46C7-92ED-CEB7567FB588}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
37-
{1493ABC3-811C-46C7-92ED-CEB7567FB588}.Debug|Any CPU.Build.0 = Debug|Any CPU
38-
{1493ABC3-811C-46C7-92ED-CEB7567FB588}.Release|Any CPU.ActiveCfg = Release|Any CPU
39-
{1493ABC3-811C-46C7-92ED-CEB7567FB588}.Release|Any CPU.Build.0 = Release|Any CPU
40-
{17DEED0F-F9CB-48FB-B4DC-53FB6AEE64D7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
41-
{17DEED0F-F9CB-48FB-B4DC-53FB6AEE64D7}.Debug|Any CPU.Build.0 = Debug|Any CPU
42-
{17DEED0F-F9CB-48FB-B4DC-53FB6AEE64D7}.Release|Any CPU.ActiveCfg = Release|Any CPU
43-
{17DEED0F-F9CB-48FB-B4DC-53FB6AEE64D7}.Release|Any CPU.Build.0 = Release|Any CPU
44-
{F0B0E4EF-CF01-46FC-A64C-FE3528F14238}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
45-
{F0B0E4EF-CF01-46FC-A64C-FE3528F14238}.Debug|Any CPU.Build.0 = Debug|Any CPU
46-
{F0B0E4EF-CF01-46FC-A64C-FE3528F14238}.Release|Any CPU.ActiveCfg = Release|Any CPU
47-
{F0B0E4EF-CF01-46FC-A64C-FE3528F14238}.Release|Any CPU.Build.0 = Release|Any CPU
30+
{32CF915C-3ECD-496C-8FDB-1214581274A6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
31+
{32CF915C-3ECD-496C-8FDB-1214581274A6}.Debug|Any CPU.Build.0 = Debug|Any CPU
32+
{32CF915C-3ECD-496C-8FDB-1214581274A6}.Release|Any CPU.ActiveCfg = Release|Any CPU
33+
{32CF915C-3ECD-496C-8FDB-1214581274A6}.Release|Any CPU.Build.0 = Release|Any CPU
4834
EndGlobalSection
4935
GlobalSection(SolutionProperties) = preSolution
5036
HideSolutionNode = FALSE
5137
EndGlobalSection
5238
GlobalSection(NestedProjects) = preSolution
53-
{1493ABC3-811C-46C7-92ED-CEB7567FB588} = {7A774CBB-A6E9-4854-B4DB-4CF860B0C1C5}
54-
{17DEED0F-F9CB-48FB-B4DC-53FB6AEE64D7} = {7A774CBB-A6E9-4854-B4DB-4CF860B0C1C5}
55-
{F0B0E4EF-CF01-46FC-A64C-FE3528F14238} = {EBB6CE48-09B0-4789-9627-45A1D4D377F7}
39+
{32CF915C-3ECD-496C-8FDB-1214581274A6} = {7A774CBB-A6E9-4854-B4DB-4CF860B0C1C5}
5640
EndGlobalSection
5741
EndGlobal

0 commit comments

Comments
 (0)