Piotr Puszkiewicz
79704cc074
Merge branch 'rel/1.0.1' into piotrpMSFT/bump/Roslyn
2017-02-27 13:15:06 -08:00
Eric Erhardt
c66d3bb6ad
Update NuGet version with latest netstandard2.0 build
2017-02-27 14:50:39 -06:00
Justin Goshi
61c1e3e104
Remove duplicate properties
2017-02-27 11:06:44 -08:00
Piotr Puszkiewicz
0a6deabcce
Enable multi-proc build of test sln.
2017-02-27 10:34:59 -08:00
Piotr Puszkiewicz
b55b5ad033
Remove duplicate installer suffix
2017-02-27 10:21:42 -08:00
Eric Erhardt
ab887ec024
Merge remote-tracking branch 'upstream/rel/1.0.0' into rel101
2017-02-25 14:30:53 -06:00
Eric Erhardt
23392fa3c3
Merge branch 'rel/1.0.0' into piotrpMSFT/bump/Roslyn
2017-02-25 13:12:35 -06:00
Livar Cunha
9210b84a98
Updating the SDK to 1.0.0-alpha-20170224-6
2017-02-24 15:56:59 -08:00
Livar Cunha
b3da712d3d
Updating both platform abstractions and dependency model to 1.0.3.
2017-02-24 14:52:05 -08:00
Unknown
66be1db3fe
Bump Roslyn to 2.0.0-rc5-61424-02
2017-02-24 14:11:35 -08:00
Justin Goshi
1b318510b2
Add back last empty line in BranchInfo.props
2017-02-24 10:36:07 -08:00
Justin Goshi
8279c16fa4
Merge branch 'master' into dev/jgoshi/removeGlobalProps
2017-02-24 10:34:23 -08:00
Justin Goshi
5bb7ca8112
Add back BranchInfo.props
2017-02-24 10:34:16 -08:00
Piotr Puszkiewicz
e2dcac0e4b
Merge branch 'rel/1.0.1' into FixUbuntu1610
2017-02-24 01:22:49 -08:00
Unknown
3dc266f21c
Remove RID from test package creation
2017-02-24 00:57:15 -08:00
Eric Erhardt
a7003763b7
Fix debian_config.json on ubuntu16.10
...
When we only have a single shared framework, the python json parser throws an error since there is a hanging comma on the last property.
Fixing this by removing the comma when there is only a single Shared Framework dependency.
2017-02-23 23:25:26 -06:00
Livar
16d1fe4c28
Merge branch 'rel/1.0.0' into update_sdk
2017-02-23 19:49:36 -08:00
Piotr Puszkiewicz
781326a0ad
Merge branch 'rel/1.0.0' into tp-insert-15.0.0
2017-02-23 18:40:58 -08:00
Piotr Puszkiewicz
8fc6766785
Merge branch 'rel/1.0.1' into Merge100To101
2017-02-23 18:22:02 -08:00
Piotr Puszkiewicz
22fcc35797
Merge pull request #5820 from dotnet/dev/jgoshi/refactorPackage
...
Refactor props in package directory
2017-02-23 18:15:52 -08:00
Justin Goshi
74e343e111
First pass at cleaning up the global properties files
2017-02-23 17:07:26 -08:00
Mike Lorbetske
d9d5bb10cb
Template update for test SDK version change
2017-02-23 14:13:27 -08:00
Matt Ellis
0f092f92c2
Don't look for Debian package dependencies when skipping installers
...
Today, we always check to see if DebianPackageBuildDependencies are
present on the machine doing a build, because we will need them to
build the .deb files later on.
Since we now allow skipping of building packages, don't check for
these dependencies if we weren't going to use them.
2017-02-23 14:11:11 -08:00
Justin Goshi
0ec5003d68
Forgot Installer.PKG.targets
2017-02-23 13:59:20 -08:00
Eric Erhardt
ace9526681
Merge remote-tracking branch 'refs/remotes/upstream/rel/1.0.0'
...
Conflicts:
README.md
build/Microsoft.DotNet.Cli.Monikers.props
test/dotnet-build.Tests/GivenDotnetBuildBuildsCsproj.cs
2017-02-23 15:42:35 -06:00
Justin Goshi
d9e532a53d
Fix the build break
2017-02-23 13:30:04 -08:00
Eric Erhardt
5227896d0f
Fix Ubuntu16.10 BuildSdkDeb
...
We need to replace a string with string.Empty in the debian .json file. Fixing ReplaceFileContents to support this scenario.
2017-02-23 15:29:11 -06:00
Justin Goshi
43cf7be593
Try to fix the build break
2017-02-23 13:11:25 -08:00
Piotr Puszkiewicz
55b81e8a23
Merge pull request #5814 from piotrpMSFT/piotrpmsft/infra/removeCoreHost
...
Remove corehost from CLI layout
2017-02-23 12:40:21 -08:00
Justin Goshi
84e8b8580d
Try the rename of the LayoutOutput directory
2017-02-23 12:28:57 -08:00
Justin Goshi
b86afddbd3
Try reverting Installer.DEB.targets to investigate the build break
2017-02-23 12:03:17 -08:00
Satya Madala
4c44e29ea0
TestPlatform branding changes: 15.0.0
2017-02-24 00:18:10 +05:30
Justin Goshi
2118c643d6
Refactor props in package directory
2017-02-23 10:37:48 -08:00
Piotr Puszkiewicz
9e4beca874
Merge pull request #5804 from dotnet/dev/jgoshi/refactorPublishTarget
...
Refactor publish.target
2017-02-23 10:13:47 -08:00
Justin Goshi
acc77e2a46
Address pr comments
2017-02-23 09:26:14 -08:00
Justin Goshi
08ffc78be6
Merge branch 'master' into dev/jgoshi/refactorPublishTarget
2017-02-23 09:01:44 -08:00
Piotr Puszkiewicz
56f9a84dfd
Generate Version file before redist publish
2017-02-23 02:33:00 -08:00
Piotr Puszkiewicz
49dd6bcd7c
Remove corehost from CLI layout
2017-02-23 01:36:43 -08:00
Livar Cunha
7f4f35db65
Adding the SDK version to the hash of the lzma archive, since the SDK has implicit package refs in it that will impact the archive when they change.
2017-02-23 01:13:58 -08:00
Piotr Puszkiewicz
7818348fc2
Move copying sharedfx to before publish of redist
2017-02-23 01:12:32 -08:00
Piotr Puszkiewicz
1199df1c05
Move tool deps file creation into redist.csproj
2017-02-22 22:47:11 -08:00
Piotr Puszkiewicz
dc1b97c4a1
Merge pull request #5806 from piotrpMSFT/piotrpMSFT/infra/HackFilesToCopy
...
remove HackFilesToCopy
2017-02-22 20:16:51 -08:00
Piotr Puszkiewicz
10750eb136
Merge pull request #5807 from piotrpMSFT/piotrpMSFT/infra/RoslynStaticPublish
...
Enable Publishing Roslyn with Static Output Path
2017-02-22 20:16:25 -08:00
Eric Erhardt
7036fa1aef
Update dotnet-deb-tool-consumer to use the latest dotnet-deb-tool.
...
The latest deb-tool will use the CLI's runtime, which is required on distros that don't have .NET Core 1.0 installed.
2017-02-22 21:34:22 -06:00
Piotr Puszkiewicz
b9378b8a66
Merge pull request #5803 from dotnet/dev/jgoshi/refactorPublishDir
...
Refactor props from publish directory
2017-02-22 17:49:08 -08:00
Piotr Puszkiewicz
31f2410b4f
Enable Publishing Roslyn with Static Output Path
2017-02-22 17:33:26 -08:00
Piotr Puszkiewicz
4d0dbdbb7f
Cleanup
2017-02-22 17:05:49 -08:00
Piotr Puszkiewicz
1ed6c2cdac
Fix spacing
2017-02-22 17:01:14 -08:00
Piotr Puszkiewicz
5a89b01459
Remove HackFilesToCopy
2017-02-22 16:57:32 -08:00
Piotr Puszkiewicz
84ead82037
RootProject property
2017-02-22 16:57:10 -08:00
Justin Goshi
8b2933839c
Merge
2017-02-22 16:56:34 -08:00
Justin Goshi
e894d7e60e
Refactor publish.target
2017-02-22 16:54:15 -08:00
Piotr Puszkiewicz
509cd0addb
Merge branch 'rel/1.0.0' into tp-20170222-09
2017-02-22 16:47:08 -08:00
Piotr Puszkiewicz
4105138019
Merge branch 'rel/1.0.0' into tp-20170222-09
2017-02-22 16:33:51 -08:00
Justin Goshi
1f39e07909
Refactor props from publish directory
2017-02-22 16:19:56 -08:00
Unknown
1c9f2e9b83
ProjectsToPublish
2017-02-22 15:33:55 -08:00
Piotr Puszkiewicz
5be3a70121
RootProject property
2017-02-22 15:31:55 -08:00
Piotr Puszkiewicz
3c8477ad1b
Merge branch 'rel/1.0.0' into piotrpMSFT/issues/brandingUpdate100
2017-02-22 15:23:15 -08:00
Mike Lorbetske
6a26c5584a
Pick up a newer version of templates carrying the latest test SDK changes
2017-02-22 14:04:17 -08:00
Justin Goshi
13dbdd1a4e
Merge
2017-02-22 13:38:39 -08:00
Piotr Puszkiewicz
a0a7512d7b
Merge pull request #5782 from dotnet/dev/jgoshi/refactorCrossgenTarget
...
Refactor props in crossgen.target
2017-02-22 13:19:27 -08:00
Eric Erhardt
996d458e30
Support Ubuntu16.10 installer
...
Since Ubuntu16.10 doesn't have a 1.0 shared framework, only install the 1.1 shared framework.
2017-02-22 15:18:45 -06:00
Eric Erhardt
916a19c493
Add support for Fedora 24, OpenSUSE 42.1 and Ubuntu 16.10
2017-02-22 15:13:02 -06:00
Justin Goshi
4442b45fef
Try to fix spacing part 3
2017-02-22 11:08:16 -08:00
Justin Goshi
c51d129294
Try to fix spacing part 2
2017-02-22 11:06:57 -08:00
Justin Goshi
aff69fb324
Try to fix spacing
2017-02-22 11:03:11 -08:00
Justin Goshi
7b62dd1267
Address some of the PR comments
2017-02-22 10:52:50 -08:00
Justin Goshi
1d9a2e5da1
Merge branch 'master' into dev/jgoshi/refactorLzmaTarget
2017-02-22 10:21:22 -08:00
Justin Goshi
02e47f1d00
Address PR comments
2017-02-22 10:10:54 -08:00
Justin Goshi
70b6dc3be6
Merge branch 'master' into dev/jgoshi/refactorCrossgenTarget
2017-02-22 10:08:54 -08:00
Justin Goshi
d828a08e60
Address PR comments
2017-02-22 09:25:06 -08:00
Justin Goshi
f7d77e3e54
Merge branch 'master' into dev/jgoshi/refactorTestTarget
2017-02-22 09:17:54 -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
Arun Mahapatra
c4df7e5e2d
Update TestPlatform to v15.0.0-preview-20170222-09.
2017-02-22 19:56:57 +05:30
Piotr Puszkiewicz
a1e9a5dfc4
PR feedback
2017-02-21 22:17:28 -08:00
Piotr Puszkiewicz
70b0a68038
Fix Stage2SdkDirectory
2017-02-21 22:17:28 -08:00
Piotr Puszkiewicz
a7fdc20f25
Convert redist.csproj outputdir to static property
...
Also some cleanup to unnecessary stuff.
2017-02-21 22:17:28 -08:00
Mike Lorbetske
36717ef3fc
Fix lzma archive creation to include 1.0.x packages
2017-02-21 21:04:50 -08:00
Piotr Puszkiewicz
7a84c47d97
Update CLI branding
2017-02-21 16:40:12 -08:00
Mike Lorbetske
e145ca88e4
Placeholder for template update
2017-02-21 16:28:47 -08:00
Piotr Puszkiewicz
5ca773e67d
Initial commit of 1.0.1 branch
2017-02-21 16:03:28 -08:00
Justin Goshi
d6dccfe75b
Fix build breaks
2017-02-21 15:57:16 -08:00
Justin Goshi
2eb2c00b30
Refactor props in crossgen.target
2017-02-21 14:22:36 -08:00
Justin Goshi
b58a0210e2
Refactor properties from LzmaCompile.targets
2017-02-21 12:52:17 -08:00
Justin Goshi
f8148abec3
merge
2017-02-21 10:16:07 -08:00
Justin Goshi
27a11e4eca
Merge branch 'master' into dev/jgoshi/morePropsRename
2017-02-21 10:00:30 -08:00
Livar Cunha
3ff78c64ff
Fixing the build breaks by removing duplicate RemoteAssetsFromDepsJson and by fixing VersionSuffix in some needed test packages, because now they import dirs.props and dirs.props eventually brings in VersionSuffix.
2017-02-18 22:03:36 -08:00
Livar
aba1e18ff6
Merge branch 'rel/1.0.0' into tp-20170217
2017-02-17 21:34:26 -08:00
Piotr Puszkiewicz
0f919d7442
fix merge
2017-02-17 13:07:14 -08:00
Justin Goshi
4f209e61ea
Refactor properties out of test.targets
2017-02-17 12:28:25 -08:00
Justin Goshi
30a43b3bda
Merge
2017-02-17 09:53:00 -08:00
Livar
c779000010
Merge branch 'rel/1.0.0' into update_platform_abstractions
2017-02-17 09:02:54 -08:00
Satya Madala
44100209bc
update TestPlatform version to 15.0.0-preview-20170217-05
2017-02-17 19:25:44 +05:30
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
Piotr Puszkiewicz
60b73e62a9
bump SDK to 20170217-2
2017-02-17 00:44:38 -08:00
Livar Cunha
1c409befbe
Updating DependencyModel to 1.0.2
2017-02-17 00:29:17 -08:00
Justin Goshi
23a3879f46
Fix build break
2017-02-16 16:42:49 -08:00
Justin Goshi
5359ce47e9
Rename
2017-02-16 15:10:18 -08:00
Justin Goshi
e232e7d386
Revert the new file name
2017-02-16 15:09:42 -08:00
Justin Goshi
8acaadb625
Revert the rename
2017-02-16 15:09:08 -08:00
Justin Goshi
58d167f3e5
Refactor properties out of Compile.targets
2017-02-16 12:21:15 -08:00
Justin Goshi
8e58a247b0
Finish renaming props file to remove Microsoft.Dotnet.Cli prefix
2017-02-16 11:16:20 -08:00
Justin Goshi
c8fb586677
merge
2017-02-16 08:58:40 -08:00
Piotr Puszkiewicz
0e5633e527
Remove BundledRuntimes properties
2017-02-15 19:37:51 -08:00
Justin Goshi
e7de32e988
Merge branch 'master' into dev/jgoshi/renamePropsFiles
2017-02-15 17:02:42 -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
Justin Goshi
2664015e55
Merge branch 'master' into dev/jgoshi/renamePropsFiles
2017-02-15 16:01:37 -08:00
Livar
a1f4e81aec
Merge branch 'rel/1.0.0' into piotrpMSFT/bump/15.1.548
2017-02-15 13:03:27 -08:00
Steve Desmond
bcad939b91
don't try to make crossgen executable if crossgen is disabled (it might not exist!)
2017-02-15 15:39:55 -05:00
Justin Goshi
4d38a9be97
Fix the file
2017-02-15 12:00:57 -08:00
Justin Goshi
74493a13e9
Delete the renamed file
2017-02-15 11:59:51 -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
Livar Cunha
6c07b929bd
The variable was missing dollar sign parenthesis in the target file.
2017-02-15 11:53:31 -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
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
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