Piotr Puszkiewicz
841846f32b
Standardize on newline between Property|ItemGroup areas
2017-03-02 20:38:56 -08:00
Piotr Puszkiewicz
e617376bc7
Trailing newlines + standardize tabs -> spaces
2017-03-02 20:35:20 -08:00
Piotr Puszkiewicz
d9a06ba95c
Remove unnecessary Release constants
...
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
<DefineConstants>$(DefineConstants);RELEASE</DefineConstants>
</PropertyGroup>
2017-03-02 20:11:21 -08:00
Piotr Puszkiewicz
f39eeaf1c3
Version as Metadata in build_projects/
2017-03-02 19:50:19 -08:00
Piotr Puszkiewicz
958fc85962
Merge pull request #5870 from ellismg/make-update-dependencies-idempotent
...
Make update-dependencies idempotent in the only update case
2017-03-02 18:51:31 -08:00
Eric Erhardt
b64068291b
Remove OpenSUSE13 and Fedora23 since they are end of lifed.
2017-03-01 15:27:50 -06:00
Livar Cunha
94b79f4466
Updating the badge names that we use when checking if the build changed. Before, we were using an API to generate the OS names, now we are using msbuild OSName property, which names the OS differently.
2017-03-01 11:46:53 -08:00
Piotr Puszkiewicz
664f089985
Reduce chmod
2017-02-28 18:16:51 -08:00
Matt Ellis
779d26901d
Make update-dependencies idempotent in the only update case
...
Today, if you run update-dependencies --Update and there are no
changes that need to be made (for example, you ran it previously) and
there are pending changes (i.e. git status shows diffs) the program
crashes with an unhandled exception because some code in VersionTools
is upset that there are pending changes since it thinks there should
be none.
Re-structure the code such that we don't call the method that's going
to throw when we are just updating dependencies. This also means
devs (or the composed build) who want to run this more than once do
longer have to reset changes beforehand.
2017-02-28 11:33:37 -08:00
Justin Goshi
61c1e3e104
Remove duplicate properties
2017-02-27 11:06:44 -08:00
Piotr Puszkiewicz
c5e7c3dd45
Merge pull request #5736 from dotnet/dev/jgoshi/morePropsRename
...
Finish renaming props file to remove Microsoft.Dotnet.Cli prefix
2017-02-22 09:15:20 -08:00
Matt Ellis
921c116c65
Consume local info support from VersionTools
...
Davis added support for VersionTools to be able to pull from a local
filesystem layout that looks like what we have in GitHub on
dotnet/versions.
Start to consume this so a composed build can use this logic to update
dependencies using local version information produced during the build.
2017-02-21 16:56:00 -05:00
Justin Goshi
27a11e4eca
Merge branch 'master' into dev/jgoshi/morePropsRename
2017-02-21 10:00:30 -08:00
Piotr Puszkiewicz
85b2a129db
Merge branch 'rel/1.0.0'
...
Conflicts:
TestAssets/TestPackages/dotnet-hello/v1/dotnet-hello/dotnet-hello.csproj
TestAssets/TestPackages/dotnet-hello/v2/dotnet-hello/dotnet-hello.csproj
TestAssets/TestPackages/dotnet-prefercliruntime/dotnet-prefercliruntime.csproj
TestAssets/TestProjects/AppWithDirectAndToolDep/AppWithDirectAndToolDep.csproj
TestAssets/TestProjects/AppWithDirectDep/AppWithDirectDep.csproj
build.proj
build/Compile.targets
build/Microsoft.DotNet.Cli.Compile.targets
build/Microsoft.DotNet.Cli.DependencyVersions.props
build/Microsoft.DotNet.Cli.Monikers.props
build/Microsoft.DotNet.Cli.Prepare.targets
build/package/Microsoft.DotNet.Cli.Nupkg.targets
build/package/Nupkg.targets
build/test/TestPackageProjects.targets
build_projects/dotnet-cli-build/GenerateBuildVersionInfo.cs
build_projects/dotnet-cli-build/GetCommitCount.cs
build_projects/dotnet-cli-build/dotnet-cli-build.csproj
build_projects/shared-build-targets-utils/Utils/BuildVersion.cs
src/dotnet-archive/dotnet-archive.csproj
src/tool_msbuild/tool_msbuild.csproj
src/tool_nuget/tool_nuget.csproj
test/ArgumentForwardingTests/ArgumentForwardingTests.csproj
test/ArgumentsReflector/ArgumentsReflector.csproj
test/EndToEnd/EndToEnd.csproj
test/Microsoft.DotNet.Cli.Sln.Internal.Tests/Microsoft.DotNet.Cli.Sln.Internal.Tests.csproj
test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs
test/Microsoft.DotNet.Cli.Utils.Tests/Microsoft.DotNet.Cli.Utils.Tests.csproj
test/Microsoft.DotNet.Configurer.UnitTests/Microsoft.DotNet.Configurer.UnitTests.csproj
test/Microsoft.DotNet.ProjectJsonMigration.Tests/Microsoft.DotNet.ProjectJsonMigration.Tests.csproj
test/Microsoft.DotNet.Tools.Tests.Utilities/Microsoft.DotNet.Tools.Tests.Utilities.csproj
test/binding-redirects.Tests/binding-redirects.Tests.csproj
test/crossgen.Tests/crossgen.Tests.csproj
test/dotnet-add-package.Tests/dotnet-add-package.Tests.csproj
test/dotnet-add-reference.Tests/dotnet-add-reference.Tests.csproj
test/dotnet-build.Tests/dotnet-build.Tests.csproj
test/dotnet-help.Tests/dotnet-help.Tests.csproj
test/dotnet-list-reference.Tests/dotnet-list-reference.Tests.csproj
test/dotnet-migrate.Tests/dotnet-migrate.Tests.csproj
test/dotnet-msbuild.Tests/dotnet-msbuild.Tests.csproj
test/dotnet-new.Tests/dotnet-new.Tests.csproj
test/dotnet-nuget.UnitTests/dotnet-nuget.UnitTests.csproj
test/dotnet-pack.Tests/dotnet-pack.Tests.csproj
test/dotnet-publish.Tests/dotnet-publish.Tests.csproj
test/dotnet-remove-reference.Tests/dotnet-remove-reference.Tests.csproj
test/dotnet-restore.Tests/dotnet-restore.Tests.csproj
test/dotnet-run.Tests/dotnet-run.Tests.csproj
test/dotnet-sln-add.Tests/dotnet-sln-add.Tests.csproj
test/dotnet-sln-list.Tests/dotnet-sln-list.Tests.csproj
test/dotnet-sln-remove.Tests/dotnet-sln-remove.Tests.csproj
test/dotnet-test.Tests/dotnet-test.Tests.csproj
test/dotnet-vstest.Tests/dotnet-vstest.Tests.csproj
test/dotnet.Tests/dotnet.Tests.csproj
test/msbuild.IntegrationTests/msbuild.IntegrationTests.csproj
tools/Archiver/Archiver.csproj
2017-02-17 02:00:05 -08:00
Justin Goshi
8e58a247b0
Finish renaming props file to remove Microsoft.Dotnet.Cli prefix
2017-02-16 11:16:20 -08:00
Matt Ellis
47b75cfa12
Misc build changes
...
For injestion into a composed build, I'm adding some minor tweaks to
our build system:
- Teach DownloadFile task how to consume file:// URLs so we can pass
around artifacts using local sources.
- Add `SkipBuildingInstallers`, an MSBuild property that can be set
to true when installers (pkgs, msis, debs, rpms and the like) do
not need to be built.
- Add `IncludeAdditionalSharedFrameworks`, an MSBuild property that
can be set to prevent additional shared frameworks (i.e. shared
frameworks that the CLI does not use at runtime) from being
downloaded and included in our payload.
- Add `IncludeNuGetPackageArchive` an MSBuild property that can be
set to prevent the lzma archive containing all the nupkgs we
restore on first run from being included in the final output.
- Provide a way to change the Uri use for blob storage (so the
composed build and point at a local folder that looks like blob
storage to pick up artifacts from).
2017-02-15 16:52:46 -08:00
Matt Ellis
5d932c6aba
Get update-dependenices working again
...
- Fix build issues due to .props file not existing on a clean
enlistment
- Fix path separator issues on *NIX
- Add update-dependencies.sh
- Support -Update in update-dependencies.ps1
2017-02-13 17:30:33 -08:00
Livar
6ef4bdf4e2
Merge branch 'rel/1.0.0' into new_shared_framework_versions
2017-02-13 13:44:57 -08:00
Livar Cunha
1d61bf97ed
Updated the Shared Framework to 1.1.1 and 1.0.4.
2017-02-10 23:05:16 -08:00
Justin Goshi
483e6bd9c1
Address PR comments
2017-02-10 14:13:44 -08:00
Justin Goshi
64ccab43e8
Merge branch 'master' into dev/jgoshi/refactorTasks
2017-02-10 13:38:07 -08:00
Justin Goshi
33d83d6639
Refactor tasks
2017-02-10 12:13:44 -08:00
Eric Erhardt
31ff72e62d
Respond to PR feedback.
2017-02-10 11:53:27 -06:00
Eric Erhardt
1e20550f5d
Upgrade update-dependencies script.
...
- Take the latest VersionTools, so we can take advantage of new features.
- Update what files need to be updated - DependencyVersions.props.
- Clean up the powershell script.
2017-02-09 16:56:19 -06:00
Eric Erhardt
454dd10f8d
Update dotnet new to use the new 2.0 templates.
2017-02-09 10:18:39 -06:00
Livar Cunha
35fc8c1d0e
Step one of introducing a flag to drop the suffix out of our build versions.
2017-02-08 15:26:47 -08:00
Eric Erhardt
56d391caad
Fix up the merge so it gets past Prepare and Compile.
2017-02-08 12:26:04 -06:00
Piotr Puszkiewicz
b0a5d53ed5
Merge rel/1.0.0 to master
2017-02-06 12:43:57 -08:00
Eric Erhardt
a2c1a39d07
Fix projects and tests after merge of rel/1.0.0.
2017-02-01 18:35:52 -06:00
Eric Erhardt
9f0bb778a1
Merge rel/1.0.0 into master.
2017-02-01 14:32:59 -06:00
seancpeters
2d93968a88
New3 integration ( #5430 )
...
* Partial conversion to new3. 2 tests fail due to browserlink not restoring.
* new cache initialization
* More lzma changes, and removed a razor ref from templates
* Ephemeral hive flag added to tests that need it
* Updated the template engine version to build against. Minor code cleanup
* Config changes to make template versions separate from template engine versions
* Changed dotnet new versioning to use Product.Version
* Fixing Archiver.csproj
* Fixing dotnet new test.
* Fix LZMA Package Source Condition
* Workaround for newline differences.
* fixed tests with changed template parameters. Added a new3 template non-match test
2017-01-31 17:31:37 -08:00
Eric Erhardt
fd65cb03b6
Update dotnet new to generate a "2.0" project.
2017-01-29 09:46:46 -06:00
Piotr Puszkiewicz
ba69c88c79
Work around build test.sln
race condition until fixed ( #5490 )
...
* Remove GenerateRuntimeConfigurationFiles from this library
* Disable parallel build of test.sln
* PR feedback
2017-01-27 17:13:04 -08:00
Piotr Puszkiewicz
bbac129c04
Account for Windows slashes
2017-01-27 01:45:31 -08:00
Piotr Puszkiewicz
0ab87924b2
Add DOTNET_RUNTIME_ID to kept environment variables
2017-01-27 01:18:50 -08:00
Piotr Puszkiewicz
c4e928a18d
Cleanup
2017-01-27 00:46:09 -08:00
Piotr Puszkiewicz
d70aeb950b
Success!
2017-01-27 00:46:09 -08:00
PiotrP
a473c2bad7
WiP
2017-01-27 00:46:09 -08:00
Piotr Puszkiewicz
94e74d846a
WiP
2017-01-27 00:46:09 -08:00
Piotr Puszkiewicz
c25abfb7c7
WiP
2017-01-27 00:46:09 -08:00
Piotr Puszkiewicz
19ed5a558b
WiP
2017-01-27 00:46:09 -08:00
Eric Erhardt
0073fc8534
Update CLI to run on netcoreapp1.1.
2017-01-26 14:48:39 -08:00
Eric Erhardt
f6b0196b0f
Turn off multi-proc building of the test .sln to work around "cannot access file becuase it is being used by another process" errors.
2017-01-26 07:29:00 -06:00
Livar
a442449c55
Updating the branding on rel/1.0.0 to rc4. ( #5267 )
2017-01-12 13:14:57 -08:00
PiotrP
9008aaff85
merge RC3 into rel/1.0.0
2017-01-11 13:03:09 -08:00
Eric Erhardt
82317c7a0a
Merge pull request #5257 from eerhardt/UpdateNuGet
...
Update NuGet to 4.0.0-rc3-2193 to bring in new TFMs for netstandard/netcoreapp 2.0
2017-01-11 10:45:45 -06:00
Eric Erhardt
c481ad9cdc
Merge all hard-coded versions and version suffixes to be defined in a single spot.
2017-01-10 20:54:11 -06:00
Livar Cunha
d3157de6ee
Fixing nuget API calls and fixing the nuget test package directory creation, so that nuget can restore using it.
2017-01-10 16:48:28 -06:00
Livar Cunha
e71c58c156
Fixing nuget API calls and fixing the nuget test package directory creation, so that nuget can restore using it.
2017-01-10 10:43:05 -08:00
Eric Erhardt
0f2c305dc1
Add NuGet version to DependencyVersions.props.
2017-01-10 10:48:37 -06:00