Skip to content
This repository was archived by the owner on Oct 18, 2018. It is now read-only.

Commit 25473ff

Browse files
dougbudougbu
committed
Align with other ASP.NET Core projects
- part of #228 - use regular LICENSE.txt and Key.snk - use BuildTools - start with aspnet/BuildTools/tree/dev/scripts/bootstrapper files - copy other files and pieces of files from aspnet/Mvc repo - remove properties that BuildTools sets from root Directory.Build.props - use Internal.AspNetCore.Sdk - update version to 1.0.0-preview1 - work around #231 (aka dotnet/standard#567) - update Readme.md nits: - remove support for `<Configuration>CodeAnalysis</Configuration>` - centralize references in test projects - move a `$(MSBuildAllProjects)` setting into version.props - remove a few files I missed in #230 Aligning dependency versions (using dependencies.props) will come soon.
1 parent 7e41807 commit 25473ff

File tree

58 files changed

+642
-819
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+642
-819
lines changed

Diff for: ‎.appveyor.yml

+7-5
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,17 @@ branches:
66
- /^(.*\/)?ci-.*$/
77
- /^rel\/.*/
88
configuration:
9-
- CodeAnalysis
9+
- Debug
1010
- Release
1111
matrix:
1212
fast_finish: true
13-
before_build:
14-
- cmd: .\build.cmd EnableSkipStrongNames
1513
build_script:
16-
- cmd: .\build.cmd BuildPackages /P:Configuration=%Configuration%
14+
- ps: .\run.ps1 default-build /P:Configuration=%Configuration%
1715
clone_depth: 1
16+
environment:
17+
global:
18+
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
19+
DOTNET_CLI_TELEMETRY_OPTOUT: 1
1820
test: off
1921
deploy: off
20-
os: Visual Studio 2017
22+
image: Visual Studio 2017

Diff for: ‎.gitignore

+30-3
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,48 @@
1+
*.*sdf
12
[Bb]in
23
[Oo]bj
34
[Tt]est[Rr]esults
4-
.vs
55
*.mdf
66
*.ldf
77
*.suo
88
*.user
99
*.[Cc]ache
1010
*[Rr]esharper*
11-
packages
12-
NuGet.exe
1311
_[Ss]cripts
1412
*.exe
1513
*.dll
1614
*.nupkg
1715
*.ncrunchsolution
16+
*.docstates
1817
*.dot[Cc]over
18+
*.ipch
19+
*.orig
20+
*.pidb
21+
*.psess
1922
*.pubxml
23+
*.sln.ide
24+
*.sln.ide/
25+
*.userprefs
26+
*.vsp
2027
*.zip
28+
*DS_Store
2129
*launchSettings.json
30+
.build/
31+
.idea/
32+
.nuget/
33+
.settings
34+
.testPublish/
35+
.vs/
36+
.vscode/
37+
_[Rr]eSharper.*
38+
_[Rr]eSharper.*/
39+
artifacts/
40+
bower_components/
41+
debugSettings.json
42+
global.json
43+
node_modules
44+
node_modules/
45+
nuget.exe
46+
packages/
47+
project.lock.json
48+
PublishProfiles/

Diff for: ‎.travis.yml

+17-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,25 @@
11
language: csharp
2-
sudo: false
2+
sudo: required
33
dist: trusty
4+
env:
5+
global:
6+
- DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
7+
- DOTNET_CLI_TELEMETRY_OPTOUT: 1
8+
addons:
9+
apt:
10+
packages:
11+
- libunwind8
412
mono: none
513
os:
614
- linux
15+
- osx
16+
osx_image: xcode8.2
717
branches:
818
only:
9-
- not.a.branch
19+
- dev
20+
- /^rel\/.*$/
21+
- /^(.*\/)?ci-.*$/
22+
before_install:
23+
- if test "$TRAVIS_OS_NAME" == "osx"; then brew update; brew install openssl; ln -s /usr/local/opt/openssl/lib/libcrypto.1.0.0.dylib /usr/local/lib/; ln -s /usr/local/opt/openssl/lib/libssl.1.0.0.dylib /usr/local/lib/; fi
1024
script:
11-
- echo Skipping builds for now.
25+
- ./build.sh

Diff for: ‎Directory.Build.props

+13-45
Original file line numberDiff line numberDiff line change
@@ -1,61 +1,29 @@
11
<Project>
2-
<!-- Imported only from .NET Core and .NET Standard projects. See conditions in lower-level Directory.Build.props files -->
2+
<!-- Will also stop MsBuild searching parent directories for this file. -->
3+
<Import
4+
Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), AspNetCoreSettings.props))\AspNetCoreSettings.props"
5+
Condition=" '$(CI)' != 'true' AND '$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), AspNetCoreSettings.props))' != '' " />
36

47
<Import Project="version.props" />
8+
<Import Project="build\sources.props" />
59

6-
<!-- Ensure changes to this file and version.props cause project rebuilds. -->
10+
<!-- Ensure changes to this file cause project rebuilds. -->
711
<PropertyGroup>
8-
<RepositoryRoot Condition=" '$(RepositoryRoot)' == '' ">$([System.IO.Path]::GetFullPath( '$(MSBuildThisFileDirectory)' ))</RepositoryRoot>
912
<MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
10-
<MSBuildAllProjects>$(MSBuildAllProjects);$(RepositoryRoot)version.props</MSBuildAllProjects>
1113
</PropertyGroup>
1214

13-
<!-- Common package options. -->
1415
<PropertyGroup>
15-
<Authors>Microsoft</Authors>
16-
<Company>Microsoft Corporation.</Company>
17-
<Copyright>Copyright © Microsoft Corporation</Copyright>
18-
<IncludeSource>true</IncludeSource>
19-
<IncludeSymbols>true</IncludeSymbols>
16+
<!-- Have not released 1.0.0 yet. -->
17+
<EnableApiCheck>false</EnableApiCheck>
2018

21-
<!-- Work around https://github.com/NuGet/Home/issues/4726 -->
22-
<IncludeSymbols Condition=" '$(NuspecFile)' != '' ">false</IncludeSymbols>
23-
24-
<LangVersion>7.1</LangVersion>
25-
<NeutralLanguage>en-US</NeutralLanguage>
26-
<NoPackageAnalysis>true</NoPackageAnalysis>
27-
<PackageIconUrl>https://go.microsoft.com/fwlink/?LinkID=288859</PackageIconUrl>
28-
<PackageLicenseUrl>https://raw.githubusercontent.com/aspnet/Home/2.0.0/LICENSE.txt</PackageLicenseUrl>
29-
<PackageProjectUrl>https://asp.net</PackageProjectUrl>
30-
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
31-
</PropertyGroup>
32-
33-
<!-- Default $(AssemblyRevision) when manually building an individual project. -->
34-
<PropertyGroup>
35-
<_TwoDigitYear>$([MSBuild]::Subtract($([System.DateTime]::UtcNow.Year), 2000))</_TwoDigitYear>
36-
<_ThreeDigitDayOfYear>$([System.DateTime]::UtcNow.DayOfYear.ToString().PadLeft(3, '0'))</_ThreeDigitDayOfYear>
37-
<AssemblyRevision Condition=" '$(AssemblyRevision)' == '' ">$(_TwoDigitYear)$(_ThreeDigitDayOfYear)</AssemblyRevision>
38-
</PropertyGroup>
39-
40-
<!-- Additional specifics of this repository. -->
41-
<PropertyGroup>
4219
<Product>Microsoft ASP.NET Core WebHooks</Product>
43-
<RepositoryType>git</RepositoryType>
4420
<RepositoryUrl>https://github.com/aspnet/WebHooks</RepositoryUrl>
45-
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
21+
<RepositoryType>git</RepositoryType>
22+
<RepositoryRoot>$(MSBuildThisFileDirectory)</RepositoryRoot>
4623

47-
<AssemblyOriginatorKeyFile>$(RepositoryRoot)tools\35MSSharedLib1024.snk</AssemblyOriginatorKeyFile>
48-
<PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
24+
<AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)build\Key.snk</AssemblyOriginatorKeyFile>
4925
<SignAssembly>true</SignAssembly>
50-
51-
<!-- Must delay-sign the assemblies because 35MSSharedLib1024.snk contains no private key. -->
52-
<DelaySign>true</DelaySign>
26+
<PublicSign Condition="'$(OS)' != 'Windows_NT'">true</PublicSign>
27+
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
5328
</PropertyGroup>
54-
55-
<ItemGroup>
56-
<AssemblyAttribute Include="System.Reflection.AssemblyMetadataAttribute">
57-
<_Parameter1>BuildNumber</_Parameter1>
58-
<_Parameter2>$(BuildNumber)</_Parameter2>
59-
</AssemblyAttribute>
60-
</ItemGroup>
6129
</Project>

Diff for: ‎Directory.Build.targets

+6-11
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,14 @@
11
<Project>
22
<!-- Will also stop MsBuild searching parent directories for this file. -->
33

4-
<!-- $(Configuration) is not defined until after Directory.Build.props runs. -->
5-
<PropertyGroup Condition="$(_ImportParentFile)">
6-
<!-- Update $(PackageOutputPath) only if it has a default value. Users can override this e.g. on command line. -->
7-
<PackageOutputPath Condition=" '$(PackageOutputPath)' == '$(BaseOutputPath)$(Configuration)\' ">
8-
$(RepositoryRoot)bin\$(Configuration)\
9-
</PackageOutputPath>
10-
<PackageOutputPath Condition=" '$(PackageOutputPath)' == '$(BaseOutputPath)$(PlatformName)\$(Configuration)\' ">
11-
$(RepositoryRoot)bin\$(PlatformName)\$(Configuration)\
12-
</PackageOutputPath>
4+
<!-- In Directory.Build.targets because $(TargetFramework) may not be set when Directory.Build.props is imported. -->
5+
<PropertyGroup>
6+
<RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">2.0.0</RuntimeFrameworkVersion>
7+
<RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp2.1' ">2.1.0-preview1-26016-05</RuntimeFrameworkVersion>
138
</PropertyGroup>
149

15-
<!-- Default items are added after Directory.Build.props runs, causing invalid duplicate entries. -->
16-
<ItemGroup Condition="$(_ImportParentFile) AND Exists( '$(MSBuildProjectDirectory)\Properties\Resources.resx' )">
10+
<!-- In Directory.Build.targets because default items are added after Directory.Build.props is imported, causing invalid duplicate entries. -->
11+
<ItemGroup Condition="Exists( '$(MSBuildProjectDirectory)\Properties\Resources.resx' )">
1712
<Compile Update="Properties\Resources.Designer.cs">
1813
<DesignTime>True</DesignTime>
1914
<AutoGen>True</AutoGen>

0 commit comments

Comments
 (0)