Justin Goshi
4d38a9be97
Fix the file
2017-02-15 12:00:57 -08:00
Justin Goshi
b40635f8df
Fix up the file
2017-02-15 11:59:30 -08:00
Justin Goshi
2f298ed616
Now add the original file without any rename
2017-02-15 11:57:11 -08:00
Justin Goshi
da81fcaa30
One more try. Delete the file first
2017-02-15 11:56:46 -08:00
Justin Goshi
832e8dc6e0
try new spacing
2017-02-15 11:54:35 -08:00
Justin Goshi
0c7a94e7cb
Trying to figure out spacing
2017-02-15 11:52:14 -08:00
Justin Goshi
ce0ae2553d
fix tabs
2017-02-15 11:51:00 -08:00
Justin Goshi
688195b8b5
try again
2017-02-15 11:47:33 -08:00
Justin Goshi
e85f4069c4
Now rename
2017-02-15 11:43:27 -08:00
Justin Goshi
7a894df413
Trying to fix the diff of one file
2017-02-15 11:42:34 -08:00
Justin Goshi
62abef428e
Rename build files
2017-02-14 15:42:13 -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
Eric Erhardt
25f9a1bbc7
Fix dotnet new classlib to contain the correct NETStandard.Library version.
...
Fix #5638
2017-02-10 14:22:07 -06:00
eerhardt
72af77de1b
Update CoreSetup to beta-001509
2017-02-09 16:56:32 -06:00
Eric Erhardt
454dd10f8d
Update dotnet new to use the new 2.0 templates.
2017-02-09 10:18:39 -06:00
Eric Erhardt
546d62061a
Merge branch 'master' into rel100toMaster
2017-02-08 12:30:32 -06: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
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
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
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
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
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
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
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
4985804ba2
update Roslyn to 2.0.0-rc4-61325-08
2017-01-26 14:48:41 -08:00
jonsequitur
d55be626a9
netcoreapp1.1 fixes
2017-01-26 14:48:39 -08:00
Eric Erhardt
d4153815d5
Update the CLI to netcoreapp2.0.
2017-01-26 07:28:59 -06:00
Livar Cunha
6af1648543
Bumping the SDK version to 1.0.0-alpha-20170123-1.
2017-01-25 10:33:38 -08:00
Piotr Puszkiewicz
7c62621b8f
Merge branch 'rel/1.0.0-rc3' into rel/1.0.0-rc3
2017-01-24 03:07:49 -08:00
Piotr Puszkiewicz
ad8710decc
SDK 20170123-1 ( #5434 )
...
* Revert "Merge pull request #5362 from dotnet/ragrawal/updatesdktrial"
This reverts commit 4e0b465093
.
* bump SDK to 20170123-1
2017-01-24 01:14:35 -08:00
Mike Lorbetske
872e96cfe2
Update version of Microsoft.AspNetCore.Mvc
2017-01-23 20:21:58 -08:00
Arun Mahapatra
aa0359cd9a
Insert test platform v15.0.0-preview-20170123-02 ( #5426 )
...
* Insert test platform v15.0.0-preview-20160120-03.
Remove OutputType from test project templates since it is
automatically determined by Microsoft.NET.Test.Sdk.
* Update testplatform v15.0.0-preview-20170123-02.
2017-01-23 13:54:08 -08:00
Eric Erhardt
1950ef5e17
Merge rel/1.0.0 into master
2017-01-23 09:57:56 -06:00
Mike Lorbetske
8ac7312fa3
Take the latest WebSDK version to absorb a publish output directory change ( #5409 )
2017-01-20 23:03:03 -08:00
Piotr Puszkiewicz
05956f6efa
Merge branch 'rel/1.0.0-rc3' into ragrawal/updatesdktrial
2017-01-18 13:41:50 -08:00
Krzysztof Wicher
1a20d7f82c
Merge remote-tracking branch 'github/rel/1.0.0-rc3' into rel/1.0.0
2017-01-18 12:38:11 -08:00