Commit graph

2166 commits

Author SHA1 Message Date
Peter Huene
e752f2ace4
Fix Windows servicing builds.
The Windows servicing builds require a unique package source name in the
NuGet configuration file when passing in multiple package sources.
2018-01-22 09:47:17 -08:00
Davis Goodin
0e6586de49 Fix "dotnet" typo in donetclichecksums 2018-01-22 09:42:32 -06:00
William Lee
02a98d4e63
[tools] Integrate NuGet (#8414)
* Integrate NuGet ask

* Update NuGet version. Rely on NuGet to filter TFM. And use asset.json to find entrypoint

* Update XML file to per TFM

* Add extra property to the fake project according to nuget

* Treat nuget fallback folder as offline cache for tool

* Require -g to install global tool

* Copy test asset during test project build

* Address code review on LockFileMatchChecker

* Get NETCorePlatformsImplicitPackageVersion from PackageDefinitions

* Edit and add missing loc

* Change LockFileMatchChecker to local function

* Adding comment

* Add to content instead of copy

* Download platform package instead

* disable SDK side implicit NuGetFallbackFolder

* merge loc

* Revert extra line

* use a prerelease platforms version that supports alpine
2018-01-19 17:15:34 -08:00
William Lee
e317925977
Merge pull request #8435 from dotnet/nuget-insertbuild4846
Insert NuGet Build 4.7.0-preview1-4846 into cli
2018-01-19 15:25:28 -08:00
NuGet Team Bot
47758a4ec2 Insert NuGet Build 4.7.0-preview1-4846 into cli 2018-01-19 14:32:57 -08:00
Nate McMaster
67f98be680 Update to aspnetcore 2.1.0-preview1-28124 2018-01-19 13:17:54 -08:00
NuGet Team Bot
b0cfb18501 Insert NuGet Build 4.7.0-preview1-4839 into cli 2018-01-18 17:47:41 -08:00
NuGet Team Bot
d0cdc9c266 Insert NuGet Build 4.6.0-rtm-4825 into cli 2018-01-18 16:13:18 -08:00
Tanner Gooding
603240f26d Updating the SDK dependency to 15.5.0-preview-62518-04 to fix the signing issue 2018-01-18 14:03:25 -08:00
Livar
0ca4e2c47b
Merge pull request #8355 from dotnet/nuget-insertbuild4791
Insert NuGet Build 4.6.0-rtm-4791 into cli
2018-01-18 13:51:35 -08:00
Tanner Gooding
c5cf9994e2 Updating the SDK dependency to 15.5.0-preview-62518-04 to fix the signing issue 2018-01-18 12:15:22 -08:00
Peter Huene
3c1911bd67
Update runtime and branding to 2.0.6. 2018-01-18 11:10:25 -08:00
Peter Huene
d4a4424b77
Updating the branding of the CLI to 2.1.5 2018-01-17 16:41:02 -08:00
John Beisner
edc6697cc5
Merge pull request #8380 from johnbeisner/ScriptFixes
Run-Build.sh/ps1 does not behave correctly when passing in a target.
2018-01-17 13:31:55 -08:00
Matt Mitchell
632e9e762b
Merge pull request #8417 from johnbeisner/OrchestratedBuild
Orchestrated build publishing; CLI:master [follow-up]
2018-01-17 12:44:54 -08:00
jbeisner
96410974b9 Reintroducing: 'BlobStoragePartialRelativePath' as orchetrated build needs a prepended "assets" to the partial relative path. 2018-01-17 20:08:12 +00:00
Yanchen Wu
5b5d69c95d Adds Microsoft.Docker.Sdk to CLI
This change is to add Sdk.props and Sdk.targets of Microsoft.Docker.Sdk
into CLI. This unblocks the scenario where a VS solution contains a few
.NET Core projects as well as a docker-compose.dcproj project and people
want to build the solution from command line with .NET Core CLI. With
the Sdk.props and Sdk.targets being present in CLI, building
docker-compose.dcproj becomes no-op so it won't block building the other
.NET Core projects.
2018-01-17 11:12:19 -08:00
John Beisner
be6f56425f
Merge pull request #8412 from johnbeisner/OrchestratedBuild
Orchestrated build publishing; CLI:master
2018-01-17 10:22:43 -08:00
Nick Guerrera
840acee074
Defend against forthcoming breaking change in SDK (#8409) 2018-01-17 10:13:41 -08:00
Livar
2efe8f8360
Merge pull request #8410 from dotnet-bot/master-UpdateDependencies
Update CoreSetup to preview1-26116-04 (master)
2018-01-17 09:23:43 -08:00
jbeisner
4f2ac3eae5 Setting 'IsNotOrchestratedPublish' explictly to false; conditional clean-up. 2018-01-17 17:17:08 +00:00
jbeisner
60b1795d90 Adding publish URL in a comment. 2018-01-17 16:46:30 +00:00
jbeisner
cd4b06c30d Adding ManifestArtifactData; changes per code review... 2018-01-17 16:37:33 +00:00
Andy Gerlicher
b1b70292ce MSBuild 15.6.54 2018-01-16 21:31:49 -08:00
Livar
1a3460575e
Merge pull request #8407 from wli3/update-sdk-version-011618
Updating the Microsoft.NET.SDK version to 2.1.0-preview1-62516-03
2018-01-16 21:26:26 -08:00
jbeisner
0c754d92fa Formatting only... 2018-01-17 02:58:01 +00:00
jbeisner
d04e8c84e1 Don't use 'ParseBlobUrl'; use the original values. 2018-01-17 02:52:59 +00:00
jbeisner
3386db7bed Create a manifest if performing an orchestrated build publish. 2018-01-17 02:36:50 +00:00
dotnet-bot
fef6d9bcd5 Update CoreSetup to preview1-26116-04 2018-01-16 22:56:00 +00:00
William Li
6d73caa31a Updating the Microsoft.NET.SDK version to 2.1.0-preview1-62516-03 2018-01-16 14:28:17 -08:00
jbeisner
1acb93f15a Merge remote-tracking branch 'upstream/master' into OrchestratedBuild 2018-01-16 22:19:58 +00:00
jbeisner
9dc9f4c87b Use "PushToBlobFeed" instead of "UploadToAzure" 2018-01-16 22:16:56 +00:00
Livar
9881b8d745
Merge pull request #8396 from AndyGerlicher/MSBuild15.6.54
MSBuild 15.6.54
2018-01-16 12:13:57 -08:00
Livar
596f489414
Merge pull request #8390 from dotnet/livarcocc-patch-1
Updates the TestPlatform to 15.6.0-preview-20180109-01
2018-01-16 12:12:30 -08:00
John Beisner
501e11d928
Merge pull request #8406 from johnbeisner/OrchestratedBuild
Ensure that the 'SetAzureProps' target runs before 'BlobStoragePartialRelativePath' is used.
2018-01-16 11:35:44 -08:00
jbeisner
552129db0d Fixed a typo... 2018-01-16 18:25:18 +00:00
jbeisner
95a5bc7e16 Ensure that the 'SetAzureProps' target runs before 'BlobStoragePartialRelativePath' is used. 2018-01-16 18:15:28 +00:00
Livar
290c66829b
Merge pull request #8392 from dotnet-bot/master-UpdateDependencies
Update CoreSetup to preview1-26115-03 (master)
2018-01-16 10:09:57 -08:00
Livar Cunha
e7625eba69 Merge branch 'update_branding_for_2_1_100' of github.com:livarcocc/cli-1 into update_branding_for_2_1_100
* 'update_branding_for_2_1_100' of github.com:livarcocc/cli-1:
  MSBuild 15.6.44
2018-01-16 09:38:22 -08:00
Livar Cunha
8caa7b9f0d Updating the channel to release/2.1.1xx. We can manually update release/2.0 if necessary, but LTS is always updated every time we release. 2018-01-16 09:37:59 -08:00
jbeisner
e7bd33b200 Add "SDK" at the end of the orchestrated build blob drop point. 2018-01-16 16:09:00 +00:00
dotnet-bot
a1a1c2b762 Update CoreSetup to preview1-26115-03 2018-01-15 18:51:25 +00:00
Andy Gerlicher
af8ea2ffb7 MSBuild 15.6.54 2018-01-13 23:22:34 -08:00
Matt Mitchell
2cfc65a0c4
Merge pull request #8388 from johnbeisner/OrchestratedBuildPublishing
Enabling the publish of CLI assets to 'orchestrated' blob storage.
2018-01-12 19:33:28 -08:00
jbeisner
429f2fde07 Found a version of 'microsoft.dotnet.build.tasks.feed' that supports both parsing of the URL and the currrent Nupkg upload method: 2.1.0-prerelease-02312-02 2018-01-13 02:46:14 +00:00
Livar
1c380b3114
Merge branch 'release/2.1.1xx' into update_branding_for_2_1_100 2018-01-12 16:41:41 -08:00
jbeisner
6d9130dc61 Simplify the 'index.json' removal. 2018-01-13 00:07:01 +00:00
Livar
a4afbc9f1f
Updates the TestPlatform to 15.6.0-preview-20180109-01 2018-01-12 15:47:42 -08:00
Livar
da40320229
Merge pull request #8346 from rainersigwald/msbuild-15.6.44
MSBuild 15.6.44
2018-01-12 15:45:35 -08:00
Livar Cunha
d6d3b451d6 Updating the branding of the CLI to 2.1.100 2018-01-12 15:37:54 -08:00
jbeisner
aa458eca82 Strip off "index.json" before appending "assets" 2018-01-12 23:34:38 +00:00
jbeisner
cbcd4fd3c3 Fixing a typo... 2018-01-12 22:46:25 +00:00
dotnet-bot
0354166e05 Update CoreSetup to preview1-26112-04 2018-01-12 22:43:35 +00:00
jbeisner
5e6c339e16 Simplification: remove Boolean 'PUBLISH_NUPKG_TO_AZURE_BLOB' 2018-01-12 22:27:46 +00:00
jbeisner
bfb9322415 Enabling the publish of assets to 'orchestrated' blob storage. 2018-01-12 22:11:15 +00:00
Livar
bd9d71d71c
Merge pull request #8249 from joperezr/BindingRedirects471
Update the support package on the CLI to fix binding redirects on 4.7.1
2018-01-12 11:42:45 -08:00
Livar Cunha
65c88d8ea8 Disabling native installer tests whenever CLIBUILD_SKIP_TESTS is set to true. 2018-01-12 10:11:44 -08:00
Livar
a85a4f4547
Merge pull request #8377 from dotnet-bot/master-UpdateDependencies
Update CoreSetup to preview1-26111-03 (master)
2018-01-11 19:43:26 -08:00
John Beisner
ed2ca5d49a
Merge pull request #8354 from johnbeisner/CoalesceDebInstaller
Remove method to publish to Debian feeds.
2018-01-11 14:37:04 -08:00
jbeisner
1ea48da27c Run-Build.sh/ps1 does not behave correctly when passing in a target. 2018-01-11 21:23:46 +00:00
dotnet-bot
745e40b77d Update CoreSetup to preview1-26111-03 2018-01-11 20:55:02 +00:00
Livar
ff4299241c
Merge pull request #8360 from dotnet-bot/master-UpdateDependencies
Update CoreSetup to preview1-26110-02 (master)
2018-01-10 16:11:20 -08:00
John Beisner
7d641b76f4
Merge pull request #8361 from natemcmaster/rpm
Ignore incoherent rpm dependency on dotnet-runtime when testing aspnetcore
2018-01-10 15:32:54 -08:00
dotnet-bot
0f1fca5601 Update CoreSetup to preview1-26110-02 2018-01-10 23:04:12 +00:00
Nate McMaster
781bffd59a Use RPM --install --nodeps to ignore aspnetcore-runtime's dependencies 2018-01-10 14:48:33 -08:00
Matt Mitchell
7d2a4f60b3 Backwards compat runtimes should not come from product construction sources 2018-01-10 14:23:48 -08:00
jbeisner
a2d2923878 Removing the UploadToLinuxPackageRepository task code and tests. 2018-01-10 22:18:27 +00:00
Nate McMaster
3e05d2495a Update to aspnetcore 2.1.0-preview1-28042
- Update to 2.1.0-preview1-28042
 - Remove references to the aspnetcore-store package
 - Allow pulling aspnetcore from orchestrated build
2018-01-10 09:05:49 -08:00
Livar
3f70aa89b1
Merge pull request #8353 from dotnet-bot/master-UpdateDependencies
Update CoreSetup to preview1-26109-02 (master)
2018-01-09 21:01:16 -08:00
Livar
e9d1d025de
Merge pull request #8341 from natemcmaster/aspnetcore-sharedfx
Update to ASP.NET Core shared framework 2.1.0-preview1-28031
2018-01-09 18:57:13 -08:00
Livar Cunha
34ce5c5fdd Adding aspnet dev feed. 2018-01-09 18:52:34 -08:00
NuGet Team Bot
168bbff95d Insert NuGet Build 4.6.0-rtm-4791 into cli 2018-01-09 16:58:29 -08:00
Nate McMaster
811f3dcc27 Update TestSdkDeb targets to ignore coherence issues with dotnet-runtime 2018-01-09 15:36:23 -08:00
jbeisner
c2a9cf4c5b Remove method to publish to Debian feeds. 2018-01-09 23:31:32 +00:00
John Beisner
1a6dc96bec
Merge pull request #8347 from johnbeisner/CoalesceDebInstaller
CLI produce 'DEB' distro agnostic installer packages; CLI:master
2018-01-09 15:31:19 -08:00
Nate McMaster
576405af5f Fix reference to renamed MSBuild variable 2018-01-09 14:57:49 -08:00
dotnet-bot
5bd7e6f4cb Update CoreSetup to preview1-26109-02 2018-01-09 22:50:08 +00:00
Nate McMaster
825fa19198 PR feedback and reorder dpkg arguments 2018-01-09 14:13:37 -08:00
Nate McMaster
efa35bd31a Ignore failures due to incoherent dependencies on dotnet-runtime 2018-01-09 13:27:50 -08:00
Livar Cunha
6f46ea928a Merge branch 'release/2.1-MSRC' into merge_release_21_msrc
* release/2.1-MSRC:
  Update to consume aspnetcore 2.0.5-155
  Update to consume aspnetcore 2.0.5-152
  Revert "Update to consume aspnetcore 2.0.5-152"
  Update to consume aspnetcore 2.0.5-152
  Commit to trigger a rebuild of the CLI because of a build in place from the Runtime.
  Adding the 2.0.3 asp.net store to the native installer tests.
  Update to consume aspnetcore 2.0.5-147
  Update to consume aspnetcore 2.0.5-146
  Updating the runtime to 2.0.5.
  Update to consume aspnetcore 2.0.5-142
  Fixing the expected fx-version.
  Adding a separate dependency version for Microsoft.Build.Runtime.
  Updating the branding of the CLI to 2.1.4 and the runtime to 2.0.5.

 Conflicts:
  build/DependencyVersions.props
2018-01-09 12:49:58 -08:00
jbeisner
5f77453246 Removing a conditional... 2018-01-09 20:14:55 +00:00
jbeisner
ed0df1c0f0 Removing extra 'LinuxDistrosNeedNativeInstaller' entries 2018-01-09 20:05:58 +00:00
dotnet-bot
aa3394ce26 Update CoreSetup to preview1-26109-01 2018-01-09 19:01:16 +00:00
Nate McMaster
ec3332d41e Update to 2.1.0-preview1-28031 and debian-agnostic aspnet installers 2018-01-09 09:17:15 -08:00
Livar
cee1044493
Merge branch 'release/2.1' into BindingRedirects471 2018-01-09 08:49:08 -08:00
Rainer Sigwald
3818828bf0 MSBuild 15.6.44 2018-01-09 09:49:31 -06:00
Nate McMaster
7a606a46bb Update SPA tests to skip npm-restore 2018-01-08 20:31:01 -08:00
Nate McMaster
223bc83db7 Update mapping of RID to aspnetcore installer filenames 2018-01-08 18:31:14 -08:00
Nate McMaster
2316423f83 Use the right RID variable to determine aspnetcore sharedfx RID 2018-01-08 17:57:49 -08:00
jbeisner
0a58124f4f Correcting the 'RunInSandBoxAndPackage' target 2018-01-09 01:21:05 +00:00
jbeisner
14d701dacc Publish the agnostic 'DEB' installer package to all three feeds. 2018-01-09 00:58:11 +00:00
jbeisner
5b33ba9f3e 'DEB' filename changes 2018-01-08 23:52:05 +00:00
dotnet-bot
73b55ecd42 Update CoreSetup to preview1-26108-03 2018-01-08 22:18:39 +00:00
Livar
863787be75
Merge pull request #8335 from mlorbetske/dev/mlorbe/UpdateTemplatePackageVersionsFor21
Update template package versions for 2.1 class, console, test and item templates
2018-01-08 14:12:29 -08:00
jbeisner
c873c55945 Produce one debian distro agnostic installer package. 2018-01-08 17:45:37 +00:00
Nate McMaster
81296ff684 Skip downloading aspnetcore sharedfx installer if it is undefined 2018-01-06 12:30:47 -08:00
Nate McMaster
c46f603dbb Update to aspnetcore 2.1.0-preview1-28006 2018-01-06 12:08:05 -08:00
Nate McMaster
8de1dea7c9 Remove unnecessary aspnetcore myget feeds 2018-01-05 19:31:24 -08:00
Nate McMaster
fb2df937fe Replace aspnetcore-store with the aspnetcore-runtime
Update downloaded installers and wixlib to pull the ASP.NET Core Runtime (aka shared framework)
2018-01-05 19:31:24 -08:00
Nate McMaster
e914370606 Update templates package version 2018-01-05 19:29:55 -08:00
Nate McMaster
b6b53f1e55 Update dev-certs version 2018-01-05 19:29:55 -08:00
Livar
d6c6e9af8a
Merge branch 'master' into master-UpdateDependencies 2018-01-05 18:17:49 -08:00
jbeisner
8d95d05f1a Uninstall the 'dotnet-host' before 'dotnet-runtime-deps' 2018-01-06 00:49:43 +00:00
jbeisner
eb2565719b Fixing the install and uninstall of the 'RuntimeDepsPackage' 2018-01-06 00:14:57 +00: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
jbeisner
002ddd6374 Fixing a typo... 2018-01-05 23:23:15 +00:00
jbeisner
ed8d9c6390 Download the 'dotnet-runtime-deps' installer file to address the 'BuildSDKDeb' errors. 2018-01-05 23:11:47 +00:00
dotnet-bot
a5c35aeadb Update CoreSetup to preview1-26105-02 2018-01-05 22:45:37 +00:00
jbeisner
68c2b1d060 Update 'DEB' filenames for downloads of the 'host' and 'hostfxr'. 2018-01-05 21:35:48 +00:00
jbeisner
c6ccdb29fd Reacting to core-setup changes for 'DEB' distro agnostic installers; example: 'dotnet-runtime-2.1.0-preview1-26104-06-x64.deb'
Plus: Update CoreSetup to preview1-26105-01
2018-01-05 20:51:50 +00:00
Mike Lorbetske
b70fcc4ec6 Update template package versions for 2.1 class, console, test and item templates 2018-01-05 12:36:19 -08:00
Livar
7fec5c4a6a
Merge pull request #8323 from dotnet/nuget-insertbuild4782
Insert NuGet Build 4.6.0-rtm-4782 into cli
2018-01-03 16:18:05 -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
NuGet Team Bot
b5b105b47e Insert NuGet Build 4.6.0-rtm-4782 into cli 2018-01-03 15:20:05 -08:00
dotnet-bot
1661e8bace Update CoreSetup to preview1-26103-03 2018-01-03 22:19:42 +00:00
dotnet-bot
6d4078429c Update CoreSetup to preview1-26102-03 2018-01-02 22:15:32 +00:00
William Lee
860de6339c
Update wix version (#8313) 2018-01-02 12:37:00 -08:00
dotnet-bot
c9e884e355 Update CoreSetup to preview1-26102-01 2018-01-02 18:10:45 +00:00
dotnet-bot
93073360c7 Update CoreSetup to preview1-26023-01 2017-12-23 18:33:34 +00:00
dotnet-bot
e015abc219 Update CoreSetup to preview1-26022-04 2017-12-22 22:34:22 +00:00
NuGet Team Bot
1e216db126 Insert NuGet Build 4.6.0-preview2-4759 into cli 2017-12-21 15:35:32 -08:00
John Luo
8c93b6d960 Update to consume aspnetcore 2.0.5-155 2017-12-20 19:25:45 -08:00
John Beisner
504413205b
Merge pull request #8227 from janvorli/enable-alpine
Enable Alpine 3.6 CLI build
2017-12-20 13:17:12 -08:00
Livar
3c94774185
Merge pull request #8268 from dotnet/nuget-insertbuild4745
Insert NuGet Build 4.6.0-preview2-4745 into cli
2017-12-19 17:01:52 -08:00
John Luo
ed511c4e29 Update to consume aspnetcore 2.0.5-152 2017-12-19 15:19:20 -08:00
John Luo
7af8cd0ae2 Revert "Update to consume aspnetcore 2.0.5-152"
This reverts commit 559d880cc2.
2017-12-19 15:18:35 -08:00
John Luo
559d880cc2 Update to consume aspnetcore 2.0.5-152 2017-12-19 15:17:03 -08:00
Livar
2cd74779d1 Updating roslyn to a version with the vbcscompiler. (#8214) 2017-12-19 14:06:48 -08:00
NuGet Team Bot
5a52a063b8 Insert NuGet Build 4.6.0-preview2-4745 into cli 2017-12-19 09:01:28 -08:00
Livar
6894eb0e6e
Merge pull request #8240 from dotnet-bot/master-UpdateDependencies
Update CoreSetup to preview1-26015-04 (master)
2017-12-18 16:12:20 -08:00
Livar
6ef4b794b2
Merge branch 'master' into merges/release/2.1-to-master-20171218-080046 2017-12-18 09:51:07 -08:00
Livar Cunha
d5c6133238 Adding the 2.0.3 asp.net store to the native installer tests. 2017-12-15 14:46:42 -08:00
dotnet-bot
7d968b0944 Update CoreSetup to preview1-26015-04 2017-12-15 22:28:58 +00:00
John Luo
bf3102d718 Update to consume aspnetcore 2.0.5-147 2017-12-14 20:45:17 -08:00
Jose Perez Rodriguez
af258af035 Update the support package on the CLI to fix binding redirects on 4.7.1 2017-12-14 14:00:39 -08:00
Livar
3cac822511
Updating the Microsoft.NET.SDK version to 2.1.0-preview1-62414-02 2017-12-13 19:26:21 -08:00
John Luo
34ec8c2480 Update to consume aspnetcore 2.0.5-146 2017-12-13 16:45:48 -08:00
dotnet-bot
8cbb59854e Update CoreSetup to preview1-26013-05 2017-12-13 22:11:47 +00:00
dotnet-bot
50f203396f Update CoreSetup to preview1-26013-04 2017-12-13 18:22:59 +00:00
Livar Cunha
ed916733ee Updating the runtime to 2.0.5. 2017-12-13 09:27:06 -08:00
Jan Vorlicek
4d615db634 Fix incorrect condition in SkipBuildingInstallers 2017-12-13 18:18:25 +01:00
Jan Vorlicek
1abd2d9209 Enable Alpine 3.6 CLI build
This change enables CLI build for Alpine 3.6 and also adds CI job for
it. It is mostly based on changes that were necessary to
enable building of rhel.6 CLI
2017-12-13 12:10:44 +01:00
Eric Erhardt
411b38b36d
Merge pull request #8223 from dotnet-bot/master-UpdateDependencies
Update CoreSetup to preview1-26012-06 (master)
2017-12-12 18:23:21 -06:00
John Luo
b3d565da56 Update to consume aspnetcore 2.0.5-142 2017-12-12 15:36:41 -08:00
Livar Cunha
a27354ba57 Merge branch 'release/2.1' into merge_release_21
* release/2.1:
  Correct the fix for devdiv bugs 526577 and 526578, the wrong property had been updated
  Updating the branding of the CLI to 2.1.4
  Updating the msbuild version for Microsoft.Build.Runtime.
  Updating the websdk version to 2.0.0-rel-20171110-671

	build/DependencyVersions.props
2017-12-12 15:24:09 -08:00
dotnet-bot
3bdce29d27 Update CoreSetup to preview1-26012-06 2017-12-12 22:07:06 +00:00
Andy Gerlicher
d2985289fa MSBuild 15.6.22 2017-12-12 10:30:15 -08:00
John Beisner
3ac579997c
Merge pull request #8204 from johnbeisner/FixTheMerge
Fixing CLI:master - parameterizing 'GenerateInstallersAndCopyOutOfSandBox'
2017-12-11 11:21:39 -08:00
John Beisner
6313f4fc7a The 15.4.8 version of the Microsoft.Build.Runtime nuget package is currupt; use the replacement 15.4.8.1 2017-12-11 11:01:24 -08:00
Mayank Bansal
ececae3ecd update preview of TestPlatform SDK 2017-12-11 19:40:10 +05:30
John Beisner
b06f6b1954 The target: 'GenerateInstallersAndCopyOutOfSandBox' should be parameterized in run-build.sh. 2017-12-10 18:12:20 -08:00
Mike Lorbetske
5fb2b271a8 Correct the fix for devdiv bugs 526577 and 526578, the wrong property had been updated 2017-12-08 12:52:48 -08:00
Livar
9c5843d071
Merge pull request #8165 from dotnet/vramak/UpdateWebSdk_12_4
Updating the websdk version to 2.0.0-rel-20171110-671
2017-12-07 14:35:01 -08:00
Javier Calvarro Nelson
ad8f3da826 ASP.NET Core HTTPS development certificate support
* Added support for generating the HTTPS development certificate on the
CLI first run experience.
* On first run, an HTTPS certificate will be set up on the current user
local store.
* The environment variable DOTNET_GENERATE_ASPNET_CERTIFICATE can be used
to turn the feature off.
2017-12-07 14:31:00 -08:00
Livar Cunha
90e254b9ed More fixes that were missing from the merge. 2017-12-07 13:23:27 -08:00
Livar Cunha
c768b01523 Updating the branding of the CLI to 2.1.4 2017-12-07 13:15:46 -08:00
Livar Cunha
902904cdd6 Updating the msbuild version for Microsoft.Build.Runtime. 2017-12-07 13:13:43 -08:00
Livar Cunha
60ba27d2db Adding a separate dependency version for Microsoft.Build.Runtime. 2017-12-07 12:19:43 -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
d280a054d4 Fixing the versions of MSBuild and passing the right property to find roslyn files. 2017-12-06 22:14:02 -08:00
John Beisner
50dcb60025 Use "15.5.179" for the other Microsoft.Build.* packages 2017-12-06 15:18:38 -08:00
John Beisner
e3b78f8ea5 Moving the 'MicrosoftBuildPackageVersion' forward. 2017-12-06 14:59:38 -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
873f0791fb Fixing a typo... 2017-12-05 14:14:02 -08:00
John Beisner
73e8ea9c1c Adding a 'nuget-build' feed; fixing the feed line-up: 'dotnet-core' and 'AspNetMaster'. 2017-12-05 10:33:36 -08:00
Livar
f2463fe2a5
Merge pull request #8164 from seancpeters/templating_build_315_insertion
Update template engine to build 315
2017-12-05 09:34:36 -08:00
Livar
f140bb4d01
Merge pull request #8167 from dotnet/merges/release/2.0.0-to-release/15.5-20171205-080034
Merge release/2.0.0 to release/15.5
2017-12-05 09:34:14 -08:00
Livar
c77452b9e2
Merge pull request #8158 from dotnet/merges/release/15.5-to-master-20171204-080035
Merge release/15.5 to master
2017-12-05 09:34:02 -08:00
John Beisner
fba1ad7287 Fixed a typo... 2017-12-05 09:19:22 -08:00
Livar Cunha
0c97a82d92 Updating the branding of the CLI to 2.1.4 and the runtime to 2.0.5. 2017-12-04 21:23:14 -08:00
Livar
b3d8bfca35
Merge pull request #8163 from dotnet/nguerrera/update-sdk
Update to latest dotnet/sdk
2017-12-04 16:27:28 -08:00
Vijay Ramakrishnan
11d9413b49 Updating the websdk version to 2.0.0-rel-20171110-671 2017-12-04 16:02:40 -08:00
John Beisner
1c5b49baee Nuget.config update to align with CLI:master - add comments in DependencyVersions.prop 2017-12-04 14:32:56 -08:00
John Beisner
80f5d9f8c7 Even more package dependency re-names... 2017-12-04 13:20:37 -08:00
Sean Peters
e2ea046082 Update template engine to build 315 2017-12-04 13:09:05 -08:00
Mihai Codoban
ea74bf1614 Bump MSbuild to 15.6.0-preview-000012-1193158 (#8161)
Includes https://github.com/Microsoft/msbuild/pull/2716
2017-12-04 13:08:18 -08:00
Nick Guerrera
1fe2fb3003
Update to latest dotnet/sdk 2017-12-04 13:06:42 -08:00
Livar
0ca9728098
Merge branch 'master' into merges/release/15.5-to-master-20171204-080035 2017-12-04 11:20:08 -08:00
John Beisner
3cb1cca44d Third pass clean-up of package names. 2017-12-04 09:44:51 -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
dotnet-bot
667f27cac8 Update CoreSetup to preview1-26001-02 2017-12-01 22:20:50 +00:00
John Beisner
1362c6c4f1 The access key is already resolved: 'CoreSetupBlobAccessTokenParam' 2017-12-01 14:06:06 -08:00
John Beisner
5607d1f68c Fixed another typo... 2017-12-01 14:01:07 -08:00
John Beisner
c54911b788 Dependency Uptake: download and import a package version props file. 2017-12-01 12:39:51 -08:00
Livar
b98ab1c89b
Merge pull request #8143 from dotnet/merges/release/2.0.0-to-release/15.5-20171201-080033
Merge release/2.0.0 to release/15.5
2017-12-01 11:59:06 -08:00
John Luo
9d391355f8 Consume 2.0.4 LZMA attempt 2 2017-12-01 10:54:49 -08:00
John Beisner
4adabde4c9 Accounting for MSRC builds with pre-set 'CoreSetupBlobRootUrl' and 'CoreSetupBlobAccessToke' properties. 2017-12-01 09:56:11 -08:00
John Beisner
b092ad0141 Changes per code review... 2017-12-01 08:05:33 -08:00
John Luo
6e41f29b38 Consume 2.0.4 LZMA 2017-11-30 16:43:20 -08:00
Parallels
83ddef69d6 Fixing the store consumption merge. 2017-11-30 14:15:38 -08:00
Livar Cunha
50ffb6bf72 Removing installing the 2.0.0 asp.net runtime store. We don't it anymore either. In master, just the preview one should be enough. 2017-11-30 12:55:23 -08:00
John Beisner
3d39772fe9 The URL root will include the "dotnet" container; the structure will be identical after the "dotnet" container. 2017-11-30 12:09:27 -08:00
Livar Cunha
d613ec5758 Making the cli-test-env shell script runnable and removing test workaround for preview runtimes. It is not needed in master. 2017-11-30 11:50:37 -08:00
John Beisner
5fb91f9661 Use the 'PB_AssetRootUrl' and 'PB_AssetRootAccessTokenSuffix' for all asset downloads if set - "TransportFeed" should be "BlobFeed". 2017-11-30 10:35:51 -08:00
Livar
d48654afe7
Merge branch 'master' into merges/release/15.5-to-master-20171120-080035 2017-11-30 09:40:47 -08:00
dotnet-bot
5e7b07c95a Update CoreSetup to preview1-25929-02 2017-11-29 19:57:20 +00:00
John Beisner
f29acd3153 If the build is a 'DotNetBuildOffline'; do not write any feed lines. 2017-11-29 10:22:27 -08:00
dotnet-bot
ed61cab7b6 Update CoreSetup to preview1-25929-01 2017-11-29 05:09:16 +00:00
John Beisner
57a2ccfb2c Changes per code review... 2017-11-28 17:12:44 -08:00
Livar Cunha
6fde7fa3ac Updating the branding of the CLI to 2.1.2 2017-11-28 13:04:34 -08:00
John Beisner
8b74ecd99b Fixing a typo... 2017-11-28 12:58:13 -08:00
Livar Cunha
fdb3c60deb Updating the branding of the CLI to 2.1.3. 2017-11-28 12:57:34 -08:00
John Beisner
e7f4fb001b Writing a NuGet.config as part of the preparatory steps. 2017-11-28 12:54:32 -08:00
dotnet-bot
bc7bcd3a1f Update CoreSetup to preview1-25928-05 2017-11-28 20:46:43 +00:00
Livar
df414ddcfa
Merge pull request #8112 from mlorbetske/dev/mlorbe/UpdateTheFixForBugs526577And526578For156
Correct the fix for devdiv bugs 526577 and 526578, the engine property had not been updated
2017-11-27 17:50:45 -08:00
Livar
4b297851e9
Merge pull request #8110 from dotnet/livarcocc-patch-2
Update SDK to 2.1.0-preview1-20171121-1
2017-11-27 16:13:40 -08:00
Livar
4debf0cd4b
Merge pull request #8091 from KevinRansom/UpdateFSharp
Update F# for VS2017.6
2017-11-27 14:31:15 -08:00
Mike Lorbetske
2714332d87 Correct the fix for devdiv bugs 526577 and 526578, the wrong property had been updated 2017-11-27 14:22:11 -08:00
Mike Lorbetske
391d4362f3 Correct the fix for devdiv bugs 526577 and 526578, the wrong property had been updated 2017-11-27 14:16:22 -08:00
Livar
093352bb66
Update SDK to 2.1.0-preview1-20171121-1 2017-11-27 14:16:10 -08:00
Livar Cunha
9e97e53446 Updating the CLI branding to 2.1.2 and ingesting the 2.0.4 runtime. 2017-11-27 11:36:12 -08:00
Nick Guerrera
68c8639f09
Merge pull request #8083 from nguerrera/update-satellites
Update F# and Roslyn translations
2017-11-27 10:20:57 -08:00
dotnet-bot
0b0ec007f8 Update CoreSetup to preview1-25926-02 2017-11-26 23:19:03 +00:00
Livar
469d6fb4df
Merge pull request #8094 from dotnet/merges/release/2.0.0-to-release/15.5-20171124-080040
Merge release/2.0.0 to release/15.5
2017-11-24 19:52:41 -08:00
dotnet-bot
ce96e03d1e Update CoreSetup to preview1-25924-02 2017-11-24 22:17:43 +00:00
dotnet-bot
c1c3cd4d24 Update CoreSetup to preview1-25923-01 2017-11-23 19:29:10 +00:00
Kevin Ransom
da8b3d3224 Update F# for VS2017.6 2017-11-22 20:09:47 -08:00
dotnet-bot
94fe8df9d2 Update CoreSetup to preview1-25922-04 2017-11-22 22:24:10 +00:00
Nick Guerrera
129b064900 Update F# and Roslyn translations 2017-11-21 17:02:26 -08:00
dotnet-bot
80f35f0ac8 Update CoreSetup to preview1-25921-02 2017-11-21 22:14:42 +00:00
Matt Mitchell
b7cc4a51b7
Update feed tasks version
Includes some fixes for upload timeouts and a version number change
2017-11-21 13:50:27 -08:00
Nick Guerrera
211255ec88 Revert "Update Roslyn and F# satellite assemblies"
This reverts commit f91a4906a7.
2017-11-21 10:43:26 -08:00
Nick Guerrera
f91a4906a7
Update Roslyn and F# satellite assemblies 2017-11-21 10:16:18 -08:00
dotnet-bot
6702ef401a Update CoreSetup to preview1-25921-01 2017-11-21 18:11:12 +00:00
Livar
01393ed3bc
Merge branch 'master' into merges/release/15.5-to-master-20171120-080035 2017-11-20 12:30:12 -08:00
Livar
2b55a52e33
Merge pull request #8057 from mlorbetske/dev/mlorbe/UpdateTemplateEngineVersionFor15.5
Update template engine version for 15.5
2017-11-20 11:50:43 -08:00
dotnet-bot
125514df02 Update CoreSetup to preview1-25919-02 2017-11-19 22:30:20 +00:00
Livar
d0b2b5f678
Merge pull request #8059 from dotnet-bot/master-UpdateDependencies
Update CoreSetup to preview1-25918-03 (master)
2017-11-18 13:56:17 -08:00
Livar
90d667e9b0
Merge pull request #8056 from mlorbetske/dev/mlorbe/UpdateTemplateEngineVersion
Update template engine version for 15.6+
2017-11-18 13:55:27 -08:00
dotnet-bot
d4df0010af Update CoreSetup to preview1-25918-03 2017-11-18 19:18:46 +00:00
Mike Lorbetske
d5c799b926 Update template engine version for 15.5 2017-11-17 18:40:33 -08:00
Mike Lorbetske
746b669a4c Update template engine version for 15.6+ 2017-11-17 18:37:56 -08:00
Livar
7e92f68b41
Merge branch 'release/15.5' into merges/release/2.0.0-to-release/15.5-20171117-080027 2017-11-17 18:26:30 -08:00
dotnet-bot
90a0249e00 Update CoreSetup to preview1-25917-06 2017-11-17 22:39:35 +00:00
Livar
d0c5510ee2
Merge pull request #7992 from seancpeters/templating_2.1.0-preview1_insertion_2017_11_09
Inserting dotnet/templating rel/2.1.0-preview1 into cli master
2017-11-16 18:27:28 -08:00
NuGet Team Bot
0cd05674ac Insert NuGet Build 4.5.0-rtm-4651 into cli 2017-11-16 16:43:21 -08:00
dotnet-bot
4498142bb5 Update CoreSetup to preview1-25916-02 2017-11-16 22:48:36 +00:00
Livar
09b2cd74c4
Merge pull request #8031 from AndyGerlicher/MSBuild.15.5.179
MSBuild 15.5.179
2017-11-16 11:55:46 -08:00
dotnet-bot
91bdd7e3a4 Update CoreSetup to preview1-25916-01 2017-11-16 18:45:07 +00:00
Andy Gerlicher
a75115f4f7 MSBuild 15.5.179 2017-11-15 18:05:25 -08:00
Livar
b7f81a574e
Update SDK to 15.5.0-preview-20171116-1 2017-11-15 17:14:17 -08:00
dotnet-bot
23575687f6 Update CoreSetup to preview1-25915-02 2017-11-15 23:44:19 +00:00
Livar Cunha
fe69088703 Updating Roslyn version. 2017-11-15 13:22:30 -08:00
dotnet-bot
1a16f3a7c5 Update CoreSetup to preview1-25915-01 2017-11-15 19:13:43 +00:00
Livar
46c55a322f
Merge pull request #8016 from livarcocc/merge_15_5_msrc
Merge release/15.5-MSRC into release/15.5
2017-11-15 09:49:19 -08:00
Livar
30329286d7
Merge pull request #8019 from KevinRansom/release/15.5
Update F# compiler
2017-11-14 18:54:51 -08:00
dotnet-bot
04c477fc21 Update CoreSetup to preview1-25914-05 2017-11-14 23:04:34 +00:00
Kevin Ransom (msft)
6fef644b70 Update F# compiler 2017-11-14 14:54:03 -08:00
Livar
c0488894b1
Merge pull request #8005 from mlorbetske/dev/mlorbe/UpdateForTestTemplates
Update non-web templates to version 1.0.0-beta3-20171110-312
2017-11-14 14:49:44 -08:00
Sean Peters
be0bebdf30 updated TemplateEnd template versions. Removed old entries from BundledTemplates.props 2017-11-14 14:13:31 -08:00
seancpeters
29a3673535
Merge branch 'master' into templating_2.1.0-preview1_insertion_2017_11_09 2017-11-14 14:04:55 -08:00
Livar
3b4becd7c8
Merge pull request #8011 from dotnet/merges/release/15.5-to-master-20171114-080040
Merge release/15.5 to master
2017-11-14 12:58:56 -08:00
Livar Cunha
e212767253 Keeping the branding suffix as servicing. 2017-11-14 12:57:11 -08:00
Livar Cunha
dc8a8e02db Merge branch 'release/2.0.0-MSRC' into merge_2_0_0_MSRC
* release/2.0.0-MSRC:
  Updating SDK to 2.0.3-servicing-20171109-3
  Update SDK to 2.0.2-vspre-20170927-1.
  Update aspnetcore to 2.0.3 build 125
  Update aspnetcore to 2.0.3 build 124
  Update aspnetcore to 2.0.3 build 123
  Updating branding to 2.0.3, again
  Fixing closing tags in the DEB and RPM targets.
  Enabling our native installer tests to always get a 2.0.0 asp.net runtime store. We need to solve this in a more generic way in the future. But this will unblock the build for now.
  Update aspnetcore runtime store and LZMA to 2.0.3 build 120
  Adding the pre-release runtime version hack to RHEL as well. Basically, skip native installer tests when using a pre-release runtime.
  Adding the access token to the native installer URLs so that we can download those from protected locations when needed.
  Fixing the expected runtime version by the tool tests.
  Updating the runtime version.
  Updating the branding to 15.5.1
  Adding a test hack to allow the CLI to pass tests with a pre-release runtime for 2.0 TFM.
  Merged PR 82801: Allow non-anonymous storage account access for .lzma download
2017-11-14 12:51:43 -08:00
Livar Cunha
005eab5b3f Merge branch 'release/15.5-MSRC' into merge_15_5_msrc
* release/15.5-MSRC:
  Update aspnetcore to 2.0.3 build 125
  Update aspnetcore to 2.0.3 build 124
  Update aspnetcore to 2.0.3 build 123
  Updating branding to 2.0.3, again
  Fixing closing tags in the DEB and RPM targets.
  Enabling our native installer tests to always get a 2.0.0 asp.net runtime store. We need to solve this in a more generic way in the future. But this will unblock the build for now.
  Update aspnetcore runtime store and LZMA to 2.0.3 build 120
  Adding the pre-release runtime version hack to RHEL as well. Basically, skip native installer tests when using a pre-release runtime.
  Adding the access token to the native installer URLs so that we can download those from protected locations when needed.
  Fixing the expected runtime version by the tool tests.
  Updating the runtime version.
  Updating the branding to 15.5.1
  Adding a test hack to allow the CLI to pass tests with a pre-release runtime for 2.0 TFM.
  Merged PR 82801: Allow non-anonymous storage account access for .lzma download
2017-11-14 12:47:53 -08:00
Livar
e5d2a67cfe
Merge pull request #7974 from singhsarab/patch-1
Updating the version for TestPlatform
2017-11-13 12:14:25 -08:00
Mike Lorbetske
5d85c8fde6 Update non-web templates to version 1.0.0-beta3-20171110-312 2017-11-13 12:02:34 -08:00
dotnet-bot
36d201b4f0 Update CoreSetup to preview1-25912-02 2017-11-12 22:48:10 +00: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
seancpeters
02e82d5610
Merge branch 'master' into templating_2.1.0-preview1_insertion_2017_11_09 2017-11-10 17:28:33 -08:00
Sean Peters
b1c7c072b6 updated the websdk version 2017-11-10 17:21:37 -08:00
Sean Peters
a49a9680ff bumped the templating build number 2017-11-10 16:26:36 -08:00
Nick Guerrera
5d2c5f9943
Update SDK 2017-11-10 10:56:54 -08:00
Nick Guerrera
71cb608e48
Merge branch 'master' into merges/release/15.5-to-master-20171109-080038 2017-11-09 18:43:28 -08:00
John Beisner
f0111a36c2
Merge pull request #7984 from johnbeisner/PublishToTFMethodUpdate
Changes in the Transport feed DLL requires our response; release/2.0.0
2017-11-09 15:49:23 -08:00
Sean Peters
82718a146c Inserting dotnet/templating rel/2.1.0-preview1 into cli master 2017-11-09 15:46:14 -08:00
dotnet-bot
dfc674fb09 Update CoreSetup to preview1-25909-03 2017-11-09 22:44:46 +00:00
John Beisner
85e79297c3 Simplified logic; part 2. 2017-11-09 13:38:33 -08:00
John Beisner
ef22bb23fc Simplified some logic. 2017-11-09 12:17:25 -08:00
John Beisner
14be2fc2a8 Fixed an incorrect conditional. 2017-11-09 12:14:56 -08:00
John Beisner
31fd2312b0 Make the "ExpectedFeedUrl" fully configurable. 2017-11-09 12:11:25 -08:00
John Beisner
95f30e3bec Moving conditional to load 'Microsoft.DotNet.Build.Tasks.Feed.targets' out of 'build.proj' 2017-11-09 09:30:11 -08:00
Livar
8b3c80958b
Merge pull request #7971 from dotnet/merges/release/2.0.0-to-release/15.5-20171107-080033
Merge release/2.0.0 to release/15.5
2017-11-09 00:04:47 -08:00
John Beisner
7b593a8ec6 Defining: "BuildTasksFeedToolVersion" 2017-11-08 19:42:41 -08:00
Livar Cunha
f85436d82d Updating SDK to 2.0.3-servicing-20171109-3 2017-11-08 19:16:27 -08:00
John Beisner
04ac042451 Changes in the Transport feed DLL requires our response; update Transport feed DLL version and base URL.
Defining "BuildTasksFeedDll" & relevent 'UsingTask' no longer needed as PublishNupkgToTransportFeed.targets uses the imported Microsoft.DotNet.Build.Tasks.Feed.targets to locate the Feed DLL
2017-11-08 19:07:29 -08:00
Livar Cunha
ef453ae64a Merge branch 'release/15.5' into merge_release_15_5
* release/15.5:
  Updating the SDK and Support package on the CLI
2017-11-08 18:04:43 -08:00
Jose Perez Rodriguez
079edcd894 Updating the SDK and Support package on the CLI 2017-11-08 15:31:51 -08:00
Livar Cunha
aa944444f6 Update SDK to 2.0.2-vspre-20170927-1. 2017-11-08 14:31:06 -08:00
Livar Cunha
cdefd5d7aa Merge branch 'release/15.5' into release/15.5-MSRC
* release/15.5:
  Update SDK to 15.5.0-preview-20171107-4
  MSBuild 15.5.178
  LOC CHECKIN | dotnet/cli - release/15.5 | 20171031
2017-11-08 13:14:44 -08:00
John Beisner
d19b3f4b2e Correcting 'PUBLISH_TO_AZURE_BLOB' and 'PUBLISH_NUPKG_TO_AZURE_BLOB' Booleans - 'false' should not be conveyed by the empty string. 2017-11-08 10:24:25 -08:00
John Beisner
e1d3320376 Correcting 'PUBLISH_TO_AZURE_BLOB' and 'PUBLISH_NUPKG_TO_AZURE_BLOB' Booleans - 'false' should not be conveyed by the empty string. 2017-11-08 09:26:32 -08:00
Livar
b6bfc84f51
Update SDK to 15.5.0-preview-20171107-4 2017-11-07 15:54:43 -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
dotnet-bot
fd738184c1 Update CoreSetup to preview1-25907-02 2017-11-07 17:49:55 +00:00
Sarabjot Singh
7dc7990d81
Updating the version for TestPlatform
Includes branding changes
2017-11-07 18:19:02 +05:30
Andy Gerlicher
ed916bb13e MSBuild 15.5.178 2017-11-06 19:23:10 -08:00
John Beisner
56d94ff68c Changes in the Transport feed DLL requires our response; change DLL version and base URL. 2017-11-06 14:57:55 -08:00
Livar
1f423ff22b
Update runtime version to preview1-25905-03 2017-11-06 09:31:45 -08:00
Nick Guerrera
2a0569dc34 Fix build error when using SeparateSymbolsArchive=false 2017-11-03 15:22:41 -07:00
Livar Cunha
0ffc530aee Merge branch 'release/2.0.0-MSRC' into merge_release_200_MSRC
* release/2.0.0-MSRC:
  Update aspnetcore to 2.0.3 build 125
  Update aspnetcore to 2.0.3 build 124
  Update aspnetcore to 2.0.3 build 123
  Updating branding to 2.0.3, again
  Fixing closing tags in the DEB and RPM targets.
  Enabling our native installer tests to always get a 2.0.0 asp.net runtime store. We need to solve this in a more generic way in the future. But this will unblock the build for now.
  Update aspnetcore runtime store and LZMA to 2.0.3 build 120
  Adding the pre-release runtime version hack to RHEL as well. Basically, skip native installer tests when using a pre-release runtime.
  Adding the access token to the native installer URLs so that we can download those from protected locations when needed.
  Fixing the expected runtime version by the tool tests.
  Updating the runtime version.
  Updating the branding to 15.5.1
  Adding a test hack to allow the CLI to pass tests with a pre-release runtime for 2.0 TFM.
  Merged PR 82801: Allow non-anonymous storage account access for .lzma download
2017-11-03 09:58:08 -07:00
Livar
3056f94cdf
Merge branch 'master' into merges/release/15.5-to-master-20171103-070036 2017-11-03 09:52:13 -07:00
Livar Cunha
6d16f2681e Merge branch 'release/2.0.0' into merge_release_200
* release/2.0.0:
  Update F# compiler to match VS
  update fsharp compiler for preview release
  Defining the published Nupkgs in one place.
  Adding the second CLI NuPkg
  Make the uploads to blob storage more exacting.
  Enabling the publish of CLI NuPkg to the unified Transport feed.
2017-11-03 09:46:25 -07:00
dotnet-bot
d4f92aa0f0 Update CoreSetup to preview1-25902-04 2017-11-03 00:57:00 +00: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
Livar
4122a72690
Merge pull request #7955 from dotnet/merges/release/15.5-to-master-20171102-070037
Merge release/15.5 to master
2017-11-02 09:32:40 -07:00
Andy Gerlicher
ec1e490395 MSBuild 15.5.172 2017-11-01 15:27:15 -07:00
Livar
2031c9cf33
Merge branch 'master' into merges/release/15.5-to-master-20171031-070033 2017-10-31 10:15:11 -07:00
Nate McMaster
255e7bc850 Update aspnetcore to 2.0.3 build 125 2017-10-31 09:10:35 -07:00
Satya Madala
e7fc8749f3 Insert Testplatform 15.5.0-preview-20171031-01 2017-10-31 20:46:45 +05:30
Nick Guerrera
9469978fe4
Merge pull request #7938 from dotnet-bot/master-UpdateDependencies
Update CoreSetup to preview1-25830-04 (master)
2017-10-30 18:54:25 -07:00
John Beisner
e6b8ef5bb7 The transport feed DLL method: 'PushToBlobFeed' parameters have changed with the newer DLL. 2017-10-30 16:40:49 -07:00
dotnet-bot
c59ad5a4c6 Update CoreSetup to preview1-25830-04 2017-10-30 23:00:25 +00:00
Livar
3d8ce7574b
Merge pull request #7900 from dotnet/merges/release/15.5-to-master-20171025-065942
Merge release/15.5 to master
2017-10-30 10:56:28 -07:00
Livar
d1b1454976
Merge branch 'release/15.5' into merges/release/2.0.0-to-release/15.5-20171030-065952 2017-10-30 09:40:54 -07:00
Kevin Ransom
8a60d17f0c Update F# compiler to match VS 2017-10-27 15:00:25 -07:00
William Lee
812cfbe90c
Update SDK version to 15.5.0-preview-20171027-2 (#7925) 2017-10-27 12:29:19 -07:00
Livar Cunha
dfd20eaf30 Updating the version of the command line parser. 2017-10-27 11:17:18 -07:00
Nate McMaster
878532eedf Update aspnetcore to 2.0.3 build 124 2017-10-27 07:57:14 -07:00
Livar
954b9a3ee1 Merge branch 'master' into merges/release/15.5-to-master-20171025-065942 2017-10-26 15:13:01 -07:00
Andy Gerlicher
4c804c3421 MSBuild 15.5.170 2017-10-26 12:46:37 -07:00
dotnet-bot
7d3ac35d84 Update CoreSetup to preview1-25825-07 2017-10-25 22:19:32 +00:00
Livar
103a56803f Merge branch 'master' into merges/release/15.5-to-master-20171025-065942 2017-10-25 10:46:31 -07:00
Nate McMaster
347169e68a Update aspnetcore to 2.0.3 build 123 2017-10-24 15:27:08 -07:00
Livar
835d38b27f Merge branch 'release/15.5' into merges/release/2.0.0-to-release/15.5-20171024-070026 2017-10-24 10:09:16 -07:00
Andy Gerlicher
f81c0fc1d7 MSBuild 15.5.165 2017-10-23 14:59:24 -07:00
Kevin Ransom
6ef8af7d6d update fsharp compiler for preview release 2017-10-23 14:47:31 -07:00
dotnet-bot
fa2bd27688 Update CoreSetup to preview1-25823-01 2017-10-23 17:28:38 +00:00
Livar Cunha
687cba8ca8 Updating branding to 2.0.3, again 2017-10-20 16:35:01 -07:00
Livar Cunha
e37e9f3fe8 Fixing closing tags in the DEB and RPM targets. 2017-10-20 14:43:29 -07:00
Livar Cunha
d4f980a02e Enabling our native installer tests to always get a 2.0.0 asp.net runtime store. We need to solve this in a more generic way in the future. But this will unblock the build for now. 2017-10-20 14:23:34 -07:00
John Beisner
f26e651c6a Defining the published Nupkgs in one place. 2017-10-20 14:02:41 -07:00
John Beisner
9bd54acabe Adding the second CLI NuPkg 2017-10-20 11:55:14 -07:00
Nate McMaster
be1b014c7c Update aspnetcore runtime store and LZMA to 2.0.3 build 120 2017-10-20 08:59:31 -07:00
Nick Guerrera
a149ec56cb Update toolset to latest 2.0.3-servicing 2017-10-19 16:57:07 -07:00
Nick Guerrera
69a3c9d248 Merge dotnet/cli:dev/release/2.0 into dev/repo-refactoring 2017-10-19 16:44:10 -07:00
Livar
b50595c419 Merge branch 'master' into merges/release/15.5-to-master-20171019-070029 2017-10-19 11:26:33 -07:00
Livar
0d51d3d0f7 Merge branch 'master' into master-UpdateDependencies 2017-10-18 20:16:33 -07:00
Nick Guerrera
a7aeab79d8 Fix problems with excluding MSBuildSdkResolver from build 2017-10-18 16:12:14 -07:00
Eric Erhardt
aea3f64ab2 Enable CLI to build on Windows during source-build. Don't build for net46 and use correct RID for core-setup. 2017-10-18 16:12:14 -07:00
Nick Guerrera
5a1021ac4b Only remove Azure dependency for source builds 2017-10-18 16:12:13 -07:00
dotnet-bot
5537be658f Update CoreSetup to preview1-25818-02 2017-10-18 21:35:19 +00:00
Matt Ellis
16ec23f86b Provide a way to explicitly set commit count and sha 2017-10-18 12:43:34 -07:00
Matt Ellis
428d541627 Provide a way to not include the SDK Resolver
When building the entire stack for a non windows target, the windows
resolver packages will not be present (and in the case of a windows
build, you'd only have one architecture anyway). Provide a way to opt
out of including the resolver. It's only interesting for Visual
Studio insertion cases, which is something the community at large
doesn't need to worry about.
2017-10-18 12:43:33 -07:00
Matt Ellis
0b1a5b10c2 Provide a way to not include the ASP.NET Runtime Packages 2017-10-18 12:43:33 -07:00
Livar
aad235fd1c Merge branch 'master' into merges/release/15.5-to-master-20171018-070036 2017-10-18 12:20:03 -07:00
Livar
8d7863e103 Merge pull request #7865 from dotnet-bot/master-UpdateDependencies
Update CoreSetup to preview1-25818-01 (master)
2017-10-18 11:38:33 -07:00
Livar
569ae654ae Merge pull request #7860 from dotnet/livarcocc-patch-3
Updating the version on master to 2.2.0
2017-10-18 10:54:32 -07:00
dotnet-bot
8b69a7506a Update CoreSetup to preview1-25818-01 2017-10-18 17:45:51 +00:00
Livar
d3098e7fcd Update SDK to 15.5.0-preview-20171018-2 2017-10-18 10:40:15 -07:00
Livar
8e2b99dae1 Removing a bundled template that should not be here.
Microsoft.DotNet.Web.Client.ItemTemplates should not be here yet.
2017-10-17 17:53:18 -07:00
Livar Cunha
72eda50303 Merge branch 'release/2.0.0' into merge_release_200
* release/2.0.0:
  Separating the 'legacy' URL construction from the 'current' URL construction methods and logic.
  Use temporary path for fake deps.json in test
  MSBuild 15.4.8
  Insert SDK 2.0.2-vspre-20170927-1
2017-10-17 17:30:58 -07:00
Livar
a450165732 Updating the branding to 2.2.0 2017-10-17 16:54:22 -07:00
Livar
13ba5efc12 Updating the version on master to 2.2.0 2017-10-17 16:53:50 -07:00
Livar
9bd976f5ec Updating ASP.NET templates to 1.0.0-beta2-20170810-304 2017-10-17 16:52:20 -07:00
Livar
730affa440 Merge branch 'master' into master-UpdateDependencies 2017-10-17 16:26:04 -07:00
Livar
a34ecdeff6 Merge branch 'master' into merges/release/15.5-to-master-20171016-070031 2017-10-17 14:42:15 -07:00
dotnet-bot
3484dd26df Update CoreSetup to preview1-25817-05 2017-10-17 21:40:36 +00:00
Livar
5d44ab70cd Merge pull request #7856 from livarcocc/update_branding_to_2_1
Updating the brand to 2.1.1.
2017-10-17 13:20:30 -07:00
Livar
966e133565 Merge branch 'master' into merges/release/15.5-to-master-20171016-070031 2017-10-17 11:36:43 -07:00
Livar Cunha
bfb045e311 Updating the brand to 2.1.1. 2017-10-17 11:22:24 -07:00
dotnet-bot
a6b40da4ae Update CoreSetup to preview1-25817-01 2017-10-17 17:50:35 +00:00
Livar
95dafad76b Merge branch 'release/15.5' into update_roslyn 2017-10-17 10:09:24 -07:00
Livar
c4faa28ffa Merge pull request #7847 from AndyGerlicher/MSBuild.15.5.160
MSBuild 15.5.160
2017-10-17 09:50:22 -07:00
Livar Cunha
ea158bb686 Update the roslyn version to 2.6.0-beta2-62210-01. 2017-10-17 09:48:16 -07:00
John Beisner
f33310fefc Make the uploads to blob storage more exacting. 2017-10-17 09:08:35 -07:00
Daniel Plaisted
2a3a5be07d Insert SDK 15.5.0-preview-20171017-1 2017-10-16 17:23:12 -07:00
Livar
9de48be817 Merge pull request #7834 from harshjain2/TPv2LatestRelease
Updated version of TestPlatform to 15.5.0-preview-20171012-09
2017-10-16 15:52:49 -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
Andy Gerlicher
88bcf0ffb3 MSBuild 15.5.160 2017-10-16 14:40:46 -07:00
dotnet-bot
1efa3f57ad Update CoreSetup to preview1-25816-02 2017-10-16 21:38:06 +00:00
John Beisner
0c4bcdcc55 Enabling the publish of CLI NuPkg to the unified Transport feed. 2017-10-16 14:33:50 -07:00
Kevin Ransom (msft)
c58612bd2c Merge pull request #7844 from dotnet/merges/release/2.0.0-to-dev/release/2.0-20171016-070029
Merge release/2.0.0 to dev/release/2.0
2017-10-16 11:37:50 -07:00
Livar
1b4b05a44d Merge pull request #3 from dotnet/livarcocc-patch-2
Update channel and version suffixes
2017-10-13 17:03:23 -07:00
Livar Cunha
03e37047a3 Fixing Windows build script. 2017-10-13 16:40:31 -07:00
Livar
d65f5b6558 Merge pull request #7832 from dotnet/merges/release/2.0.0-to-dev/release/2.0-20171013-070030
Merge release/2.0.0 to dev/release/2.0
2017-10-13 12:04:31 -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
80d76f93a4 Merge branch 'release/15.5' into merges/release/2.0.0-to-release/15.5-20171013-070028 2017-10-13 10:19:11 -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
Livar Cunha
1943ddc57f Merge remote-tracking branch 'dotnet/release/2.0.0' into merges/release/2.0.0-to-release/15.5-20171013-070028
* dotnet/release/2.0.0:
  Use temporary path for fake deps.json in test
  Porting 'dotnet-install.sh' from CLI:master to CLI:release/2.0.0
  'NuGet.master.config' does not appear to be used.
  Reverting previous change to: 'NuGet.master.config'
  Moving the runtime version to 2.0.0 for the SDK.
  Revert release/2.0.0 back to 1bcee43995
  Adding the unified transport NuGet feed.
  Keeping the branding for release/2.0.0 at 2.0.3.
  MSBuild 15.4.8
  Insert SDK 2.0.2-vspre-20170927-1
2017-10-13 09:04:58 -07:00
Harsh Jain
41d1f6ad6d Updated version of TPv2 2017-10-13 14:09:32 +05:30
Livar
e9b0eefbd9 Update the version suffix to refac 2017-10-12 20:17:06 -07:00
Livar
a510cb2226 Update the channel to dev/repo-refactoring 2017-10-12 20:16:36 -07:00
Nick Guerrera
c0c4be7946 Merge branch 'release/2.0-vs' into merge-2.0-vs 2017-10-12 18:22:04 -07:00
Livar
b6c2dbf4c6 Updating channel to dev/release/2.0 2017-10-12 16:25:30 -07:00
Nick Guerrera
7b558111ae Use same build number for roslyn and F# satellites 2017-10-12 16:22:06 -07:00
Livar Cunha
f6a07bcb39 Merge branch 'release/2.0.0' into merge_release_200
* release/2.0.0:
  Porting 'dotnet-install.sh' from CLI:master to CLI:release/2.0.0
  'NuGet.master.config' does not appear to be used.
  Reverting previous change to: 'NuGet.master.config'
  Moving the runtime version to 2.0.0 for the SDK.
  Revert release/2.0.0 back to 1bcee43995
  Adding the unified transport NuGet feed.
  Update cli-deps-satellites
  Fix up roslyn satellite assembly handling to match new insertion mechanism
2017-10-12 14:56:23 -07:00
Livar
428b2caa6b Merge pull request #7814 from AndyGerlicher/MSBuild.15.5.154
MSBuild 15.5.154
2017-10-12 13:51:38 -07:00
Livar
278cbf6c44 Merge pull request #7819 from dotnet/livarcocc-patch-2
Updating Roslyn satellites and SDK versions
2017-10-11 23:54:09 -07:00
Livar
821a413dd6 Updating Roslyn satellites and SDK versions 2017-10-11 22:29:40 -07:00
NuGet Team Bot
15ee853d49 Insert NuGet Build 4.5.0-preview2-4529 into cli 2017-10-11 18:44:34 -07:00
Livar
95a56ffcfe Merge pull request #7811 from seancpeters/15.5_separate_aspnet_templates
Added a property to DependencyVersions.props for asp.net template version
2017-10-11 18:40:24 -07:00
Andy Gerlicher
d15d448332 Update NuGet to 4529 (signed) 2017-10-11 18:30:57 -07:00
Andy Gerlicher
97f4a01869 MSBuild 15.5.154 2017-10-11 17:27:36 -07:00
Andy Gerlicher
3b09db3f9e MSBuild 15.5.153 2017-10-11 17:26:43 -07:00
seancpeters
2d6314e78f removed commented out config I'd meant to remove 2017-10-11 16:37:49 -07:00
seancpeters
c6139adcc9 added a way to specify the asp.net template versions 2017-10-11 16:22:03 -07:00
Daniel Plaisted
0a3f2a7265 Merge pull request #7804 from dsplaisted/branchinfo-15.5
Update branch info to release/15.5
2017-10-11 10:21:39 -07:00
faahmad
6f41ca4de7 Merge branch 'release/15.5' into updateTpv215.5.0-preview-20171009-10
# Conflicts:
#	build/DependencyVersions.props
2017-10-11 12:09:40 +05:30
Daniel Plaisted
857c7e3e56 Update branch info to release/15.5 2017-10-10 22:11:00 -07:00
Livar
7f5c9ec12a Merge pull request #7803 from dotnet/vramak/websdk_15_5
Updating the websdk version to 2.0.0-rel-20171010-665
2017-10-10 21:07:53 -07:00
Vijay Ramakrishnan
6a116d4b94 Updating the websdk version to 2.0.0-rel-20171010-665 2017-10-10 16:38:32 -07:00
dotnet-bot
ce29ec42e8 Update CoreSetup to preview1-25810-02 2017-10-10 22:28:57 +00:00
NuGet Team Bot
a084153c15 Insert NuGet Build 4.5.0-preview1-4526 into cli 2017-10-10 15:08:33 -07:00
Shyam-Gupta
b5d9f6f3e6 Update DependencyVersions.props 2017-10-10 16:50:09 +05:30
Livar Cunha
34235acb37 Adding the pre-release runtime version hack to RHEL as well. Basically, skip native installer tests when using a pre-release runtime. 2017-10-09 15:27:05 -07:00
Livar Cunha
ec9b583eb4 Adding the access token to the native installer URLs so that we can download those from protected locations when needed. 2017-10-09 14:09:48 -07:00
Livar Cunha
fead8521c3 Moving the runtime version to 2.0.0 for the SDK.
(cherry picked from commit e24b53dda7)
2017-10-09 13:59:09 -07: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
Livar Cunha
7ce43b9e3e Updating the runtime version. 2017-10-09 11:42:21 -07:00
Livar Cunha
d7ef3d244b Updating the branding to 15.5.1 2017-10-09 11:37:04 -07:00
Livar
da92efce24 Merge pull request #7789 from dotnet/merges/release/15.5-to-release/2.0.0-20171009-070027
Merge release/15.5 to release/2.0.0
2017-10-09 11:11:03 -07:00
Shyam-Gupta
9a2e87f0d9 Updated version of TestPlatform to 15.5.0-preview-20170923-02
refer commit: fa876f5b90
2017-10-09 17:46:08 +05:30
dotnet-bot
c23cd33b28 Update CoreSetup to preview1-25806-02 2017-10-06 22:06:36 +00:00
Eric Erhardt
a629d569a3 Merge pull request #7780 from dotnet-bot/master-UpdateDependencies
Update CoreSetup to preview1-25806-01 (master)
2017-10-06 16:17:16 -05:00
Livar
5407978c13 Merge pull request #7772 from dotnet/livarcocc-patch-2
Update the SDK to 2.1.0-preview1-20171006-4
2017-10-06 11:49:05 -07:00
Livar Cunha
36892f28e9 Adding a test hack to allow the CLI to pass tests with a pre-release runtime for 2.0 TFM. 2017-10-06 11:08:02 -07:00
dotnet-bot
6066e1ce3a Update CoreSetup to preview1-25806-01 2017-10-06 17:40:13 +00:00
Livar
c950f92462 Update the SDK to 2.1.0-preview1-20171006-4 2017-10-05 16:39:32 -07:00
dotnet-bot
ad0ecd6914 Update CoreSetup to preview1-25805-02 2017-10-05 21:39:21 +00:00
Nick Guerrera
d0013186c7 Merge pull request #7751 from nguerrera/fixup-roslyn-loc
Update satellite assemblies and fix up roslyn satellite handling
2017-10-05 11:25:07 -07:00
Livar Cunha
e6c0c6ef15 Merge branch 'release/2.0.0' into merge_release200_into_release200MSRC
* release/2.0.0: (49 commits)
  Keeping the branding for release/2.0.0 at 2.0.3.
  Moving the runtime version to 2.0.0 for the SDK.
  MSBuild 15.5.113
  Update F# compiler
  Remove CscToolPath
  Improve the way Roslyn is pulled in
  MSBuild 15.5.110
  Update XLFs
  Update the string that is displayed when there's a typo in the profile name or it's not a valid JSON object
  Updating the branding to 15.5.
  Updating the CLI branding to 2.0.3
  Fixing merges.
  Removing the trailing '\r' for bash shells; commit hash.
  Removing the trailing '\r' for bash shells. https://github.com/dotnet/cli/issues/7392
  Changing ItAddsFxVersionAsAParamWhenTheToolHasThePrefercliruntimeFile to expect 2.0.0 as the runtime version.
  Fixing 'librarypath'
  Update the installation scripts in release/2.0.0 branch.
  Insert SDK 2.0.2-vspre-20170921-5
  Insert SDK 2.0.2-vspre-20170915-1
  MSBuild 15.4.7
  ...
2017-10-05 10:27:38 -07:00
Livar Cunha
ed953f6d05 Keeping the branding for release/2.0.0 at 2.0.3. 2017-10-04 18:07:10 -07:00
dotnet-bot
58c76ff1ce Update CoreSetup to preview1-25804-01 2017-10-04 17:28:30 +00:00
Livar Cunha
e24b53dda7 Moving the runtime version to 2.0.0 for the SDK. 2017-10-03 16:46:15 -07:00
Nick Guerrera
cd68283018 Update cli-deps-satellites 2017-10-03 16:01:08 -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
Nick Guerrera
f97742aa43 Change pre-release label for infrastructure work 2017-10-03 14:52:13 -07:00
John Beisner
d498ab677e Merge pull request #7747 from johnbeisner/RedHat6Stuff
Missing value for 'PublishNativeInstallers' and Updating the README
2017-10-03 10:17:32 -07:00
Livar
2d3b8da0b0 Merge pull request #7748 from AndyGerlicher/MSBuild.15.5.113
MSBuild 15.5.113
2017-10-03 09:55:17 -07:00
John Beisner
659c672411 Missing value for 'PublishNativeInstallers' 2017-10-03 08:58:52 -07:00
Livar
72f42f9463 Merge pull request #7735 from brettfo/update-fsharp-15.5
Update FSharp compiler
2017-10-02 20:43:11 -07:00
Andy Gerlicher
cd9260f467 MSBuild 15.5.113 2017-10-02 19:03:59 -07:00
Brett V. Forsgren
6ccff28e0a Update F# compiler 2017-10-02 16:37:31 -07:00
dotnet-bot
ee76f981b4 Update CoreSetup to preview1-25802-02 2017-10-02 22:30:41 +00:00
Livar
32c0f44129 Merge branch 'release/15.5' into improve_roslyn 2017-10-02 15:13:34 -07:00
dotnet-bot
1bf3b681e2 Update CoreSetup to preview1-25802-01 2017-10-02 17:27:49 +00:00
John Beisner
22cd85daf6 Merge pull request #7732 from johnbeisner/RedHat6Stuff
The publish logic needs to change with the addition of RedHat 6.
2017-10-02 10:14:18 -07:00
khyperia
04c8a68539 Improve the way Roslyn is pulled in 2017-10-02 08:01:44 -07:00
dotnet-bot
49794cf29b Update CoreSetup to preview1-25801-01 2017-10-01 18:39:18 +00:00
dotnet-bot
ce08614bf7 Update CoreSetup to preview1-25729-02 2017-09-29 21:49:46 +00:00
John Beisner
3b7f13e179 The publish logic needs to change with the addition of RedHat 6.
"IsLinuxDistroSpecific" was used only to decide whether to publish zip/tar files - changes to "PublishArchives" & includes RedHat 6 per 'DerivedHostMachineInfo.props'

"IslinuxPortable" was used to decide, among other things, whether to publish the installer packages - changes to "PublishNativeInstallers" & excludes RedHat 6 per 'DerivedHostMachineInfo.props'
2017-09-29 13:58:08 -07:00
Andy Gerlicher
fb67e25cfb MSBuild 15.5.110 2017-09-29 13:31:56 -07:00
Livar
1ce3b0ad69 Merge pull request #7725 from dotnet-bot/master-UpdateDependencies
Update CoreSetup to preview1-25728-02 (master)
2017-09-29 13:21:13 -07:00
Jan Vorlicek
7826f23d56 Merge pull request #7723 from johnbeisner/RedHat6Enable
Handling the 'badge' naming for RedHat6
2017-09-29 12:32:39 +02:00
dotnet-bot
8632acb6f7 Update CoreSetup to preview1-25728-02 2017-09-28 21:26:29 +00:00
John Beisner
fbb61475f7 Handling the 'badge' naming for RedHat6 2017-09-28 11:19:49 -07:00
John Beisner
a8108c08a1 Merge pull request #7718 from johnbeisner/RedHat6Enable
Adding "rhel.6-x64" to Branding.props
2017-09-28 08:27:54 -07:00
Livar
b7f14949cd Merge pull request #7719 from dotnet-bot/master-UpdateDependencies
Update CoreSetup to preview1-25727-05 (master)
2017-09-27 20:12:13 -07:00
Daniel Plaisted
0586375cf8 Avoid importing incompatible .props files for signing build
(cherry picked from commit c2ca512189)
2017-09-27 16:55:00 -07:00
John Beisner
faca86fe62 Adding required environmental variables.
(cherry picked from commit 5000ba5f10)
2017-09-27 16:54:50 -07:00
John Beisner
7b3c1bbb23 Adding consistent "Project" headers to inported props and target files.
(cherry picked from commit 74ad01b576)
2017-09-27 16:54:39 -07:00
Livar
5de69a9e0e Merge branch 'master' into merges/release/2.0.0-to-master-20170927-070027 2017-09-27 16:21:19 -07:00
dotnet-bot
05b0a63044 Update CoreSetup to preview1-25727-05 2017-09-27 22:49:00 +00:00
Livar Cunha
19ce791408 Updating the branding to 15.5. 2017-09-27 15:24:22 -07:00
Daniel Plaisted
41695eacb1 Update environment variables for EndToEnd test run on Debian package
(cherry picked from commit 6e0646f7bf)
2017-09-27 14:45:05 -07:00
Daniel Plaisted
e2bd3e3f38 Update signing.proj to use new output paths, and import common repo props
(cherry picked from commit 728cea22f1)
2017-09-27 14:45:05 -07:00
Daniel Plaisted
43febd4e9d Remove duplicate import
(cherry picked from commit 88319a71f3)
2017-09-27 14:45:04 -07:00
Daniel Plaisted
65b0df5b43 Rename output folder from out to bin
(cherry picked from commit 97b7553e31)
2017-09-27 14:45:04 -07:00
Daniel Plaisted
02a07e6d8e Delete outdated comment
(cherry picked from commit 546eff28c2)
2017-09-27 14:42:05 -07:00
Daniel Plaisted
e60fe42432 Fix debian package generation
Previously, dotnet-deb-tool-consumer.csproj was copied to the out/artifacts folder before being restored.  This no longer works as it depends on repo properties, and there is a Directory.Build.props in teh out directory to stop projects inside it from getting the repo properties.  So this change restores it in-place instead.

(cherry picked from commit ac67434ea4)
2017-09-27 14:40:57 -07:00
Daniel Plaisted
4cd03dcae4 Use shorter output paths to avoid max path issues on Windows
For example, "out/2" instead of "artifacts/stage2"

(cherry picked from commit dcb3a7ade7)
2017-09-27 14:40:13 -07:00
Daniel Plaisted
ca21dee79a Update MSI tests to use new output directory layout
(cherry picked from commit 2222290394)
2017-09-27 14:37:40 -07:00
Daniel Plaisted
ca34332205 Rename Stage0 build variables to PreviousStage
(cherry picked from commit c6e4c8f477)
2017-09-27 14:37:37 -07:00
Livar Cunha
4bd9bb92cc Merge remote-tracking branch 'dotnet/release/2.0.0' into merges/release/2.0.0-to-master-20170927-070027
* dotnet/release/2.0.0: (29 commits)
  Updating the CLI branding to 2.0.3
  Fixing merges.
  Removing the trailing '\r' for bash shells; commit hash.
  Removing the trailing '\r' for bash shells. https://github.com/dotnet/cli/issues/7392
  Changing ItAddsFxVersionAsAParamWhenTheToolHasThePrefercliruntimeFile to expect 2.0.0 as the runtime version.
  Fixing 'librarypath'
  Update the installation scripts in release/2.0.0 branch.
  Insert SDK 2.0.2-vspre-20170921-5
  Insert SDK 2.0.2-vspre-20170915-1
  MSBuild 15.4.7
  Updating the websdk version to 2.0.0-rel-20170908-653
  Insert NuGet Build 4.4.0-preview3-4475 into cli
  Remove out of support ubuntu1610
  Removing extra line feeds...
  Turning on the NuPkg publishing from Win x86
  The enumeration of the nupkg packages depends on that the creation of packages has already occurred.
  Trivial change to start a VSO build
  Push the 'VS.Redist.Common.Net.Core.SDK*.nupkg' packages to blob storage.
  Remove EOL openSuSE 42.1
  Trigger build
  ...
2017-09-27 14:35:00 -07:00
Daniel Plaisted
f39315771e Generate properties to pass to the next stage of the build
(cherry picked from commit 12f8c2377f)
2017-09-27 14:22:19 -07:00
Daniel Plaisted
ee7852a790 Copy empty Directory.Build.props to artifacts folder during build instead of checking it in
(cherry picked from commit 884a48372d)
2017-09-27 14:20:08 -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
William Li
c834676ecb Port #7460 from master to 2.0.x
Use Rest Api to upload to the feed

Add pulling logic to make sure it is uploaded to the feed.

Add retry logic for the whole upload process

Remove the old upload script

(cherry picked from commit 7f54ccb903)
2017-09-27 14:08:31 -07:00
John Beisner
18a79ee291 Adding "rhel.6-x64"
Removing "ubuntu.16.10-x64"
2017-09-27 13:43:24 -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
Andy Gerlicher
79077b5ea2 MSBuild 15.4.8 2017-09-27 09:52:43 -07:00
Daniel Plaisted
0d233cd9d0 Insert SDK 2.0.2-vspre-20170927-1 2017-09-26 18:13:03 -07:00
Livar Cunha
84c56a8a92 Updating the CLI branding to 2.0.3 2017-09-26 15:39:02 -07:00
Livar Cunha
2669306319 Fixing merges. 2017-09-26 15:33:17 -07:00
Harsh Jain
fa876f5b90 Updated version of TestPlatform to 15.5.0-preview-20170923-02 2017-09-26 19:19:16 +05:30
Livar Cunha
c7fa050645 Merge branch 'release/2.0-vs' into merge_release20_vs
* release/2.0-vs: (22 commits)
  Insert SDK 2.0.2-vspre-20170921-5
  Insert SDK 2.0.2-vspre-20170915-1
  MSBuild 15.4.7
  Updating the websdk version to 2.0.0-rel-20170908-653
  Insert NuGet Build 4.4.0-preview3-4475 into cli
  Remove out of support ubuntu1610
  Removing extra line feeds...
  Turning on the NuPkg publishing from Win x86
  The enumeration of the nupkg packages depends on that the creation of packages has already occurred.
  Trivial change to start a VSO build
  Push the 'VS.Redist.Common.Net.Core.SDK*.nupkg' packages to blob storage.
  Remove EOL openSuSE 42.1
  Trigger build
  Trigger build
  Sign additional files
  Update CLI_NETSDK_Version SDK to 2.0.2-vspre-20170825-1
  Dummy commit to trigger CI due to 20170824.1 publish nuget time out 20170824.1
  Insert NuGet Build 4.4.0-preview1-4434 into cli
  Update to SDK build which includes NuGet 4.4.0-preview1-4365
  Insert NuGet Build 4.4.0-preview1-4365 into cli
  ...
2017-09-22 15:36:27 -07:00
Jan Vorlicek
5aff58b8b9 Merge pull request #7694 from janvorli/rhel6-support-fixes
Fix issue and minor cleanup of the RHEL 6 support
2017-09-22 00:40:51 +02:00
Daniel Plaisted
ce885f76c4 Insert SDK 2.0.2-vspre-20170921-5 2017-09-21 15:21:29 -07:00
Jan Vorlicek
6630c8292b Fix issue and minor cleanup of the RHEL 6 support
This change fixes extraction of the unprocessed args and also implements
few minor changes that @eerhardt has asked for, like renaming the new argument
and changing usage of HostRid to Rid in build/BuildDefaults.props.
2017-09-21 20:38:34 +00:00
Andy Gerlicher
9e06395ed7 MSBuild 15.5.90 2017-09-21 12:45:07 -07:00
Jan Vorlicek
90e217831b Enable RHEL 6 support
This change enables RHEL 6 support. It also adds a new command line option to the
run-build.sh script that enables passing in a folder containing a bootstrap CLI.
This helps in bringup of new target platforms.
2017-09-21 15:20:55 +00:00
dotnet-bot
7287790200 Update CoreSetup to preview1-25719-04 2017-09-20 00:14:50 +00:00
Livar
d624a96a1f Merge pull request #7663 from livarcocc/move_testframework_from_output
Removing Microsoft.DotNet.TestFramework from the product code
2017-09-15 15:31:31 -07:00
William Li
ad56d3759e fix missing windows package
Put back the dependency of package. Duplicate a publish step with package and use that one in all linux distro specific
2017-09-15 15:28:57 -07:00
Daniel Plaisted
ba1c8eda24 Insert SDK 2.0.2-vspre-20170915-1 2017-09-15 14:14:25 -07:00
Livar
b70923512c Merge pull request #7647 from dotnet/nuget-insertbuild4475
Insert NuGet Build 4.4.0-preview3-4475 into cli
2017-09-15 13:56:21 -07:00
Livar
baa49ef4c1 Merge pull request #7653 from AndyGerlicher/MSBuild.15.4.7
MSBuild 15.4.7
2017-09-15 10:04:37 -07:00
Livar
0a482954ae Merge pull request #7645 from livarcocc/remove_archiver_code
Removing Microsoft.DotNet.Archive from the CLI
2017-09-15 09:58:03 -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
William Li
7c64ef6b0e Move badge prop to target
To have the correct IsBuildingAndPublishingAllLinuxDistrosNativeInstallers value
2017-09-14 19:36:56 -07:00
William Lee
f6fda26ec8 Fix missing Badges
By setting IsBuildingAndPublishingAllLinuxDistrosNativeInstallers in right order
2017-09-14 15:42:10 -07:00
William Lee
221ab05346 Use one build definition to produce all Linux distro specific packages (#7615)
By using `./build.sh /t:AllLiuxDistrosNativeInstaller`

Make a sandbox folder after compile step and copy compiled artifact to it. Since the content will be Linux generic, use package step with Docker in different distros.
After finishing all the distro specific packaging, upload all of them at once

Publish to debian only support all distro

Improve perf of AllLiuxDistrosNativeInstaller, by copying more cache in to sandbox

There will be a retry if package command failed
2017-09-14 13:33:46 -07:00
Andy Gerlicher
f71eecfdd3 MSBuild 15.4.7 2017-09-14 11:04:59 -07:00
Vijay Ramakrishnan
c6482b8919 Updating the websdk version to 2.0.0-rel-20170908-653 2017-09-14 10:39:42 -07:00
Harsh Jain
4eb4cddbb7 Updated version of TestPlatform to 15.5.0-preview-20170914-09 2017-09-14 20:49:31 +05:30
NuGet Team Bot
5ce59a6179 Insert NuGet Build 4.4.0-preview3-4475 into cli 2017-09-13 17:27:51 -07:00
Livar Cunha
9cdb20b7a5 Removing Microsoft.DotNet.Archive from the CLI and instead depending on a nupkg. 2017-09-13 14:04:09 -07:00
Daniel Plaisted
f9b576cf5d Insert SDK version 2.0.1-servicing-20170912-1 2017-09-11 18:37:23 -07:00
Livar
a8dd209359 Merge branch 'master' into merges/release/2.0.0-to-master-20170907-070027 2017-09-07 11:11:28 -07:00
John Beisner
483e03704f Merge pull request #7598 from johnbeisner/RPM-EnvVars
Incorrect token: Installer.RPM.targets
2017-09-06 09:58:26 -07:00
John Beisner
6a76bb8396 Incorrect token. 2017-09-06 08:53:01 -07:00
Daniel Plaisted
79ffd86afd Merge branch 'RPM-EnvVars' into fix-signing 2017-09-05 15:39:08 -07:00
Daniel Plaisted
d94a3cd076 Merge branch 'DirProps' into fix-signing 2017-09-05 15:39:02 -07:00
Daniel Plaisted
c2ca512189 Avoid importing incompatible .props files for signing build 2017-09-05 15:10:15 -07:00
John Beisner
5000ba5f10 Adding required environmental variables. 2017-09-05 15:08:42 -07:00
John Beisner
74ad01b576 Adding consistent "Project" headers to inported props and target files. 2017-09-05 14:44:25 -07:00
Nick Guerrera
1c27c27b44 Sign additional files
Some files that get their signature invalidated by crossgen were missing
from the Signing.proj list.

(cherry picked from commit d7665ea316)
2017-09-05 13:30:17 -07:00