Commit graph

8209 commits

Author SHA1 Message Date
Livar Cunha
3f2bdcfbf4 Fixing the URLs for the msbuildscript.tests to use the new asp.net runtime folder as well. 2018-02-15 12:58:21 -08:00
Livar Cunha
d823581166 Updating the lzma to use the new asp.net runtime location. 2018-02-15 12:45:53 -08:00
Livar
4810eff390 Update ASP.NET version to 2.1.0-preview2-30106 2018-02-15 12:23:35 -08:00
Livar Cunha
f19b3fddc9 Merge remote-tracking branch 'dotnet/release/2.1.3xx' into merges/release/2.1.3xx-to-master
* dotnet/release/2.1.3xx:
  Update to aspnetcore 2.1.0-preview1-28275 and react to feed layout changes (#8611)
  "ExternalRestoreSources" needs to be set in the docker container (#8602)
  Signing nupkg contents (Cli.Utils and MSBuildResolver) along with the rest of the compiled assemblies.
  Use satellites from roslyn package, not cli-deps-satellites
  Update to roslyn 2.7.0-beta3-62612-07 for 2.1.1xx
  Support TildeSlash expand (#8589)
  Port Kernel Version telemetry to preview1
  Do not create a directory with a trailing space; it cannot be deleted by conventional methods. (#8587)
  Consume generic aspnetcore rpm installers
  Insert NuGet Build 4.6.0-rtm-4918 into cli
  Adding roslyn to automatic dependency flow through maestro.
  Fixing update dependency by using the new APIs. We broke this when we updated the version of VersionTools.
  MSBuild 15.6.81
  Update SDK to 2.1.300-preview1-62608-07
  MSBuild 15.6.80

 Conflicts:
	build/DependencyVersions.props
	test/Microsoft.DotNet.ShellShim.Tests/ShellShimMakerTests.cs
2018-02-15 11:57:36 -08:00
Livar
34da66fa78
Merge pull request #8612 from dotnet/merges/release/2.1.2xx-to-release/2.1.3xx
Merge release/2.1.2xx to release/2.1.3xx
2018-02-15 10:05: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
Pranav K
aff5165360
Merge pull request #8614 from dotnet/prkrishn/update-versions
Update Sdk versions
2018-02-14 14:33:28 -08:00
Pranav K
9bf75f06fb Update Sdk versions 2018-02-14 13:42:47 -08:00
Nate McMaster
62ce305f06 Update to aspnetcore 2.1.0-preview1-28275 and react to feed layout changes (#8611) 2018-02-14 11:50:14 -08:00
Livar
73963e8018
Merge pull request #8608 from dotnet/merges/release/2.1.2xx-to-release/2.1.3xx
Merge release/2.1.2xx to release/2.1.3xx
2018-02-14 10:08:15 -08:00
Livar
0b7f66c291
Merge pull request #8607 from dotnet/merges/release/2.1.1xx-to-release/2.1.2xx
Merge release/2.1.1xx to release/2.1.2xx
2018-02-14 09:56:28 -08:00
John Beisner
e6cdfeb833
"ExternalRestoreSources" needs to be set in the docker container (#8602)
* Add "PB_RESTORESOURCE" to docker environmental variables.

* Add "PB_RestoreSource" explictly to the 'SandBox' build.sh call.

* Add "ExternalRestoreSources" explictly to the 'SandBox' build.sh call.

* Using an environmental variable to communicate to the docker container.
2018-02-14 08:04:45 -08:00
Livar
6d50f8c58e
Merge pull request #8601 from livarcocc/sign_all_assemblies
Signing nupkg contents (Cli.Utils and MSBuildResolver)
2018-02-13 16:21:15 -08:00
Livar
243a26e519
Merge pull request #8598 from dotnet/merges/release/2.1.2xx-to-release/2.1.3xx
Merge release/2.1.2xx to release/2.1.3xx
2018-02-13 15:34:10 -08:00
Livar
44229ea013
Merge branch 'release/2.1.3xx' into merges/release/2.1.2xx-to-release/2.1.3xx 2018-02-13 13:51:17 -08:00
Livar
ced1f50b54
Merge pull request #8597 from dotnet/merges/release/2.1.1xx-to-release/2.1.2xx
Merge release/2.1.1xx to release/2.1.2xx
2018-02-13 13:49:57 -08:00
Livar Cunha
423c407ec4 Signing nupkg contents (Cli.Utils and MSBuildResolver) along with the rest of the compiled assemblies. 2018-02-13 13:46:31 -08:00
Nick Guerrera
8265c551de
Merge pull request #8595 from nguerrera/update-roslyn-2.1.1xx
Update to roslyn 2.7.0-beta3-62612-07 for 2.1.1xx
2018-02-13 10:56:05 -08:00
Nick Guerrera
bc1fb44364 Use satellites from roslyn package, not cli-deps-satellites 2018-02-12 16:52:26 -08:00
Nick Guerrera
8fcbb631c9 Update to roslyn 2.7.0-beta3-62612-07 for 2.1.1xx 2018-02-12 15:56:07 -08:00
William Lee
2a493c1318
Support TildeSlash expand (#8589) 2018-02-12 14:59:43 -08:00
Livar
be8e1eddfa
Merge pull request #8591 from dotnet/merges/release/2.1.1xx-to-release/2.1.2xx
Merge release/2.1.1xx to release/2.1.2xx
2018-02-12 09:42:58 -08:00
Livar
0468da6ada
Merge pull request #8575 from rainersigwald/msbuild-15.6.81
MSBuild 15.6.81
2018-02-12 09:41:24 -08:00
Livar
04dc2d19ca
Merge pull request #8580 from dotnet/nuget.client.release-4918-1-1
Insert NuGet Build 4.6.0-rtm-4918 into cli
2018-02-10 16:32:36 -08:00
Livar
72d9c0f23f
Merge pull request #8588 from danmosemsft/port8579.to.2.1preview
Port Kernel Version telemetry to preview1
2018-02-10 16:31:50 -08:00
Livar
3d9df22766
Merge pull request #8582 from dotnet/johluo/generic-rpms
Consume generic aspnetcore rpm installers
2018-02-10 16:26:49 -08:00
danmosemsft
aa90d8efd2 Port Kernel Version telemetry to preview1 2018-02-09 17:20:50 -08:00
John Beisner
82f9d6e530
Do not create a directory with a trailing space; it cannot be deleted by conventional methods. (#8587) 2018-02-09 17:17:36 -08:00
=
932248f0d7 Consume generic aspnetcore rpm installers 2018-02-09 16:21:26 -08:00
Livar
fbc76ea5f6
Merge pull request #8416 from yanchenw/master
Adds Microsoft.Docker.Sdk to CLI
2018-02-09 14:02:08 -08:00
Livar
442881fe58
Merge pull request #8578 from livarcocc/port_update_dependencies_change
Port update dependencies change
2018-02-09 11:44:28 -08:00
NuGet Team Bot
6003685b86 Insert NuGet Build 4.6.0-rtm-4918 into cli 2018-02-09 10:52:38 -08:00
Livar Cunha
43b84cf1e2 Adding roslyn to automatic dependency flow through maestro. 2018-02-09 10:32:12 -08:00
Livar Cunha
978957315b Fixing update dependency by using the new APIs. We broke this when we updated the version of VersionTools. 2018-02-09 10:31:53 -08:00
Rainer Sigwald
eecb8f63a5 MSBuild 15.6.81 2018-02-09 09:43:55 -06:00
Nick Guerrera
c1834366ea
Merge pull request #8526 from v-zbsail/loc_20180129_master
LOC CHECKIN | cli master | 20180202
2018-02-08 16:52:22 -08:00
Livar
adfc2037db
Merge branch 'master' into master 2018-02-08 16:39:20 -08:00
Nick Guerrera
6677d8f0b6 Merge branch 'master' into loc_20180129_master 2018-02-08 15:48:10 -08:00
Nick Guerrera
a82d52183f Fix unit test with hard-coded English message expectation 2018-02-08 15:24:40 -08:00
Livar
60614db20c
Merge pull request #8571 from dotnet/update_sdk
Update SDK to 2.1.300-preview1-62608-06
2018-02-08 13:17:11 -08:00
Livar
6ef587dbc0
Merge pull request #8570 from dotnet/sign_whitelist
Adding a baseline with files to be excluded from sign check.
2018-02-08 13:13:46 -08:00
Livar
5a5a245658
Merge pull request #8568 from livarcocc/merge_release_213xx
Merge release/2.1.3xx into master
2018-02-08 12:42:23 -08:00
Livar
73dbe8f45e Update SDK to 2.1.300-preview1-62608-07 2018-02-08 12:36:34 -08:00
Livar Cunha
0dc22a3b41 Revert back to the dev feed for asp.net in master and move the asp.net core version up. 2018-02-08 11:29:57 -08:00
Livar Cunha
b9e6906cc2 Adding a baseline with files to be excluded from sign check. 2018-02-08 10:13:22 -08:00
Livar
dd7664e74f
Merge pull request #8565 from AndyGerlicher/MSBuild15.6.80
MSBuild 15.6.80
2018-02-08 10:10:31 -08:00
Livar Cunha
f752dd7fc7 Merge branch 'release/2.1.3xx' into merge_release_213xx
* release/2.1.3xx: (51 commits)
  Removing all references to a static 'aspnetpatch' Nuget.Config (#8556)
  Updating the MSI Installation Note message. Also had to shift components around slightly to make it fit.
  Fixing recent CLI test failures around ASP.NETcore in the orchestrated build (#8553)
  The BuildTasksFeedTool version and the VersionTools version should be in sync to prevent incompatabilities between these two packages.
  Update to aspnetcore 2.1.0-preview1-28228
  Adding the VBCSCompiler to the list of signed files due to crossgen.
  Ensure ASP.NET Core is included in macos .pkg installer and update to 2.1.0-preview1-28226
  Remove obsolete F# satellite package
  MSBuild 15.6.76
  Update F# to match dev15.6 preview 4
  Excluding shared framework assemblies from the Roslyn folder in the SDK.
  Insert NuGet Build 4.6.0-rtm-4880 into cli
  Updating Roslyn to 2.7.0-beta3-62529-05.
  Update fsharp compiler to match preview 4
  Insert NuGet Build 4.6.0-rtm-4862 into cli
  MSBuild 15.6.70
  Insert NuGet Build 4.6.0-rtm-4859 into cli
  MSBuild 15.6.69
  Update package reference
  update fsharp compiler to match vs2017.6 preview 3
  ...

 Conflicts:
	build/DependencyVersions.props
2018-02-08 09:50:59 -08:00
Livar
8d8e196fc0
Merge pull request #8560 from livarcocc/merge_release_211xx
Merge release/2.1.1xx into release/2.1.3xx
2018-02-07 21:06:33 -08:00
Livar
b0122c8122
Merge pull request #8515 from dotnet-bot/master-UpdateDependencies
Update CoreSetup, CoreSetup, CoreSetup, Roslyn to preview2-26131-06, preview2-26131-06, preview2-26131-06, beta1-62608-01, respectively (master)
2018-02-07 20:53:00 -08:00
Andy Gerlicher
e0d138e0df MSBuild 15.6.80 2018-02-07 19:24:28 -08:00