This repository has been archived by the owner on Nov 20, 2018. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 74
Build with MSBuild #238
Merged
Merged
Build with MSBuild #238
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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 |
|---|---|---|
|
|
@@ -33,3 +33,4 @@ testWorkDir/ | |
| *.nuget.props | ||
| *.nuget.targets | ||
| .idea/ | ||
| .dotnet/ | ||
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
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
File renamed without changes.
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,42 @@ | ||
| <Project> | ||
| <PropertyGroup> | ||
| <!-- general options --> | ||
| <NeutralLanguage>en-US</NeutralLanguage> | ||
| <Company>Microsoft Corporation.</Company> | ||
| <Product>Microsoft .NET</Product> | ||
|
|
||
| <!-- create second-based build number for local builds --> | ||
| <_SecondBasedTimeStamp>$([System.DateTime]::UtcNow.Subtract($([System.DateTime]::Parse("2015-01-01"))).TotalSeconds.ToString())</_SecondBasedTimeStamp> | ||
| <_SecondBasedTimeStamp>t$([System.Int64]::Parse($(_SecondBasedTimeStamp.Substring(0, $(_SecondBasedTimeStamp.IndexOf("."))))).ToString("x9"))</_SecondBasedTimeStamp> | ||
|
|
||
| <!-- pack options --> | ||
| <PackWithoutBuildNumber Condition="'$(PackWithoutBuildNumber)'==''">false</PackWithoutBuildNumber> | ||
| <BuildNumber Condition="'$(BuildNumber)'==''">$(_SecondBasedTimeStamp)</BuildNumber> | ||
| <VersionSuffix Condition="'$(VersionSuffix)'!='' AND '$(BuildNumber)' != ''">$(VersionSuffix)-$(BuildNumber)</VersionSuffix> | ||
| <VersionSuffix Condition="'$(VersionSuffix)'==''">$(BuildNumber)</VersionSuffix> | ||
|
|
||
| <PackageId>$(MSBuildProjectName)</PackageId> | ||
| <Authors>Microsoft</Authors> | ||
| <Copyright>© Microsoft Corporation. All rights reserved.</Copyright> | ||
| <RepositoryUrl>https://github.com/aspnet/DotNetTools</RepositoryUrl> | ||
| <RepositoryType>git</RepositoryType> | ||
| <ProjectUrl>https://asp.net</ProjectUrl> | ||
| <RequireLicenseAcceptance>true</RequireLicenseAcceptance> | ||
|
|
||
| <!-- build options --> | ||
| <WarningsAsErrors>true</WarningsAsErrors> | ||
| <AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)Key.snk</AssemblyOriginatorKeyFile> | ||
| <SignAssembly>true</SignAssembly> | ||
| <PublicSign Condition="'$(OS)' != 'Windows_NT'">true</PublicSign> | ||
| </PropertyGroup> | ||
|
|
||
| <PropertyGroup Condition="$(PackWithoutBuildNumber) AND '$(VersionPrefix)' != ''"> | ||
| <PackageVersion>$(VersionPrefix)</PackageVersion> | ||
| <PackageVersion Condition="'$(VersionSuffix)' != ''">$(PackageVersion)-$(VersionSuffix)-final</PackageVersion> | ||
| </PropertyGroup> | ||
|
|
||
| <PropertyGroup Condition="'$(Configuration)' == 'Release'"> | ||
| <!-- pack options --> | ||
| <Serviceable>true</Serviceable> | ||
| </PropertyGroup> | ||
| </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,5 @@ | ||
| <Project> | ||
|
|
||
| <Import Project="version.props" /> | ||
| <Import Project="build\common.props" /> | ||
| </Project> |
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
23 changes: 23 additions & 0 deletions
23
src/Microsoft.DotNet.Watcher.Tools/Microsoft.DotNet.Watcher.Tools.csproj
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,23 @@ | ||
| <Project Sdk="Microsoft.NET.Sdk"> | ||
| <Import Project="..\dir.props" /> | ||
| <PropertyGroup> | ||
| <TargetFramework>netcoreapp1.0</TargetFramework> | ||
| <AssemblyName>dotnet-watch</AssemblyName> | ||
| <OutputType>Exe</OutputType> | ||
| <Description>Command line tool to watch for source file changes during development and restart the dotnet command.</Description> | ||
| <PackageTags>dotnet;watch</PackageTags> | ||
| </PropertyGroup> | ||
|
|
||
| <ItemGroup> | ||
| <Compile Include="**\*.cs" /> | ||
| <Compile Include="..\..\shared\**\*.cs" /> | ||
| <EmbeddedResource Include="**\*.resx" /> | ||
| <EmbeddedResource Include="dotnetwatch.targets" LogicalName="dotnetwatch.targets" /> | ||
| <Content Include="toolassets\*.targets" CopyToOutputDirectory="PreserveNewest" Pack="true" PackagePath="%(Identity)" /> | ||
| </ItemGroup> | ||
|
|
||
| <ItemGroup> | ||
| <!-- Restore this when https://github.com/NuGet/Home/issues/3683 is resolved --> | ||
| <!--<PackageReference Include="Microsoft.Extensions.Process.Sources" Version="1.1.0-*" PrivateAssets="All" />--> | ||
| </ItemGroup> | ||
| </Project> |
31 changes: 0 additions & 31 deletions
31
src/Microsoft.DotNet.Watcher.Tools/Microsoft.DotNet.Watcher.Tools.nuspec
This file was deleted.
Oops, something went wrong.
20 changes: 0 additions & 20 deletions
20
src/Microsoft.DotNet.Watcher.Tools/Microsoft.DotNet.Watcher.Tools.xproj
This file was deleted.
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
6 changes: 0 additions & 6 deletions
6
src/Microsoft.DotNet.Watcher.Tools/Properties/InternalsVisibleTo.cs
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.
Where is this being set in case
PackWithoutBuildNumber == false? or does it not need to be?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.
In this repo, version.props has it...but you make a good point. This should be made safer so that it can be generalized.
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.
version.props only sets the
VersionPrefixandVersionSuffixbut not thePackageVersion.Am I missing something?
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.
Yeah, PackageVersion is in NuGet's pack targets. It defaults to
$(Version)but can be overridden if you want the pkg version to differ from the build version.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.
👍 Did not know that.