Commit graph

8521 commits

Author SHA1 Message Date
Livar
6023fa4506
Merge branch 'release/2.1.3xx' into merges/release/2.1.2xx-to-release/2.1.3xx 2018-02-16 09:31:09 -08:00
Livar
8fe964e05c
Merge pull request #8627 from dotnet/merges/release/2.1.1xx-to-release/2.1.2xx
Merge release/2.1.1xx to release/2.1.2xx
2018-02-16 09:14:04 -08:00
Matt Mitchell
1aa9c3da62 Correct download location for nuget package archive (#8631) 2018-02-16 08:57:06 -08:00
jagarg
c618b6fcbb Updating TestPlatform to 15.6 RTM 2018-02-16 18:44:31 +05:30
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
f6065dcc62
Merge pull request #8609 from dotnet/merges/release/2.1.3xx-to-master
Merge release/2.1.3xx to master
2018-02-15 13:39:27 -08:00
Peter Huene
a08229178d Merged PR 106752: Merge release/2.1.1xx to release/2.1.1xx-MSRC 2018-02-15 21:36:38 +00:00
Peter Huene
f359a1f842
Merge branch 'release/2.1.1xx' release/2.1.1xx-MSRC
* release/2.1.1xx:
  Updating Roslyn to 2.7.0-beta3-62615-05
  Update FSharp Compiler
  Fix README.md for 2.1.1xx (#8600)
  MSBuild 15.6.82
  Update fsharp
2018-02-15 13:32:16 -08:00
Livar
83a9e76bdd
Merge pull request #8619 from dotnet/merges/release/2.1.1xx-to-release/2.1.2xx
Merge release/2.1.1xx to release/2.1.2xx
2018-02-15 13:14:57 -08:00
Livar
bc014c390e
Merge pull request #8624 from livarcocc/update_branch_info
Updating the branch info of 2.1.2xx.
2018-02-15 13:10:39 -08:00
Livar
4604466afb
Merge pull request #8620 from KevinRansom/UpdateFSharpCompiler
Update FSharp Compiler
2018-02-15 13:09:38 -08:00
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
635e74944a
Updating links to point to 2.1.2xx builds 2018-02-15 11:51:37 -08:00
Livar Cunha
3e9346cd7b Updating the branch info of 2.1.2xx. 2018-02-15 11:37:29 -08:00
Livar
58ae49cb90
Merge branch 'release/2.1.1xx' into UpdateFSharpCompiler 2018-02-15 11:21:20 -08:00
Livar
1db8e4c62a
Merge pull request #8623 from dotnet/update_roslyn
Updating Roslyn to 2.7.0-beta3-62615-05
2018-02-15 11:04:53 -08:00
Livar
f2d6d36cc6
Updating Roslyn to 2.7.0-beta3-62615-05 2018-02-15 10:16:20 -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
Kevin Ransom
020c57923c Update FSharp Compiler 2018-02-14 16:52:45 -08:00
Livar
4695e3bc30
Merge pull request #8594 from KevinRansom/UpdateFSharp
Update fsharp
2018-02-14 16:14:45 -08:00
Livar
cfc6b3d0a1
Merge pull request #8616 from AndyGerlicher/MSBuild15.6.82
MSBuild 15.6.82
2018-02-14 16:14:25 -08:00
Nick Guerrera
dbce65da30
Fix README.md for 2.1.1xx (#8600)
It was still pointing to 15.5 downloads
2018-02-14 15:28:49 -08:00
Livar
99fc344435
Merge branch 'release/2.1.1xx' into UpdateFSharp 2018-02-14 15:20:45 -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
Andy Gerlicher
bbd1b50a17 MSBuild 15.6.82 2018-02-14 15:09:12 -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
Peter Huene
ce62d3db19 Merged PR 106551: Merge release/2.1-MSRC to release/2.1.1xx-MSRC 2018-02-14 20:58:57 +00:00
Peter Huene
7cf46327ee
Merge branch 'release/2.1-MSRC' into release/2.1.1xx-MSRC
* release/2.1-MSRC:
  Updating runtime to 2.0.6.
  Update AspNetCore version
  Build trigger commit.
  Update to consume aspnetcore 2.0.6-10008 notimestamp build
  Update to consume aspnetcore 2.0.6-10008 timestamp build
2018-02-14 11:54:48 -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
Peter Huene
94316e269e Merged PR 106425: Update the branding of the CLI to 2.1.101
Update the branding of the CLI to 2.1.101
2018-02-14 18:07:30 +00:00
Peter Huene
83f53da055 Merged PR 106480: Updating runtime to 2.0.6.
Updating runtime to 2.0.6.
2018-02-14 18:07:18 +00: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
Peter Huene
32eeb5ddd5
Updating runtime to 2.0.6. 2018-02-13 18:54:35 -08:00
Pranav Krishnamoorthy
7b43526c6c Merged PR 106465: Update AspNetCore version
Update AspNetCore version
2018-02-14 02:01:30 +00:00
Pranav K
3547a1227c Update AspNetCore version 2018-02-13 17:54:33 -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
Peter Huene
c8c08433a7
Update the branding of the CLI to 2.1.101 2018-02-13 16:19:35 -08:00
Peter Huene
0370ac2681 Merged PR 106422: Merge release/2.1-MSRC to release/2.1.1xx-MSRC
This also merges release/2.1.1xx to release/2.1.1xx-MSRC (no conflicts)
2018-02-14 00:10:45 +00:00
Peter Huene
118e5e56b5
Merge branch 'release/2.1-MSRC' into release/2.1.1xx-MSRC
* release/2.1-MSRC:
  Updating the templates version to 1.0.0-beta3-20171117-314. We had it at an older version by mistake.
  Making a document only commit to trigger another build of the CLI.
  Add 2.0.5 ASP.NET store to native installers.
  Update to consume aspnetcore 2.0.6-10007
  Fix Windows servicing builds.
  Updating the SDK dependency to 15.5.0-preview-62518-04 to fix the signing issue
  Update runtime and branding to 2.0.6.

* Conflicts:
  build/Branding.props
  build/Version.props
  packaging/osx/clisdk/resources/cs.lproj/conclusion.html
  packaging/osx/clisdk/resources/de.lproj/conclusion.html
  packaging/osx/clisdk/resources/en.lproj/conclusion.html
  packaging/osx/clisdk/resources/es.lproj/conclusion.html
  packaging/osx/clisdk/resources/fr.lproj/conclusion.html
  packaging/osx/clisdk/resources/it.lproj/conclusion.html
  packaging/osx/clisdk/resources/ja.lproj/conclusion.html
  packaging/osx/clisdk/resources/ko.lproj/conclusion.html
  packaging/osx/clisdk/resources/pl.lproj/conclusion.html
  packaging/osx/clisdk/resources/pt-br.lproj/conclusion.html
  packaging/osx/clisdk/resources/ru.lproj/conclusion.html
  packaging/osx/clisdk/resources/tr.lproj/conclusion.html
  packaging/osx/clisdk/resources/zh-hans.lproj/conclusion.html
  packaging/osx/clisdk/resources/zh-hant.lproj/conclusion.html
  packaging/windows/clisdk/bundle.wxl
2018-02-13 16:00:27 -08:00
Peter Huene
a2b679e1d2
Merge branch 'release/2.1.1xx' into release/2.1.1xx-MSRC
* release/2.1.1xx: (25 commits)
  Use satellites from roslyn package, not cli-deps-satellites
  Update to roslyn 2.7.0-beta3-62612-07 for 2.1.1xx
  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
  MSBuild 15.6.80
  Adding the VBCSCompiler to the list of signed files due to crossgen.
  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
  ...
2018-02-13 15:43:11 -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
Peter Huene
2f46bd7edd
Merge branch 'release/2.1' into release/2.1-MSRC
* release/2.1:
  Updating the templates version to 1.0.0-beta3-20171117-314. We had it at an older version by mistake.
2018-02-13 15:23:32 -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