Commit graph

290 commits

Author SHA1 Message Date
Daniel Plaisted
d8b5dbb44b Apply code review feedback 2018-11-21 18:43:34 -08:00
Daniel Plaisted
23a826b544 Merge upstream changes 2018-11-21 15:53:12 -08:00
Daniel Plaisted
67c4e27948 Merge upstream changes 2018-11-20 18:45:43 -08:00
Daniel Plaisted
7b76c6dd89 Generate version file 2018-11-20 10:46:41 -08:00
Livar
25046ed471
Merge pull request #154 from dotnet/enable_win_arm
Enabling win-arm CI and builds.
2018-11-19 21:53:17 -08:00
Livar Cunha
6f3303f309 Enabling win-arm CI and builds. 2018-11-16 17:54:46 -08:00
User Toweinfu
36dfe5b5a9 initial support for freebsd 2018-11-16 17:51:51 -08:00
Livar Cunha
60aadab0a8 Stop downloading and add the lzma archive to the SDK output. 2018-11-16 17:02:14 -08:00
Daniel Plaisted
88fda677f3 Remove debugging code 2018-11-16 15:21:09 -08:00
Daniel Plaisted
f69d1f0fd3 Rename DesktopUI to WindowsDesktop 2018-11-16 15:20:52 -08:00
Daniel Plaisted
48c2d3ef4f Merge upstream changes 2018-11-16 13:56:21 -08:00
Daniel Plaisted
0bf42114de Include bundled tools in layout 2018-11-13 15:04:44 -08:00
Daniel Plaisted
b1b9dfda09 Include templates in layout 2018-11-12 15:23:44 -08:00
Daniel Plaisted
45c3817d65 Generate bundled versions 2018-11-12 11:52:19 -08:00
Daniel Plaisted
853a27da6f Add workaround for tar warning about "file changed as we read it" in Docker under Windows host 2018-11-08 08:10:33 -08:00
Daniel Plaisted
f4209b9de6 Don't try creating tar.gz archive on Windows 2018-11-07 18:17:30 -08:00
Daniel Plaisted
2bee59a9bc Create Mac PKG 2018-11-06 14:29:00 -08:00
Daniel Plaisted
8c9e6aea55 Move / rename PKG generation targets 2018-11-05 14:11:42 -08:00
Daniel Plaisted
24ccfbae1a Generate RPM Installer 2018-11-05 13:38:10 -08:00
Daniel Plaisted
d2528332b2 Move, merge, and rename RPM targets 2018-11-04 18:52:13 -08:00
Daniel Plaisted
143bee75ff Produce deb packages 2018-11-01 23:15:59 -07:00
Daniel Plaisted
8d026b422e Move and merge deb generation targets 2018-10-31 16:42:59 -07:00
Daniel Plaisted
1e32ccfb7e Generate Windows installers 2018-10-31 16:35:14 -07:00
Daniel Plaisted
6c0c9119fc Move and rename MSI installer targets 2018-10-31 12:43:19 -07:00
Daniel Plaisted
70dd736032 Create archives for core SDK layout 2018-10-29 13:31:03 -07:00
Daniel Plaisted
ce468ec79e Move layout folder 2018-10-29 12:26:31 -07:00
Daniel Plaisted
b155e4e8bf Multitarget core sdk tasks 2018-10-29 11:37:13 -07:00
Daniel Plaisted
ac23150af3 Include DesktopUI shared framework and toolset in redist layout 2018-10-24 16:05:02 -07:00
Daniel Plaisted
584ec3c3d6 Add more components to download / layout 2018-10-24 00:08:51 -07:00
Daniel Plaisted
1344cb26c2 Lay out components in publish directory 2018-10-23 23:15:58 -07:00
Daniel Plaisted
7ab1aa5a6c Set up infrastructure to download bundled components for layout 2018-10-23 18:16:45 -07:00
Daniel Plaisted
2e76a1e5fd Build Core SDK tasks to separate folder for consumption during main build 2018-10-22 20:04:13 -07:00
Daniel Plaisted
914f465b30 Get tests and skeleton build tasks building 2018-10-22 19:59:58 -07:00
Egor Chesakov
71f120f27d Enable CrossgenPublishDir for arm and arm64 in src/redist/redist.csproj 2018-10-13 10:10:12 -07:00
Livar
2c2238a572 Adding the winforms and wpf runtime to the SDK. For now, only for zips, as we don't have a msi yet to bundle up. 2018-08-13 17:04:48 -07:00
jbeisner
1537818815 The target: "PublishVersionFile" fails to fire as it is pinned to [line 30] AfterTargets="Publish" and [line 118] BeforeTargets="Publish" 2018-08-07 17:38:24 +00:00
Chris Rummel
5fab2468f5
Add dependency for restoring packages before trying to find Microsoft.NETCore.DotNetAppHost package.
This appears to be a difference between the 2.2.0-preview SDK currently
being used in core-sdk and the 2.1.401-preview SDK currently being used
in source-build.  In the 2.2.0 SDK, this target happens to run before
the resolved package list is used, but in the 2.1.401 it is not, so I
added the explicit dependency (doesn't affect anything in the 2.2.0 SDK).
2018-07-18 21:04:14 -05:00
jbeisner
d88a7ce337 The SDK-version directory under the SDK directory should match the advertised SDK version. 2018-07-17 16:40:52 +00:00
Daniel Plaisted
b3be19b820 Fix up runtimeconfig.json files for tools (dotnet, MSBuild, VSTest, etc) to target .NET Core 3.0 2018-07-09 13:46:04 -07:00
Parallels
4d9b015f8f Fixing a merge issue and crossgen issues. 2018-06-26 14:44:55 -07:00
Livar Cunha
e2b679c4bb Merge branch 'master' of /Users/livarcocc/Documents/git/cli into merge_master_cli
* 'master' of /Users/livarcocc/Documents/git/cli: (1063 commits)
  Updating signing project to use new intermediate directory (int).
  Update runtimeconfig.json doc for 2.1 (#9382)
  Shortening the path to the intermediate folder by renaming it to int.
  fix typo (#9364)
  Updating asp.net to 2.2.0 as well.
  Updating the build and tests to work with the 2.2.0 runtime.
  Simplified combining dictionaries in Telemetry
  Fixing 'Channel' and 'BranchName': "release/2.1.4xx" to "master" (#9362)
  Fix extraction of folders (#9335)
  Update Sha256Hasher.cs
  Fix relative path tool path (#9330)
  Insert updated SDK from 2.1.4xx branch
  MSBuild 15.8.60
  Fix crash when user home directory cannot be determined.
  Make `CliFolderPathCalculator` a static class.
  Don't add the ReleaseSuffix to the branding on the CLI when DropSuffix is set to true.
  Add retry when Directory.Move (#9313)
  Override new SdkResult public properties
  Add reference to Microsoft.Build.NuGetSdkResolver
  Disable crossgen for MSBuild inline-task refs
  ...
2018-06-25 22:38:01 -07:00
Livar
80d542b8f4
Merge pull request #9332 from dotnet/merges/release/2.1.4xx-to-master
Merge release/2.1.4xx to master
2018-05-31 10:22:00 -07:00
Andy Gerlicher
5e794a064c Add reference to Microsoft.Build.NuGetSdkResolver 2018-05-21 15:29:37 -07:00
Andy Gerlicher
7bed83fc98 Disable crossgen for MSBuild inline-task refs 2018-05-21 15:29:37 -07:00
Livar
e338e46e10
Merge pull request #9306 from dotnet/merges/release/2.1.4xx-to-master
Merge release/2.1.4xx to master
2018-05-17 13:41:23 -07:00
Livar Cunha
2531e3a136 Add NoWarn for the stable package depending on non-stable package when packaging Cli.Utils for tests. 2018-05-16 12:44:23 -07:00
Tanner Gooding
f2f5c1b12b Merge remote-tracking branch 'dotnet/release/2.1.4xx' into merges/release/2.1.4xx-to-master 2018-05-07 10:55:14 -07:00
Livar Cunha
8c2160b6a0 Removing some patches for source build. 2018-05-02 11:59:01 -07:00
William Li
34060d3a23
pick up nuget loc (#9090) 2018-04-18 11:18:14 -07:00
Steve MacLean
8c937a0db0 [Arm64] Add crosscomponent crossgen (#9011) 2018-04-17 16:54:01 -07:00
Livar
7cb7535bae
Merge branch 'master' into merges/release/2.1.3xx-to-master 2018-04-06 09:05:57 -07:00
Livar Cunha
b09b6bff26 Generating the conclusion.html files dynamically so that we don't need to set the version in them everytime our branding changes. 2018-04-04 20:57:45 -07:00
William Li
d3f69e2e01
Skip bundled dotnet tools (#8977) 2018-04-03 14:36:59 -07:00
William Li
e70f07178a
Apphost shim (#8893)
* Publish app host to folder under SDK

* Use carried apphost as shim

* Remove full framework launcher

* Fix test run command issue

* Use latest release/2.1 build

* Test with 32 bit env

* Add missing return

* Update to latest prodcon build

* Add xlfs
2018-04-02 12:37:25 -07:00
John Beisner
2a63f9e76c
Merge pull request #8788 from dotnet/merges/release/2.1.3xx-to-master
Merge release/2.1.3xx to master
2018-03-15 13:15:51 -07:00
John Beisner
a54f0ffb81
Enable 'arm' builds in the CLI (#8791)
* First draft enablement of Win-arm and Linux-arm builds for the CLI.

* Fixing a typo

* Disable tests for arm; enable badges and FinalizeBuild for arm.

* Remove the 'Win-arm' leg.

* Update the README

* Update the README [2]

* Update netci.groovy

* Fixing a hard-coded Architecture: 'linux-x64'; removing the LZMA for 'arm'.
2018-03-14 19:04:25 -07:00
John Beisner
dbcd83075c
Creating and publishing 'symbols.nuget' to the blob feed. (#8712)
* Creating and publishing '*.symbols.nuget' to the blob feed.

* Reverting 'generatenupkg' methodology.

* Fixing formatting...

* Overwrite should = 'false'

* Second draft - Creating and publishing '*.symbols.nuget' to the blob feed.

* Fixing a VS auto-update.

* Removing the 'Microsoft.SymbolUploader.Build.Task' modifications; need to make a PR just for this.

* Change "sdk.*.Microsoft.DotNet.SDK.*.symbols.nupkg" to "runtime.*.Microsoft.DotNet.SDK.*.symbols.nupkg"; removing the 'DotNetRestore' on the Symbols.csproj

* Removing a 'todo' comment...

* Putting back the 'dotnet restore'

* Fixing a typo...

* Logical separation of the 'nupkg' from the 'symbols.nupkg' enumeration; fixed 'swr' pattern.

* Add "BLOBFEED_STORAGE_CONTAINER"
2018-03-13 08:19:15 -07:00
William Lee
08f050c012
bundled DotnetTool (#8606)
Extract packages to DotnetTools folder under sdk/{version}

Add new resolver to discover it

Add test to enforce package structure. It will fail when the structure
changed
2018-02-16 13:32:29 -08:00
Livar Cunha
e8f521cbef Stop re-targeting Roslyn to the CLI runtime. It will roll-forward to the CLI runtime (2.1.0) through minor version roll-forward if necessary. 2018-02-15 14:21:27 -08:00
Livar Cunha
7e32b9a593 Merge remote-tracking branch 'dotnet/release/2.1.2xx' into merges/release/2.1.2xx-to-release/2.1.3xx
* dotnet/release/2.1.2xx:
  Use satellites from roslyn package, not cli-deps-satellites
  Update to roslyn 2.7.0-beta3-62612-07 for 2.1.1xx

 Conflicts:
	build/DependencyVersions.props
	src/redist/redist.csproj
	src/tool_roslyn_satellites/tool_roslyn_satellites.csproj
2018-02-14 15:18:29 -08:00
Nick Guerrera
bc1fb44364 Use satellites from roslyn package, not cli-deps-satellites 2018-02-12 16:52:26 -08:00
Nate McMaster
bc486e787a Ensure ASP.NET Core is included in macos .pkg installer and update to 2.1.0-preview1-28226 2018-02-05 11:34:52 -08:00
Livar Cunha
3bf4751a8d Excluding shared framework assemblies from the Roslyn folder in the SDK. 2018-01-30 15:33:08 -08:00
Livar Cunha
a52bd1a205 Excluding shared framework assemblies from the Roslyn folder in the SDK. 2018-01-30 14:02:40 -08:00
Livar Cunha
e329e0694f Fixing redist to use the new way to consume roslyn. I merged it wrong before. 2018-01-05 15:56:15 -08:00
Livar Cunha
3d92e52234 Merge remote-tracking branch 'dotnet/release/2.0.0' into merges/release/2.0.0-to-release/2.1-20180103-080038
* dotnet/release/2.0.0: (32 commits)
  Update wix version (#8313)
  Use explict and non-preview versions for the build DLL
  Fixing a typo...
  The 15.4.8 version of the Microsoft.Build.Runtime nuget package is currupt; use the replacement 15.4.8.1
  Fix dotnet-install to check the right path for no-op installs when --shared-runtime is specified
  Fixed a typo...
  Nuget.config update to align with CLI:master - add comments in DependencyVersions.prop
  Even more package dependency re-names...
  Third pass clean-up of package names.
  Second pass clean-up of package names; resequencing download.
  Updating dependency version properties in alignment with sample orchestrated build file at: https://dotnetfeed.blob.core.windows.net/orchestrated/20171129-03/orchestration-metadata/PackageVersions.props
  The access key is already resolved: 'CoreSetupBlobAccessTokenParam'
  Fixed another typo...
  Fixed typo...
  The first pass will need the extra args [same as run-build.ps1].
  Dependency Uptake: download and import a package version props file.
  Accounting for MSRC builds with pre-set 'CoreSetupBlobRootUrl' and 'CoreSetupBlobAccessToke' properties.
  Changes per code review...
  The URL root will include the "dotnet" container; the structure will be identical after the "dotnet" container.
  No passwords should be in the open as environmental variables.
  ...

 Conflicts:
	build/DependencyVersions.props
	src/redist/redist.csproj
	src/tool_msbuild/tool_msbuild.csproj
	src/tool_roslyn/tool_roslyn.csproj
	test/Microsoft.DotNet.Cli.Utils.Tests/Microsoft.DotNet.Cli.Utils.Tests.csproj
2018-01-03 16:16:41 -08:00
Livar
2cd74779d1 Updating roslyn to a version with the vbcscompiler. (#8214) 2017-12-19 14:06:48 -08:00
Livar Cunha
5a0e95897e Merge remote-tracking branch 'dotnet/release/15.5' into merges/release/15.5-to-master-20171206-080040
* dotnet/release/15.5: (26 commits)
  Fixing the reference to Microsoft.Build.Runtime from Cli.Utils.Tests. It was using the wrong package version property.
  One more old style version package name needed to change in redist.
  Fixing the versions of MSBuild and passing the right property to find roslyn files.
  Use "15.5.179" for the other Microsoft.Build.* packages
  Moving the 'MicrosoftBuildPackageVersion' forward.
  Fixing "RuntimeFrameworkVersion"
  Updating version naming convention.
  Fixed a typo...
  Nuget.config update to align with CLI:master - add comments in DependencyVersions.prop
  Even more package dependency re-names...
  Third pass clean-up of package names.
  Second pass clean-up of package names; resequencing download.
  Updating dependency version properties in alignment with sample orchestrated build file at: https://dotnetfeed.blob.core.windows.net/orchestrated/20171129-03/orchestration-metadata/PackageVersions.props
  The access key is already resolved: 'CoreSetupBlobAccessTokenParam'
  Fixed another typo...
  Fixed typo...
  The first pass will need the extra args [same as run-build.ps1].
  Dependency Uptake: download and import a package version props file.
  Accounting for MSRC builds with pre-set 'CoreSetupBlobRootUrl' and 'CoreSetupBlobAccessToke' properties.
  Changes per code review...
  ...

	TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/EmptyItemGroup/EmptyItemGroup.csproj
	TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/Lib/Lib.csproj
	TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/Net452AndNetCoreApp10Lib/Net452AndNetCoreApp10Lib.csproj
	TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/ValidRef/ValidRef.csproj
	TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithDoubledRef/WithDoubledRef.csproj
	TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithExistingRefCondOnItem/WithExistingRefCondOnItem.csproj
	TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithExistingRefCondWhitespaces/WithExistingRefCondWhitespaces.csproj
	TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithRefNoCondNonUniform/WithRefNoCondNonUniform.csproj
	TestAssets/TestProjects/AppWithMultipleFxAndTools/MSBuildAppWithMultipleFrameworksAndTools.csproj
	TestAssets/TestProjects/MSBuildAppWithMultipleFrameworksAndTools/MSBuildAppWithMultipleFrameworksAndTools.csproj
	TestAssets/TestProjects/XunitMulti/VSTestXunitDesktopAndNetCore.csproj
	build/BundledTemplates.props
	build/DependencyVersions.props
	build/NugetConfigFile.targets
	build/Test.targets
	build_projects/dotnet-cli-build/dotnet-cli-build.csproj
	dir.props
	run-build.sh
	src/Microsoft.DotNet.Archive/Microsoft.DotNet.Archive.csproj
	src/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj
	src/Microsoft.DotNet.Configurer/Microsoft.DotNet.Configurer.csproj
	src/dotnet/dotnet.csproj
	src/redist/redist.csproj
	src/tool_fsharp/tool_fsc.csproj
	test/ArgumentForwardingTests/ArgumentForwardingTests.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/Microsoft.DotNet.Cli.Utils.Tests.csproj
	test/Microsoft.DotNet.Tools.Tests.Utilities/Microsoft.DotNet.Tools.Tests.Utilities.csproj
	test/Msbuild.Tests.Utilities/Msbuild.Tests.Utilities.csproj
	test/binding-redirects.Tests/binding-redirects.Tests.csproj
	test/dotnet-add-package.Tests/dotnet-add-package.Tests.csproj
	test/dotnet-add-reference.Tests/dotnet-add-reference.Tests.csproj
	test/dotnet-back-compat.Tests/dotnet-back-compat.Tests.csproj
	test/dotnet-help.Tests/dotnet-help.Tests.csproj
	test/dotnet-migrate.Tests/dotnet-migrate.Tests.csproj
	test/dotnet-new.Tests/dotnet-new.Tests.csproj
	test/dotnet-remove-package.Tests/dotnet-remove-package.Tests.csproj
	test/dotnet-remove-reference.Tests/dotnet-remove-reference.Tests.csproj
	test/dotnet-restore.Tests/dotnet-restore.Tests.csproj
	test/dotnet-sln-add.Tests/dotnet-sln-add.Tests.csproj
	test/dotnet.Tests/dotnet.Tests.csproj
2017-12-07 09:55:12 -08:00
Livar Cunha
8b1c2c5026 One more old style version package name needed to change in redist. 2017-12-06 22:44:51 -08:00
Livar Cunha
d280a054d4 Fixing the versions of MSBuild and passing the right property to find roslyn files. 2017-12-06 22:14:02 -08:00
Livar Cunha
cd86a4cac4 Merge remote-tracking branch 'dotnet/release/2.0.0' into merges/release/2.0.0-to-release/15.5-20171206-080037
* dotnet/release/2.0.0:
  Fixed a typo...
  Nuget.config update to align with CLI:master - add comments in DependencyVersions.prop
  Even more package dependency re-names...
  Third pass clean-up of package names.
  Second pass clean-up of package names; resequencing download.
  Updating dependency version properties in alignment with sample orchestrated build file at: https://dotnetfeed.blob.core.windows.net/orchestrated/20171129-03/orchestration-metadata/PackageVersions.props
  The access key is already resolved: 'CoreSetupBlobAccessTokenParam'
  Fixed another typo...
  Fixed typo...
  The first pass will need the extra args [same as run-build.ps1].
  Dependency Uptake: download and import a package version props file.

 Conflicts:
	build/DependencyVersions.props
	src/redist/redist.csproj
	src/tool_roslyn/tool_roslyn.csproj
2017-12-06 12:18:28 -08:00
John Beisner
80f5d9f8c7 Even more package dependency re-names... 2017-12-04 13:20:37 -08:00
John Beisner
4d694d2c56 Second pass clean-up of package names; resequencing download. 2017-12-04 09:31:28 -08:00
John Beisner
f0abfb6b12 Updating dependency version properties in alignment with sample orchestrated build file at: https://dotnetfeed.blob.core.windows.net/orchestrated/20171129-03/orchestration-metadata/PackageVersions.props 2017-12-01 20:07:48 -08:00
Eric Erhardt
98e5c2c609 Crossgen Microsoft.NET.Build.Extensions.Tasks.dll 2017-11-29 12:25:12 -06:00
Eric Erhardt
479a3f2d71 Crossgen the Sdks directory. 2017-11-28 21:16:02 -06:00
Nick Guerrera
20d4d77586
Merge pull request #7998 from dotnet/release/15.5
Merge release/15.5 to master
2017-11-11 10:15:25 -08:00
Nick Guerrera
1fef760409 Merge remote-tracking branch 'upstream/release/2.0.0' into merges/release/2.0.0-to-release/15.5-20171107-080033 2017-11-07 11:34:13 -08:00
Nick Guerrera
a2d18edb91 Don't attempt to generate profiling symbols on Mac OS 2017-11-03 10:05:36 -07:00
Nick Guerrera
4f31e3db66 Improve symbols zip archive
We were publishing a -debug zip with sdk code and symbols, but it was captured before
publishing was finished and had incorrect code content. Trying to use it would blow up
due to incorrect runtimeconfig.json.

Replace it with a -symbols zip that contains only symbols and that can be overlayed
over the main zip. This is just like the -langpack zip that has satellite assemblies.

Also add an option to leave the PDBs in the same directory/packages as code:
/p:SeparateSymbolsArchive=false. Setting this on local builds facilitates
debugging and profiling by removing the need to adjust symbol paths or copy PDBs
around.
2017-11-02 16:08:06 -07:00
Nick Guerrera
607907c67d Retarget VSTest before publishing with backward compatible runtimes 2017-11-02 15:09:17 -07:00
Nick Guerrera
116da0277c Generate symbols for profiling when running crossgen 2017-11-01 17:17:22 -07:00
Nick Guerrera
a64e671a8b Don't crossgen satellite assemblies 2017-11-01 17:15:52 -07:00
Livar Cunha
4577a7839a Fixing the windows build. 2017-10-17 13:43:19 -07:00
Livar Cunha
7af7c91eb6 Adding redist to the list of changes. I missed it in the merge commit. 2017-10-16 15:44:15 -07:00
Livar Cunha
e1916cc4dc Merge remote-tracking branch 'dotnet/release/15.5' into merges/release/15.5-to-master-20171016-070031
* dotnet/release/15.5: (21 commits)
  Manually merging some changes that git merged wrong and deleted from the 15.5 branch.
  Separating the 'legacy' URL construction from the 'current' URL construction methods and logic.
  Use temporary path for fake deps.json in test
  Use same build number for roslyn and F# satellites
  Updating Roslyn satellites and SDK versions
  Insert NuGet Build 4.5.0-preview2-4529 into cli
  Update NuGet to 4529 (signed)
  MSBuild 15.5.154
  MSBuild 15.5.153
  removed commented out config I'd meant to remove
  added a way to specify the asp.net template versions
  Porting 'dotnet-install.sh' from CLI:master to CLI:release/2.0.0
  'NuGet.master.config' does not appear to be used.
  Fixed tests
  Update branch info to release/15.5
  Updating the websdk version to 2.0.0-rel-20171010-665
  Insert NuGet Build 4.5.0-preview1-4526 into cli
  Update DependencyVersions.props
  Updated version of TestPlatform to 15.5.0-preview-20170923-02
  MSBuild 15.4.8
  ...
2017-10-16 15:42:40 -07:00
Livar Cunha
62ae014c37 Making this repo consume the dotnet-sdk-internal zip and produce a full core-sdk by using sdk-internal, runtime, lzma, templates and store. Also deleted a bunch of now, unecessary code. I am sure there is more to be deleted though. 2017-10-13 10:45:50 -07:00
Livar Cunha
27aa698710 Manually merging some changes that git merged wrong and deleted from the 15.5 branch. 2017-10-13 09:56:08 -07:00
Eric Erhardt
484714df1b Exclude Desktop framework assemblies in the "Extensions" folder from crossgen.
Work around MSBuild globbing bug in a Target by just excluding the one assembly.

See https://github.com/Microsoft/msbuild/issues/2631
2017-10-11 22:31:27 -05:00
Nick Guerrera
ddae0875cf Revert release/2.0.0 back to 1bcee43995
There were incorrect merges from release/15.5 to release/2.0.0 since then
2017-10-09 13:55:13 -07:00
Nick Guerrera
4a2d3fae16 Fix up roslyn satellite assembly handling to match new insertion mechanism
1. Publish satellites with a separate project and merge the resulting .deps.json
   into (csc|vbc).deps.json

2. Move the build tasks satellites to the correct location next to main assembly
   (one level higher than bincore\)
2017-10-03 16:00:56 -07:00
Ashley Hauck
97b027b232 Remove CscToolPath 2017-10-02 12:26:52 -07:00
khyperia
04c8a68539 Improve the way Roslyn is pulled in 2017-10-02 08:01:44 -07:00
Daniel Plaisted
ca34332205 Rename Stage0 build variables to PreviousStage
(cherry picked from commit c6e4c8f477)
2017-09-27 14:37:37 -07:00
Daniel Plaisted
2b134c91fe Support new artifacts layout in tests and other build logic
(cherry picked from commit 13da213183)
2017-09-27 14:20:05 -07:00
Daniel Plaisted
8385d37185 Move dir.props to auto-imported Directory.Build.props
This is necessary for setting the intermediate output path to work correctly

(cherry picked from commit ae0aa8ed24)
2017-09-27 14:16:37 -07:00
Nick Guerrera
138b98f65f Use $(CliTargetFramework), eliminate warnings, treat warnings as errors
(cherry picked from commit 656eab7aec)
2017-09-27 13:28:45 -07:00
Livar Cunha
3efd44f935 Removing Microsoft.DotNet.TestFramework from the product code and from the SDK deployment and moving the code to the test folder. 2017-09-15 09:49:19 -07:00
Daniel Plaisted
107252ebe7 Merge upstream changes 2017-08-28 11:09:19 -07:00
Nick Guerrera
656eab7aec Target netcoreapp2.1, eliminate warnings, treat warnings as errors 2017-08-25 20:17:57 -07:00