New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Updating the repo to use Directory.Build.props/targets files #920
Merged
JimBobSquarePants
merged 6 commits into
SixLabors:master
from
tannergooding:infrastructure
Jun 1, 2019
Merged
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
d517ea6
Updating the repo to use Directory.Build.props/targets files
tannergooding 9b34afb
Adding an InternalsVisibleTo for DynamicProxyGenAssembly2, PublicKeyT…
tannergooding 811efc4
Removing duplicate includes from the ImageSharp.csproj
tannergooding db8d8d0
Updating the .gitattributes file to explicitly list the line endings
tannergooding b907610
Removing the ImageSharp.ruleset file, as the one from standards shoul…
tannergooding 81c9deb
Updating the package version management to use `PackageReference Update`
tannergooding File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,49 +1,108 @@ | ||
| *.doc diff=astextplain | ||
| *.DOC diff=astextplain | ||
| *.docx diff=astextplain | ||
| *.DOCX diff=astextplain | ||
| *.dot diff=astextplain | ||
| *.DOT diff=astextplain | ||
| *.pdf diff=astextplain | ||
| *.PDF diff=astextplain | ||
| *.rtf diff=astextplain | ||
| *.RTF diff=astextplain | ||
| ############################################################################### | ||
| # Set default behavior to: | ||
| # treat as text and | ||
| # normalize to Unix-style line endings | ||
| ############################################################################### | ||
| * text eol=lf | ||
|
|
||
| *.jpg binary | ||
| *.png binary | ||
| *.gif binary | ||
| ############################################################################### | ||
| # Set explicit file behavior to: | ||
| # treat as text and | ||
| # normalize to Unix-style line endings | ||
| ############################################################################### | ||
| *.asm text eol=lf | ||
| *.c text eol=lf | ||
| *.clj text eol=lf | ||
| *.cmd text eol=lf | ||
| *.cpp text eol=lf | ||
| *.css text eol=lf | ||
| *.cxx text eol=lf | ||
| *.config text eol=lf | ||
| *.DotSettings text eol=lf | ||
| *.erl text eol=lf | ||
| *.fs text eol=lf | ||
| *.fsx text eol=lf | ||
| *.h text eol=lf | ||
| *.htm text eol=lf | ||
| *.html text eol=lf | ||
| *.hs text eol=lf | ||
| *.hxx text eol=lf | ||
| *.java text eol=lf | ||
| *.js text eol=lf | ||
| *.json text eol=lf | ||
| *.less text eol=lf | ||
| *.lisp text eol=lf | ||
| *.lua text eol=lf | ||
| *.m text eol=lf | ||
| *.md text eol=lf | ||
| *.php text eol=lf | ||
| *.props text eol=lf | ||
| *.ps1 text eol=lf | ||
| *.py text eol=lf | ||
| *.rb text eol=lf | ||
| *.resx text eol=lf | ||
| *.runsettings text eol=lf | ||
| *.ruleset text eol=lf | ||
| *.sass text eol=lf | ||
| *.scss text eol=lf | ||
| *.sh text eol=lf | ||
| *.sql text eol=lf | ||
| *.svg text eol=lf | ||
| *.targets text eol=lf | ||
| *.tt text eol=lf | ||
| *.ttinclude text eol=lf | ||
| *.txt text eol=lf | ||
| *.vb text eol=lf | ||
| *.yml text eol=lf | ||
|
|
||
| *.cs text=auto diff=csharp | ||
| *.vb text=auto | ||
| *.c text=auto | ||
| *.cpp text=auto | ||
| *.cxx text=auto | ||
| *.h text=auto | ||
| *.hxx text=auto | ||
| *.py text=auto | ||
| *.rb text=auto | ||
| *.java text=auto | ||
| *.html text=auto | ||
| *.htm text=auto | ||
| *.css text=auto | ||
| *.scss text=auto | ||
| *.sass text=auto | ||
| *.less text=auto | ||
| *.js text=auto | ||
| *.lisp text=auto | ||
| *.clj text=auto | ||
| *.sql text=auto | ||
| *.php text=auto | ||
| *.lua text=auto | ||
| *.m text=auto | ||
| *.asm text=auto | ||
| *.erl text=auto | ||
| *.fs text=auto | ||
| *.fsx text=auto | ||
| *.hs text=auto | ||
| ############################################################################### | ||
| # Set explicit file behavior to: | ||
| # treat as text | ||
| # normalize to Unix-style line endings and | ||
| # diff as csharp | ||
| ############################################################################### | ||
| *.cs text eol=lf diff=csharp | ||
|
|
||
| *.csproj text=auto merge=union | ||
| *.vbproj text=auto merge=union | ||
| *.fsproj text=auto merge=union | ||
| *.dbproj text=auto merge=union | ||
| *.sln text=auto eol=crlf merge=union | ||
| ############################################################################### | ||
| # Set explicit file behavior to: | ||
| # treat as text | ||
| # normalize to Unix-style line endings and | ||
| # use a union merge when resoling conflicts | ||
| ############################################################################### | ||
| *.csproj text eol=lf merge=union | ||
| *.dbproj text eol=lf merge=union | ||
| *.fsproj text eol=lf merge=union | ||
| *.ncrunchproject text eol=lf merge=union | ||
| *.vbproj text eol=lf merge=union | ||
|
|
||
| ############################################################################### | ||
| # Set explicit file behavior to: | ||
| # treat as text | ||
| # normalize to Windows-style line endings and | ||
| # use a union merge when resoling conflicts | ||
| ############################################################################### | ||
| *.sln text eol=crlf merge=union | ||
|
|
||
| ############################################################################### | ||
| # Set explicit file behavior to: | ||
| # treat as binary | ||
| ############################################################################### | ||
| *.bmp binary | ||
| *.dll binary | ||
| *.exe binary | ||
| *.gif binary | ||
| *.jpg binary | ||
| *.png binary | ||
| *.ttf binary | ||
| *.snk binary | ||
|
|
||
| ############################################################################### | ||
| # Set explicit file behavior to: | ||
| # diff as plain text | ||
| ############################################################################### | ||
| *.doc diff=astextplain | ||
| *.docx diff=astextplain | ||
| *.dot diff=astextplain | ||
| *.pdf diff=astextplain | ||
| *.pptx diff=astextplain | ||
| *.rtf diff=astextplain |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,77 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <Project> | ||
|
|
||
| <!-- | ||
| Directory.Build.props is automatically picked up and imported by | ||
| Microsoft.Common.props. This file needs to exist, even if empty so that | ||
| files in the parent directory tree, with the same name, are not imported | ||
| instead. The import fairly early and only Sdk.props will have been imported | ||
| beforehand. We also don't need to add ourselves to MSBuildAllProjects, as | ||
| that is done by the file that imports us. | ||
| --> | ||
|
|
||
| <!-- Default settings that are used by other settings --> | ||
| <PropertyGroup> | ||
| <BaseArtifactsPath>$(MSBuildThisFileDirectory)artifacts/</BaseArtifactsPath> | ||
| <BaseArtifactsPathSuffix>$(ImageSharpProjectCategory)/$(MSBuildProjectName)</BaseArtifactsPathSuffix> | ||
| <RepositoryUrl>https://github.com/SixLabors/ImageSharp/</RepositoryUrl> | ||
| </PropertyGroup> | ||
|
|
||
| <!-- Default settings that explicitly differ from the Sdk.props defaults --> | ||
| <PropertyGroup> | ||
| <AllowUnsafeBlocks>true</AllowUnsafeBlocks> | ||
| <BaseIntermediateOutputPath>$(BaseArtifactsPath)obj/$(BaseArtifactsPathSuffix)/</BaseIntermediateOutputPath> | ||
| <DebugType>portable</DebugType> | ||
| <DebugType Condition="'$(codecov)' != ''">full</DebugType> | ||
| <NullableContextOptions>disable</NullableContextOptions> | ||
| <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance> | ||
| <SignAssembly>false</SignAssembly> | ||
| <SuppressNETCoreSdkPreviewMessage>true</SuppressNETCoreSdkPreviewMessage> | ||
| <TreatWarningsAsErrors>true</TreatWarningsAsErrors> | ||
| </PropertyGroup> | ||
|
|
||
| <PropertyGroup Condition="'$(Configuration)' == 'Debug'"> | ||
| <CheckForOverflowUnderflow>true</CheckForOverflowUnderflow> | ||
| </PropertyGroup> | ||
|
|
||
| <!-- Default settings that explicitly differ from the Sdk.targets defaults--> | ||
| <PropertyGroup> | ||
| <Authors>Six Labors and contributors</Authors> | ||
| <BaseOutputPath>$(BaseArtifactsPath)bin/$(BaseArtifactsPathSuffix)/</BaseOutputPath> | ||
| <Company>Six Labors</Company> | ||
| <PackageOutputPath>$(BaseArtifactsPath)pkg/$(BaseArtifactsPathSuffix)/$(Configuration)/</PackageOutputPath> | ||
| <Product>SixLabors.ImageSharp</Product> | ||
| <VersionPrefix>0.0.1</VersionPrefix> | ||
| <VersionPrefix Condition="'$(packageversion)' != ''">$(PackageVersion)</VersionPrefix> | ||
| <VersionSuffix></VersionSuffix> | ||
| </PropertyGroup> | ||
|
|
||
| <!-- Default settings that are otherwise undefined --> | ||
| <PropertyGroup> | ||
| <AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)standards/SixLabors.snk</AssemblyOriginatorKeyFile> | ||
| <Copyright>Copyright © Six Labors and Contributors</Copyright> | ||
| <Features>strict;IOperation</Features> | ||
| <HighEntropyVA>true</HighEntropyVA> | ||
| <LangVersion>7.3</LangVersion> | ||
| <NeutralLanguage>en</NeutralLanguage> | ||
| <OverwriteReadOnlyFiles>true</OverwriteReadOnlyFiles> | ||
| <PackageIconUrl>https://raw.githubusercontent.com/SixLabors/Branding/master/icons/imagesharp/sixlabors.imagesharp.128.png</PackageIconUrl> | ||
| <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression> | ||
| <PackageProjectUrl>$(RepositoryUrl)</PackageProjectUrl> | ||
| <ProduceReferenceAssembly>true</ProduceReferenceAssembly> | ||
| <RepositoryType>git</RepositoryType> | ||
| <RestoreSources> | ||
| https://www.myget.org/F/sixlabors/api/v3/index.json; | ||
| https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json; | ||
| https://api.nuget.org/v3/index.json; | ||
| </RestoreSources> | ||
| <SixLaborsPublicKey>002400000c8000009400000006020000002400005253413100040000010001000147e6fe6766715eec6cfed61f1e7dcdbf69748a3e355c67e9d8dfd953acab1d5e012ba34b23308166fdc61ee1d0390d5f36d814a6091dd4b5ed9eda5a26afced924c683b4bfb4b3d64b0586a57eff9f02b1f84e3cb0ddd518bd1697f2c84dcbb97eb8bb5c7801be12112ed0ec86db934b0e9a5171e6bb1384b6d2f7d54dfa97</SixLaborsPublicKey> | ||
| <UseSharedCompilation>true</UseSharedCompilation> | ||
| </PropertyGroup> | ||
|
|
||
| <!-- Package references which are consumed by all projects --> | ||
| <ItemGroup> | ||
| <PackageReference Include="Microsoft.Net.Compilers.Toolset" IsImplicitlyDefined="true" /> | ||
| </ItemGroup> | ||
|
|
||
| </Project> | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,47 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <Project> | ||
|
|
||
| <!-- | ||
| Directory.Build.targets is automatically picked up and imported by | ||
| Microsoft.Common.targets. This file needs to exist, even if empty so that | ||
| files in the parent directory tree, with the same name, are not imported | ||
| instead. The import fairly late and most other props/targets will have been | ||
| imported beforehand. We also don't need to add ourselves to | ||
| MSBuildAllProjects, as that is done by the file that imports us. | ||
| --> | ||
|
|
||
| <!-- Settings that append the existing setting value --> | ||
| <PropertyGroup> | ||
| <DefineConstants>$(DefineConstants);$(OS)</DefineConstants> | ||
| </PropertyGroup> | ||
|
|
||
| <!-- Tool versions for tool references across all projects --> | ||
| <ItemGroup> | ||
| <DotNetCliToolReference Update="dotnet-xunit" Version="2.3.1" /> | ||
| </ItemGroup> | ||
|
|
||
| <!-- Package versions for package references across all projects --> | ||
| <ItemGroup> | ||
| <PackageReference Update="BenchmarkDotNet" Version="0.11.5" /> | ||
| <PackageReference Update="Colourful" Version="2.0.2" /> | ||
| <PackageReference Update="Magick.NET-Q16-AnyCPU" Version="7.12.0" /> | ||
| <PackageReference Update="Microsoft.Net.Compilers.Toolset" Version="3.1.0-beta2-final" /> | ||
| <PackageReference Update="Microsoft.NET.Test.Sdk" Version="15.9.0" /> | ||
| <PackageReference Update="Moq" Version="4.10.0" /> | ||
| <PackageReference Update="SixLabors.Core" Version="1.0.0-dev000101" /> | ||
| <PackageReference Update="SixLabors.Fonts" Version="1.0.0-beta0008" /> | ||
| <PackageReference Update="SixLabors.Shapes" Version="1.0.0-beta0008" /> | ||
| <PackageReference Update="SixLabors.Shapes.Text" Version="1.0.0-beta0007" /> | ||
| <PackageReference Update="StyleCop.Analyzers" Version="1.1.118" /> | ||
| <PackageReference Update="System.Drawing.Common" Version="4.5.1" /> | ||
| <PackageReference Update="System.IO.Compression" Version="4.3.0" /> | ||
| <PackageReference Update="System.IO.UnmanagedMemoryStream" Version="4.3.0" /> | ||
| <PackageReference Update="System.Runtime.CompilerServices.Unsafe" Version="4.5.1" /> | ||
| <PackageReference Update="System.Threading.Tasks.Parallel" Version="4.3.0" /> | ||
| <PackageReference Update="System.ValueTuple" Version="4.5.0" /> | ||
| <PackageReference Update="xunit" Version="2.3.1" /> | ||
| <PackageReference Update="xunit.runner.console" Version="2.3.1" /> | ||
| <PackageReference Update="xunit.runner.visualstudio" Version="2.3.1" /> | ||
| </ItemGroup> | ||
|
|
||
| </Project> |
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Once strong-name signing is enabled, it should just involve:
standardssubmoduletruePublicKeymetdata to theInternalsVisibleToitems