Justin Goshi
72db23ed4d
Merge branch 'master' into dev/jgoshi/renamePropsFiles
2017-02-15 10:28:47 -08:00
Piotr Puszkiewicz
627c03b070
Bump MSBuild to 15.1.548
2017-02-14 22:47:37 -08:00
Piotr Puszkiewicz
25e0020da5
Merge branch 'rel/1.0.0' into tp20170210-02
2017-02-14 16:51:59 -08:00
Nate Amundson
73d59c423d
Remove import of dir.props from Signing.proj
...
The build agents in our VSTS pool don't yet have MSBuild 15, so the
signing project can't import any MSBuild 15 projects. (The signing
project is built with the desktop MSBuild because MicroBuild depends on
it.) Once the agents have MSBuild 15, this import can be added back.
2017-02-14 16:49:57 -08:00
Justin Goshi
27182f293d
merge
2017-02-14 16:43:23 -08:00
Piotr Puszkiewicz
a906069859
Merge pull request #5693 from dotnet/dev/jgoshi/refactorBuildProj
...
Remove more properties from build.proj
2017-02-14 16:19:53 -08:00
Piotr Puszkiewicz
6415c2334a
Merge branch 'rel/1.0.0' into tp20170210-02
2017-02-14 15:47:24 -08:00
Justin Goshi
62abef428e
Rename build files
2017-02-14 15:42:13 -08:00
Livar Cunha
8a53b08959
Running chmod after crossgen so that our chmod changes are not overwritten by it.
2017-02-14 13:13:08 -08:00
Justin Goshi
87ee130ab5
Create CoreSetupInfo.props
2017-02-14 10:30:28 -08:00
Rohit Agrawal
9cf8e8c57f
update nuget to 4.0.0-rtm-2283 ( #5691 )
2017-02-13 18:11:51 -08:00
Justin Goshi
3b9ecf7f86
Address PR comments
2017-02-13 17:37:23 -08:00
Rama Krishnan Raghupathy
badab4680d
Adding the shim of dotnet-cache
...
Adds filter profile option to publish
2017-02-13 16:01:06 -08:00
Justin Goshi
3dad3afc03
Remove more properties from build.proj
2017-02-13 15:08:10 -08:00
Livar
6ef4bdf4e2
Merge branch 'rel/1.0.0' into new_shared_framework_versions
2017-02-13 13:44:57 -08:00
Piotr Puszkiewicz
a101c703a1
First try at refactor of Prepare.targets ( #5647 )
...
* First try at refactor of Prepare.targets
* Enable restore of CLI build tasks
* Fix up build
* Feedback
* Newlines
* Add new props to sln
* CommitCount
* NuGet.config
* WorkingDir
* packages dir path
* Add missing nuget.configs
* Workaround for https://github.com/NuGet/Home/issues/4583
* Match NuGet.Config casing
* Put back Version Badge Properties
* Remove duplicate
2017-02-13 13:06:30 -08:00
Livar
251237b481
Merge branch 'rel/1.0.0' into drop_suffix
2017-02-11 11:52:10 -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
Eric Erhardt
01d2505c03
Merge pull request #5662 from eerhardt/FixNetStandardLibrary
...
Fix dotnet new classlib to contain the correct NETStandard.Library version.
2017-02-10 20:26:11 -06:00
Livar Cunha
167e2da398
Updating msbuild to 15.1.0-preview-000545-01.
2017-02-10 16:13:15 -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
Eric Erhardt
25f9a1bbc7
Fix dotnet new classlib to contain the correct NETStandard.Library version.
...
Fix #5638
2017-02-10 14:22:07 -06:00
Justin Goshi
33d83d6639
Refactor tasks
2017-02-10 12:13:44 -08:00
Eric Erhardt
e7689a3116
Merge pull request #5648 from eerhardt/master-UpdateDependencies
...
Upgrade update-dependencies
2017-02-10 14:02:12 -06:00
Arun Mahapatra
4621c1a6ec
Insert TestPlatform v15.0.0-preview-20170210-02.
2017-02-10 21:58:34 +05:30
Livar
1c896d4402
Adding release suffix as a modified parameter of the build and removing NugetVersionForVS. we don't need that concept.
2017-02-09 22:31:46 -08:00
Livar Cunha
81a94c0902
Enabling publishing the nupkgs produced by the CLI to blob storage and hooking up DropSuffix to the VS targeted nupkg of the CLI.
2017-02-09 15:47:53 -08:00
eerhardt
72af77de1b
Update CoreSetup to beta-001509
2017-02-09 16:56:32 -06:00
Unknown
ee34309e4a
Merge remote-tracking branch 'refs/remotes/dotnet/master'
...
Conflicts:
build/Microsoft.DotNet.Cli.Prepare.targets
2017-02-09 11:00:02 -08:00
Piotr Puszkiewicz
806b294777
Overwrite props files if they exist
2017-02-09 10:50:21 -08:00
Eric Erhardt
454dd10f8d
Update dotnet new to use the new 2.0 templates.
2017-02-09 10:18:39 -06:00
Piotr Puszkiewicz
6b7ad0544f
small refactor
2017-02-09 00:26:40 -08:00
Livar
a88df7953c
Merge branch 'rel/1.0.0' into drop_suffix
2017-02-08 20:35:49 -08:00
Justin Goshi
13fd6d85d7
Remove stuff from prepare.targets
2017-02-08 19:22:56 -08:00
Justin Goshi
2eac755db7
Refactor
2017-02-08 19:13:30 -08:00
Livar Cunha
d373ce8911
Enabling publish with drop suffix to still publish to a suffix based folder in blob to avoid conflicts.
2017-02-08 18:17:04 -08: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
Justin Goshi
50493d2dab
Address PR comments
2017-02-08 14:02:29 -08:00
Justin Goshi
d51bfd1bea
Merge branch 'master' into dev/jgoshi/firstPassProps
2017-02-08 11:57:58 -08:00
Eric Erhardt
546d62061a
Merge branch 'master' into rel100toMaster
2017-02-08 12:30:32 -06:00
Eric Erhardt
56d391caad
Fix up the merge so it gets past Prepare and Compile.
2017-02-08 12:26:04 -06:00
Rohit Agrawal
6d492a9ab1
Update Microsoft.DotNet.Cli.DependencyVersions.props
2017-02-08 08:25:30 -08:00
Piotr Puszkiewicz
211255d6c4
Remove Stage1 compilation
2017-02-07 19:41:45 -08:00
Justin Goshi
2b15651716
Trying to fix the build breaks first
2017-02-07 17:34:41 -08:00
Justin Goshi
b927922b65
Address PR comments and fix build break
2017-02-07 16:52:08 -08:00
Justin Goshi
83b46ebc17
Generate host and build info and store them in .props files
2017-02-07 15:45:19 -08:00
Piotr Puszkiewicz
0a634d5174
Add incrementality check for MSI generation
2017-02-07 10:56:06 -08:00
Mike Lorbetske
947fbfbd5b
Update template engine templates version to absorb the fix
2017-02-06 13:55:05 -08:00
Piotr Puszkiewicz
b0a5d53ed5
Merge rel/1.0.0 to master
2017-02-06 12:43:57 -08:00
Eric Erhardt
e947baaa17
Update Microsoft.NETCore.App to 2.0.0-beta-001507-00.
...
Use the crossgen and jit that comes with Microsoft.NETCore.App so we don't have to keep a corresponding CoreCLR version around.
Remove workarounds for crossgen bug https://github.com/dotnet/coreclr/issues/9118
2017-02-06 14:37:39 -06:00
Eric Erhardt
6f666ab7af
Update installer monikers.
...
Also removing a lingering registry key that was originally needed for the rc2 => preview1 SDK re-branding. This is no longer necessary.
2017-02-06 13:08:44 -06:00
Rohit Agrawal
fb4977e5f8
update nuget and sdk
...
update nuget to 4.0.0-rtm-2265
and sdk to 20170205-2
2017-02-05 11:08:33 -08:00
Unknown
8671021577
Update MSBuild
2017-02-03 17:07:53 -08:00
Nate Amundson
1db92f8c69
Temporarily use sandboxes for publishing
...
During the official build transition, use sandboxes for:
1. Blog container for the artifacts and checksums
2. MyGet feed
3. VS NuGet feed
4. Versions repo
In addition, skip publishing packages to the apt-get repo, because a
sandbox is not trivial to configure.
2017-02-03 12:09:55 -08:00
Nate Amundson
83ca9bf952
Add checked-in build definitions
...
These build definitions will be used by pipebuild to build the product.
The signing now uses MicroBuild because the builds are being moved to
the DevDiv VSTS instance, and the Microsoft Code Signing system which
was used in MSEng is not supported there.
MicroBuild does not support the .NET Core MSBuild, so the full-framework
MSBuild is used to build the signing targets. For this reason, the
signing logic is implemented as a standalone MSBuild project.
2017-02-03 12:09:53 -08:00
Piotr Puszkiewicz
f69f0ed266
Bump MSBuild to 15.1.0-preview-000544-02 ( #5567 )
2017-02-02 18:00:03 -08:00
Mike Lorbetske
ce59e6b19f
Bug 378740 - Razor view precompilation, framework switch casing, framework options for class library ( #5560 )
2017-02-02 15:48:25 -08:00
Eric Erhardt
c27029a020
Update Microsoft.NETCore.App to 2.0.0-beta-001486-00
2017-02-02 17:31:07 -06:00
Rohit Agrawal
bffbee2b91
update nuget to 4.0.0-rtm-2259 ( #5551 )
2017-02-01 20:28:06 -08:00
Eric Erhardt
208776ed69
Merge master into local branch.
2017-02-01 18:39:32 -06: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
9404dd2f98
Update MSBuild to 15.2.0-preview-000002-01.
...
This contains the fix for https://github.com/Microsoft/msbuild/issues/1634
2017-02-01 15:59:35 -06:00
Eric Erhardt
7543551602
Disable EnsureStageSeparation test until we can get a new stage0 with a new MSBuild that has the appropriate fixes.
2017-02-01 15:46:24 -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
f6a5dd1146
Fix crossgen error on netcoreapp1.0 assemblies.
2017-01-31 15:24:10 -06:00
Eric Erhardt
7324aa45d0
Update Microsoft.NETCore.App to 2.0.0-beta-001450-00
2017-01-31 13:11:22 -06:00
Piotr Puszkiewicz
d2035ff036
Merge remote-tracking branch 'refs/remotes/dotnet/rel/1.0.0-rc3'
...
Conflicts:
build/Microsoft.DotNet.Cli.DependencyVersions.props
2017-01-30 23:27:48 -08:00
Faizan2304
3eee54e4f9
Inserting localize testplatform ( #5510 )
2017-01-30 21:05:16 -08:00
Eric Erhardt
fd65cb03b6
Update dotnet new to generate a "2.0" project.
2017-01-29 09:46:46 -06:00
Eric Erhardt
ef35dbc768
Fix crossgen executable permissions
...
Workaround https://github.com/NuGet/Home/issues/4424
2017-01-28 13:21:16 -06:00
Rohit Agrawal
4c55fb6211
update nuget and sdk rtm-2241 ( #5447 )
...
* update nuget and sdk rtm-2241
* Applying the no packagereference workaround.
* Fix merge issue
* add comments for restore related workarounds added in test assets
2017-01-27 19:12:35 -08: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
e121f4cbf3
Merge branch 'rel/1.0.0' into piotrpMSFT/infra/outception
2017-01-27 12:59:20 -08:00
Piotr Puszkiewicz
31a6da880f
Reverse installation order of shared frameworks
2017-01-27 11:49:54 -08:00
Piotr Puszkiewicz
188c5d1022
Merge branch 'rel/1.0.0' into piotrpMSFT/infra/outception
2017-01-27 11:20:02 -08:00
Piotr Puszkiewicz
bbf14163a4
Merge branch 'rel/1.0.0' into PortChange
2017-01-27 02:08:49 -08:00
Piotr Puszkiewicz
401a2dd2ce
pr feedback
2017-01-27 00:56:51 -08:00
Piotr Puszkiewicz
c4e928a18d
Cleanup
2017-01-27 00:46:09 -08:00
Piotr Puszkiewicz
c25abfb7c7
WiP
2017-01-27 00:46:09 -08:00
Livar
422b03cee4
Update the template engine version again.
2017-01-26 22:55:16 -08:00
Livar
ef95add8f6
Update the template engine to the correct build.
2017-01-26 20:55:41 -08:00
Parallels
c849e8ba4c
Updating the template engine version to a version that depends on 1.6.0 and updating our build scripts to allow for a commit count override.
2017-01-26 20:44:31 -08:00
Livar
29ad4a25ec
Merge branch 'rel/1.0.0' into bump_sdk
2017-01-26 19:12:20 -08:00
Livar
225b700173
Merge branch 'rel/1.0.0' into bump_sdk
2017-01-26 17:41:35 -08:00
Piotr Puszkiewicz
b4b4fa64fe
Bump MSBuild to 15.1.0-preview-000539-01
2017-01-26 17:04:50 -08:00
jonsequitur
090c8e2e09
hoist CoreCLRRid definition to Prepare.targets
2017-01-26 14:48:42 -08:00
jonsequitur
d25f2a11d6
remove rid for Microsoft.DotNet.Cli.Utils test package build
2017-01-26 14:48:42 -08:00
jonsequitur
a14195f76d
hoist task batching to target batching
2017-01-26 14:48:42 -08:00
jonsequitur
d63e0dd74a
reduce abstraction in building test packages
2017-01-26 14:48:41 -08:00
jonsequitur
473e28c26b
remove tool_csc cleanup
2017-01-26 14:48:41 -08:00
Piotr Puszkiewicz
add5f72573
Simplify desktop test packaging
2017-01-26 14:48:41 -08:00
Piotr Puszkiewicz
e0f46f9de4
add missing suffix component
2017-01-26 14:48:41 -08:00
Piotr Puszkiewicz
e089f8753e
Account for NuGet/Home#4404
2017-01-26 14:48:41 -08:00
jonsequitur
4985804ba2
update Roslyn to 2.0.0-rc4-61325-08
2017-01-26 14:48:41 -08:00
jonsequitur
89ff57f51b
only build desktop-and-portable TestPackage on Windows
2017-01-26 14:48:41 -08:00
jonsequitur
f66dbdb4b4
dotnet-desktop-and-portable.csproj to netcoreapp1.1
2017-01-26 14:48:41 -08:00
jonsequitur
25e3395684
dotnet-desktop-and-portable.csproj to netcoreapp1.0
2017-01-26 14:48:40 -08:00
Piotr Puszkiewicz
cc30bdde8a
Make Deb tests test Deb
2017-01-26 14:48:40 -08:00