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
jonsequitur
bed3d974d6
add netcoreapp1.1 to Ubuntu installer
2017-01-26 14:48:40 -08:00
jonsequitur
3cba07288d
remove redundant ToolPath setting
2017-01-26 14:48:40 -08:00
jonsequitur
0c80992384
move additional tests to netcoreapp1.1
2017-01-26 14:48:40 -08:00
jonsequitur
d55be626a9
netcoreapp1.1 fixes
2017-01-26 14:48:39 -08:00
Eric Erhardt
0073fc8534
Update CLI to run on netcoreapp1.1.
2017-01-26 14:48:39 -08:00
Eric Erhardt
6cb4b27ebb
Make Deb tests test Deb
2017-01-26 14:52:55 -06: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
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
Eric Erhardt
15930fac0f
Fix build with latest stage0.
2017-01-24 17:53:19 -06:00
Eric Erhardt
e0d2bba7db
Fix build with latest stage0.
2017-01-24 14:42:09 -06: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
f4f325f1d5
Cleanup
2017-01-24 02:36:04 -08:00
Piotr Puszkiewicz
131c63ae27
Generate lzma nuget.config when needed
2017-01-24 02:30:24 -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
Piotr Puszkiewicz
1dfee9ead8
[WIP] Reduce test target complexity [and running time] ( #5403 )
...
* Reduce test target complexity [and running time]
* WiP
* Enable building tests via solution
Remove deprecated tests
Make Microsoft.DotNet.Tools.Tests.Utilities portable-only
Remove MSI tests from the solution as they are the only tests that currently require dekstop.
* Enable building of tests
* Move migration tests to TA to allow them to self-restore
* Reduce project nesting and test directory name
2017-01-22 14:40:00 -08: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
dd59e2ce97
Merge pull request #5130 from blackdwarf/slntest
...
Introducing solution file for test projects
2017-01-19 16:12:38 -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
Zlatko Knezevic
e365eb7591
Responding to PR feedback
2017-01-18 12:04:18 -08:00
Zlatko Knezevic
20b06d1f21
Adding back a \n
2017-01-17 22:58:34 -08:00
Piotr Puszkiewicz
964f0177d8
20170117-4
2017-01-17 16:33:36 -08:00
Zlatko Knezevic
d93b7abca0
Merge branch 'rel/1.0.0' into slntest
2017-01-17 12:53:44 -08:00
Rohit Agrawal (NUGET)
337d579949
update nuget and sdk to run a trial build
2017-01-17 11:08:17 -08:00
Piotr Puszkiewicz
61b7841087
bump core sdk to 1.0.0-alpha-20170117-1 ( #5358 )
2017-01-16 20:02:02 -08:00
Piotr Puszkiewicz
b312fbb176
Bump SDK to 20170114-3 ( #5324 )
...
* Bump SDK to 20170114-3
* bump to 20170115-2
2017-01-14 19:52:02 -08:00
Rainer Sigwald
7bc1bd4e7d
Update msbuild to 15.1.0-preview-000523-01 ( #5323 )
2017-01-14 13:55:08 -08:00
Piotr Puszkiewicz
db2282a055
Update Microsoft.DotNet.Cli.DependencyVersions.props ( #5322 )
2017-01-13 23:53:08 -08:00
Piotr Puszkiewicz
20fa03e37f
Bump SDK to 1.0.0-alpha-20170113-2 ( #5313 )
...
* Bump SDK to 1.0.0-alpha-20170113-2
* Updating the Web.SDK to 1.0.0-alpha-20170113-2-221
* Updating the web SDK to 1.0.0-alpha-20170114-1-223
2017-01-13 22:10:56 -08:00
Livar Cunha
8c2e7c9f01
Merge branch 'rel/1.0.0-rc3' into merge_rc3
...
* rel/1.0.0-rc3:
Fixing an issue where packages with a filter but no match were not being migrated as is, instead they were being dropped.
Add support for migrating Microsoft.AspNetCore.Mvc.ViewCompilation
Switching to using a csv as the source of our lts packages. Also, this is a more comprehensive list.
Adding a few more packages that were not in the manifest and moving some tests around.
Migrating packages to LTS (1.0.3) versions if they have a smaller version than the LTS one.
Adding ranges to the source mappings so that we can specify the origin should match this range and migrate to that version. We use this to handle LTS/FTS migration and will use that for the LTS uplift.
Migration: do not inject built in compile includes that the SDK does
Update msbuild to 15.1.0-preview-000522-02
Migration: Do not add RIDs for Library projects (#5279 )
Use a separate env variable to control uploading the lzma archive. We only want OSX to publish the archive, because turns out that windows published archives are not used by unix based oses.
Fix the download of the LZMA archive on dev machines and in Jenkins CI.
2017-01-13 14:08:31 -08:00
Zlatko Knezevic
75dc96be2a
Merge branch 'rel/1.0.0' into slntest
2017-01-12 23:00:41 -08:00
Livar
a442449c55
Updating the branding on rel/1.0.0 to rc4. ( #5267 )
2017-01-12 13:14:57 -08:00
Piotr Puszkiewicz
7608f2d288
Update msbuild to 15.1.0-preview-000522-02
2017-01-11 23:58:51 -08:00
Piotr Puszkiewicz
c0b73e4b5f
Merge branch 'rel/1.0.0' into slntest
2017-01-11 17:37:46 -08:00
Livar Cunha
420a6e9a66
Use a separate env variable to control uploading the lzma archive. We only want OSX to publish the archive, because turns out that windows published archives are not used by unix based oses.
2017-01-11 14:45:25 -08:00
Eric Erhardt
408b36f509
Fix the download of the LZMA archive on dev machines and in Jenkins CI.
2017-01-11 14:45:24 -08:00
PiotrP
c008e85f6a
revert rc3->preview5
2017-01-11 13:18:44 -08:00
PiotrP
9008aaff85
merge RC3 into rel/1.0.0
2017-01-11 13:03:09 -08:00
Piotr Puszkiewicz
0bd6303f47
Restore debian test before running it ( #5272 )
2017-01-11 10:53:26 -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
4b856a785c
Update NuGet to 4.0.0-rc3-2193 to bring in new TFMs for netstandard/netcoreapp 2.0.
2017-01-11 09:45:40 -06:00
Livar
4b82852d56
Updating the version of msbuild to 15.1.0-preview-000516-03 ( #5266 )
...
* Updating the version of msbuild to 15.1.0-preview-000516-03
* Remove test that assumes props/targets imports
The test ItAddsRefBetweenImports validated that the MSBuild XML model contained new project references between the props and targets imports. While useful be fore the SDK attribute, the test no longer adds value since the SDK is added implicitly, guaranteeing it wraps the remaining project contents.
* Move MSBuild to 15.1.0-preview-000509-03
This is the last msbuild version prior to the change of MSBuild's dependencies to include .NET 1.1 components.
* Move MSBuild invocations to use dirs.props/dirs.tasks
* Put back the test targets. We'll unify later.
* Remove dirs.props props from templates msbuild invocation
2017-01-11 01:49:22 -08:00
Piotr Puszkiewicz
19f18a291f
Merge branch 'rel/1.0.0' into slntest
2017-01-11 01:17:52 -08:00
Piotr Puszkiewicz
203a28beb7
Merge branch 'rel/1.0.0' into NuGetDependencyVersions
2017-01-11 00:43:07 -08:00
Mike Lorbetske
ad6fab0a15
Synchronize templates with new3, add global.json ( #5244 )
...
* Synchronize templates with new3, add global.json
* Add runtimeconfig.template.json for web
Removes global.json write during template creation
* Remove global.json check from the test
* making templates the same as new3 templates
* Fix broken PrivateAssets, content update
Sets OutputType as appropriate
Alphabetizes package references
* Rollback browserlink version to 1.0.0
* Downgrade 1.1.0 of browserlink to 1.0.0 as well
* Add newline to the end of the console project
2017-01-10 22:58:30 -08:00
Eric Erhardt
9d2976863b
Merge branch 'rel/1.0.0' into NuGetDependencyVersions
2017-01-10 21:59:30 -06:00
Eric Erhardt
fd8f9b1bde
Fix the download of the LZMA archive on dev machines and in Jenkins CI.
2017-01-10 21:10:40 -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
Krzysztof Wicher
0be2f7c1fa
update msbuild version to 15.1.0-preview-000509-03 ( #5249 )
2017-01-10 17:46:05 -08:00
Rohit Agrawal
00425c3d34
Update Microsoft.DotNet.Cli.DependencyVersions.props
2017-01-10 16:46:32 -08:00
Livar
16e87076a6
Merge branch 'rel/1.0.0-rc3' into updatenugetrc3
2017-01-10 16:08:49 -08:00
Eric Erhardt
36d03ce4ce
Fix up merge of cherry-picking 'Fixing the test packages preparation. First, allows it to run independently. Second, it actually points to packages produced by the repo.'
2017-01-10 17:29:46 -06:00
Livar Cunha
f3945b867d
Fixing windows test.
2017-01-10 16:50:08 -06:00
Livar Cunha
df57e5dbf6
Addressing code review comments.
2017-01-10 16:48:46 -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
4fe36fd1e5
Fixing the test packages preparation. First, allows it to run independently. Second, it actually points to packages produced by the repo.
2017-01-10 16:48:17 -06:00
Livar Cunha
8a6faa2dca
Fixing windows test.
2017-01-10 14:12:04 -08:00
Rohit Agrawal (NUGET)
3ecdc62089
update nuget rc3 dependencies and update sdk
2017-01-10 11:24:27 -08:00
Livar Cunha
e795e12a16
Addressing code review comments.
2017-01-10 10:47:10 -08: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
Eric Erhardt
5035320247
Add NuGet version to DependencyVersions.props.
2017-01-10 10:43:14 -06:00