Commit graph

1780 commits

Author SHA1 Message Date
Livar
b64df31abc
Merge pull request #8665 from natemcmaster/bundle-aspnet-tools
Bundle dotnet-sql-cache and dotnet-user-secrets in the CLI
2018-02-27 10:47:09 -08:00
Livar Cunha
abec8bb31e Updating the version of ASP.NET 2018-02-23 15:00:25 -08:00
Livar Cunha
53dcff597c Adding a version property with the CLI version and a private preview property to BundledVersions. 2018-02-23 15:00:03 -08:00
Nick Guerrera
594630f29a
Merge pull request #8662 from dotnet/merges/release/2.1.3xx-to-master
Merge release/2.1.3xx to master
2018-02-23 14:56:02 -08:00
Nate McMaster
d38362835d Bundle dotnet-sql-cache and dotnet-user-secrets in the CLI 2018-02-22 12:07:54 -08:00
Pranav K
d5169549fc
Also update Microsoft.AspNetCore.App 2018-02-22 10:03:32 -08:00
Pranav K
c210f7c360 Update Razor Sdk version to 2.1.0-preview2-30169 2018-02-22 07:10:45 -08:00
Nick Guerrera
47ded461b6
Merge branch 'master' into merges/release/2.1.3xx-to-master 2018-02-21 15:58:55 -08:00
Nick Guerrera
b8df89a54f
Sign the MSBuildSdkResolver dll in standard nupkg (#8648)
We were only signing the copy in the msbuild extensions layout for the
VS insertion package, but not the x-plat nupkg we produced for VS Code.
2018-02-21 08:08:16 -08:00
John Beisner
9ef22b0f4f
Tag non-shipping nupkg as 'NonShipping=true' in the manifest. (#8647)
* Tag non-shipping nupkg as 'NonShipping=true' in the manifest.

* Simplifying the NuPkg publish.

* Fixing a typo...

* Changes per code review...
2018-02-20 18:48:01 -08:00
Nick Guerrera
481a8146e2
Merge branch 'release/2.1.3xx' into merges/release/2.1.2xx-to-release/2.1.3xx 2018-02-20 16:10:04 -08:00
Nick Guerrera
7ba0ded366
Merge branch 'master' into merges/release/2.1.3xx-to-master 2018-02-20 16:04:32 -08:00
Pranav K
1e9f85d35a Update versions of Web and Razor Sdk 2018-02-16 18:06:47 -08:00
NuGet Team Bot
29ce191177 Insert NuGet Build 4.7.0-preview1-4927 into cli 2018-02-16 14:13:05 -08:00
William Lee
08f050c012
bundled DotnetTool (#8606)
Extract packages to DotnetTools folder under sdk/{version}

Add new resolver to discover it

Add test to enforce package structure. It will fail when the structure
changed
2018-02-16 13:32:29 -08:00
Livar
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
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 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 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
f2d6d36cc6
Updating Roslyn to 2.7.0-beta3-62615-05 2018-02-15 10:16:20 -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
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
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
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
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 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
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
Kevin Ransom
2f9d8f8f9c Update fsharp 2018-02-12 11:38:37 -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
=
932248f0d7 Consume generic aspnetcore rpm installers 2018-02-09 16:21:26 -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
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
Livar
adfc2037db
Merge branch 'master' into master 2018-02-08 16:39:20 -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
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