Skip to content

Commit ba2a4e0

Browse files
committed
Version change and fixed build issues.
1 parent 8e9c76c commit ba2a4e0

23 files changed

Lines changed: 121 additions & 159 deletions

AspNet.Plus.Logging.sln

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,17 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio 14
4-
VisualStudioVersion = 14.0.25123.0
4+
VisualStudioVersion = 14.0.25420.1
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "02. src", "02. src", "{BFA64C32-4422-4AF9-8ECF-D2ECF2E0230B}"
77
EndProject
88
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "01. Solution Items", "01. Solution Items", "{D94023CF-59CC-4D69-B30B-991C7D52F49A}"
99
ProjectSection(SolutionItems) = preProject
10+
appveyor.yml = appveyor.yml
1011
header\AspNet.Plus.licenseheader = header\AspNet.Plus.licenseheader
12+
build.ps1 = build.ps1
1113
global.json = global.json
14+
README.md = README.md
1215
header\VersionInfo.cs = header\VersionInfo.cs
1316
EndProjectSection
1417
EndProject

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
[![Stars](https://img.shields.io/github/stars/aspnet-plus/AspNet.Plus.Logging.svg)](https://github.com/aspnet-plus/AspNet.Plus.Logging/stargazers)
66
[![Join the chat at https://gitter.im/aspnet-plus/AspNet.Plus.Logging](https://badges.gitter.im/aspnet-plus/AspNet.Plus.Logging.svg)](https://gitter.im/aspnet-plus/AspNet.Plus.Logging?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
77

8-
A set of Nuget packages to help ASP.NET 5 developers build simple quality logging related code.
8+
A set of Nuget packages to help NET Core developers build simple quality logging related code.
99

10-
**NOTE**: *The AspNet.Plus.Logging.ReflectInsight does not support DNX Core, as of Yet!*
10+
**NOTE**: *The AspNet.Plus.Logging.ReflectInsight only supports .NET Core Full Framework*
1111

1212
**Available Nuget packages**
1313

appveyor.yml

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,15 @@
1-
init:
2-
- git config --global core.autocrlf true
3-
build_script:
4-
- ps: .\build.ps1
5-
clone_depth: 1
6-
test: off
7-
deploy: off
1+
version: '{build}'
2+
skip_tags: true
3+
image: Visual Studio 2015
4+
configuration: Release
5+
install:
6+
- 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"
8+
- ps: $env:DOTNET_INSTALL_DIR = "$pwd\.dotnetcli"
9+
- ps: '& .\build\installcli.ps1 -InstallDir "$env:DOTNET_INSTALL_DIR" -NoPath -Version 1.0.0-preview2-003121'
10+
- ps: $env:Path = "$env:DOTNET_INSTALL_DIR;$env:Path"
11+
build_script:
12+
- ps: ./Build.ps1
13+
test: off
14+
15+

build.ps1

Lines changed: 32 additions & 82 deletions
Original file line numberDiff line numberDiff line change
@@ -1,82 +1,32 @@
1-
########################
2-
# THE BUILD!
3-
########################
4-
Push-Location $PSScriptRoot
5-
6-
function Invoke-DotNetBuild
7-
{
8-
[cmdletbinding()]
9-
param([string] $DirectoryName)
10-
& dotnet build ("""" + $DirectoryName + """") -c Release; if($LASTEXITCODE -ne 0) { exit 1 }
11-
}
12-
13-
function Invoke-Tests
14-
{
15-
[cmdletbinding()]
16-
param([string] $DirectoryName)
17-
& dotnet test ("""" + $DirectoryName + """") -c Release; if($LASTEXITCODE -ne 0) { exit 1 }
18-
}
19-
20-
function Invoke-DotNetPack
21-
{
22-
[cmdletbinding()]
23-
param([string] $DirectoryName)
24-
& dotnet pack ("""" + $DirectoryName + """") -c Release -o .\artifacts\packages; if($LASTEXITCODE -ne 0) { exit 1 }
25-
}
26-
27-
function Remove-PathVariable
28-
{
29-
[cmdletbinding()]
30-
param([string] $VariableToRemove)
31-
$path = [Environment]::GetEnvironmentVariable("PATH", "User")
32-
$newItems = $path.Split(';') | Where-Object { $_.ToString() -inotlike $VariableToRemove }
33-
[Environment]::SetEnvironmentVariable("PATH", [System.String]::Join(';', $newItems), "User")
34-
$path = [Environment]::GetEnvironmentVariable("PATH", "Process")
35-
$newItems = $path.Split(';') | Where-Object { $_.ToString() -inotlike $VariableToRemove }
36-
[Environment]::SetEnvironmentVariable("PATH", [System.String]::Join(';', $newItems), "Process")
37-
}
38-
39-
# Prepare the dotnet CLI folder
40-
$env:DOTNET_INSTALL_DIR="$(Convert-Path "$PSScriptRoot")\.dotnet\win7-x64"
41-
if (!(Test-Path $env:DOTNET_INSTALL_DIR))
42-
{
43-
mkdir $env:DOTNET_INSTALL_DIR | Out-Null
44-
}
45-
46-
# Download the dotnet CLI install script
47-
if (!(Test-Path .\dotnet\install.ps1))
48-
{
49-
Invoke-WebRequest "https://raw.githubusercontent.com/dotnet/cli/rel/1.0.0/scripts/obtain/dotnet-install.ps1" -OutFile ".\.dotnet\dotnet-install.ps1"
50-
}
51-
52-
# Run the dotnet CLI install
53-
& .\.dotnet\dotnet-install.ps1
54-
55-
# Add the dotnet folder path to the process. This gets skipped
56-
# by Install-DotNetCli if it's already installed.
57-
Remove-PathVariable $env:DOTNET_INSTALL_DIR
58-
$env:PATH = "$env:DOTNET_INSTALL_DIR;$env:PATH"
59-
60-
# Set build number
61-
$env:DOTNET_BUILD_VERSION = @{ $true = $env:APPVEYOR_BUILD_NUMBER; $false = 1}[$env:APPVEYOR_BUILD_NUMBER -ne $NULL];
62-
Write-Host "Build number:" $env:DOTNET_BUILD_VERSION
63-
64-
# Clean
65-
if(Test-Path .\artifacts)
66-
{
67-
Remove-Item .\artifacts -Force -Recurse
68-
}
69-
70-
# Package restore
71-
& dotnet restore
72-
73-
# Build/package
74-
Get-ChildItem -Path .\src -Filter *.xproj -Recurse | ForEach-Object { Invoke-DotNetPack $_.DirectoryName }
75-
Get-ChildItem -Path .\samples -Filter *.xproj -Recurse | ForEach-Object { Invoke-DotNetBuild $_.DirectoryName }
76-
77-
# Test
78-
# Get-ChildItem -Path .\tests -Filter *.xproj -Recurse | ForEach-Object { Invoke-Tests $_.DirectoryName }
79-
80-
Pop-Location
81-
82-
1+
echo "build: Build started"
2+
3+
Push-Location $PSScriptRoot
4+
5+
if(Test-Path .\artifacts) {
6+
echo "build: Cleaning .\artifacts"
7+
Remove-Item .\artifacts -Force -Recurse
8+
}
9+
10+
& dotnet restore --no-cache
11+
12+
$branch = @{ $true = $env:APPVEYOR_REPO_BRANCH; $false = $(git symbolic-ref --short -q HEAD) }[$env:APPVEYOR_REPO_BRANCH -ne $NULL];
13+
$revision = @{ $true = "{0:00000}" -f [convert]::ToInt32("0" + $env:APPVEYOR_BUILD_NUMBER, 10); $false = "local" }[$env:APPVEYOR_BUILD_NUMBER -ne $NULL];
14+
$suffix = @{ $true = ""; $false = "$($branch.Substring(0, [math]::Min(10,$branch.Length)))-$revision"}[$branch -eq "master" -and $revision -ne "local"]
15+
16+
echo "build: Version suffix is $suffix"
17+
18+
foreach ($src in ls src/*) {
19+
Push-Location $src
20+
21+
echo "build: Packaging project in $src"
22+
23+
& dotnet pack -c Release -o ..\..\artifacts --version-suffix=$suffix
24+
if($LASTEXITCODE -ne 0) { exit 1 }
25+
26+
Pop-Location
27+
}
28+
29+
30+
Pop-Location
31+
32+

global.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
11
{
2-
"projects": [ "src", "samples" ]
2+
"projects": [ "src", "samples" ],
3+
"sdk": {
4+
"version": "1.0.0-preview2-003121"
5+
}
36
}

header/AspNet.Plus.licenseheader

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
1-
# https://github.com/rubicon-oss/LicenseHeaderManager/wiki/Expendable-Properties
2-
extensions: designer.cs generated.cs
3-
extensions: .cs .cpp .h
4-
// ASP.NET.Plus
5-
// Copyright (c) %CurrentYear% ZoneMatrix Inc.
6-
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
7-
8-
extensions: .aspx .ascx
9-
<%--
10-
ASP.NET.Plus
11-
Copyright (c) %CurrentYear% ZoneMatrix Inc.
12-
Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
13-
--%>
14-
extensions: .xml .config .xsd
15-
<!--
16-
ASP.NET.Plus
17-
Copyright (c) %CurrentYear% ZoneMatrix Inc.
18-
Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
1+
# https://github.com/rubicon-oss/LicenseHeaderManager/wiki/Expendable-Properties
2+
extensions: designer.cs generated.cs
3+
extensions: .cs .cpp .h
4+
// ASP.NET.Plus
5+
// Copyright (c) %CurrentYear% ASP.NET Plus.
6+
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
7+
8+
extensions: .aspx .ascx
9+
<%--
10+
ASP.NET.Plus
11+
Copyright (c) %CurrentYear% ASP.NET Plus.
12+
Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
13+
--%>
14+
extensions: .xml .config .xsd
15+
<!--
16+
ASP.NET.Plus
17+
Copyright (c) %CurrentYear% ASP.NET Plus.
18+
Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
1919
-->

header/VersionInfo.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
using System.Reflection;
22
using System.Runtime.InteropServices;
33

4-
[assembly: AssemblyCompany("ZoneMatrix")]
5-
[assembly: AssemblyProduct("ZoneMatrix reusable common libraries.")]
6-
[assembly: AssemblyCopyright("Copyright (C) 2016 ZoneMatrix Inc.")]
4+
[assembly: AssemblyCompany("ASP.NET Plus")]
5+
[assembly: AssemblyProduct("ASP.NET Plus reusable common libraries.")]
6+
[assembly: AssemblyCopyright("Copyright (C) 2016 ASP.NET Plus.")]
77
[assembly: AssemblyVersion("1.0.0.*")]
88
[assembly: AssemblyFileVersion("1.0.0.*")]
99
[assembly: AssemblyInformationalVersion("1.0.0 (rev 0)")]

samples/LoggingReflectInsight/Console.ReflectInsightSample/Program.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// ASP.NET.Plus
2-
// Copyright (c) 2016 ZoneMatrix Inc.
2+
// Copyright (c) 2016 ASP.NET Plus.
33
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
44

55
using AspNet.Plus.Logging.ReflectInsight;

samples/LoggingReflectInsight/Console.ReflectInsightSample/Properties/AssemblyInfo.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// ASP.NET.Plus
2-
// Copyright (c) 2016 ZoneMatrix Inc.
2+
// Copyright (c) 2016 ASP.NET Plus.
33
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
44

55
using System.Reflection;

samples/LoggingReflectInsight/Console.ReflectInsightSample/ReflectInsight.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0"?>
22
<!--
33
ASP.NET.Plus
4-
Copyright (c) 2016 ZoneMatrix Inc.
4+
Copyright (c) 2016 ASP.NET Plus.
55
Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
66
-->
77
<configuration>

0 commit comments

Comments
 (0)