Commit graph

886 commits

Author SHA1 Message Date
Daniel Plaisted
42e45e13a7 Update Microsoft.NET.Sdk package 2018-03-30 14:38:39 -07:00
Matt Mitchell
19267bd9f1 Remove unused Dia package
Extend CLI dependency updating
Extend CLI's dependency updating to include all repos.  At this time, only ASPNet won't work with this, as in prodcon it isn't specifying a branch in the manifest, which means no Latest_Packages.txt gets set.  Once this is fixed all upstream repos in CLI should be handled.
This will be combined with changes to the versions repo to update the subscriptions for 2.1.3xx CLI.
2018-03-29 15:58:33 -07:00
Livar
6c3a714b5d
Merge pull request #8852 from dotnet/merges/release/2.1.2xx-to-release/2.1.3xx
Merge release/2.1.2xx to release/2.1.3xx
2018-03-28 10:26:17 -07:00
Livar
ae08395451
Merge branch 'release/2.1.3xx' into merges/release/2.1.2xx-to-release/2.1.3xx 2018-03-27 16:45:20 -07:00
Rainer Sigwald
80eb07bb0d MSBuild 15.7.127.34537 2018-03-27 18:36:20 -05:00
Pranav K
52b2e4c733
Update AspNetCore version to 2.1.0-preview2-30475 2018-03-27 09:28:10 -07:00
Livar
b5a163c7c1
Merge pull request #8884 from rainersigwald/AndyGerlicher-MSBuild-15.7.108
MSBuild 15.7.124 for 2.1.3xx
2018-03-25 19:14:20 -07:00
NuGet Team Bot
fbacb9cd4b Insert NuGet Build 4.7.0-preview3.5039 into cli 2018-03-24 21:33:53 -07:00
Andy Gerlicher
78c3211cc6 MSBuild 15.7.124-preview 2018-03-24 21:19:34 -07:00
Andy Gerlicher
cd646d2dbc MSBuild 15.7.122-preview 2018-03-24 18:51:49 -05:00
Brice Lambson
efa717daaa Bundle dotnet-ef 2018-03-23 13:18:07 -07:00
Livar
52c73a1e26
Updating the runtime to 2.1.0-preview2-26314-02 2018-03-22 17:16:55 -07:00
Peter Huene
4c516bc299
Merge 'release/2.1.2xx' into release/2.1.3xx
* upstream/release/2.1.2xx: (31 commits)
  Update SDK to 2.1.100-preview-62721-01
  Updating the branding of the CLI to 2.1.103.
  Updating NuGet to 4.6.1-rtm-5019
  Update SDK to 2.1.200-preview-62717-01
  Updating the SDK to 2.1.200-preview-62716-06.
  Updating the SDK to 2.1.200-preview-62716-04
  Update SDK to 2.1.200-preview-62715-08
  Updating Roslyn to 2.8.0-beta2-62713-11
  Updating the SDK version to 2.1.100-preview-62714-01
  Updating the branding of the CLI to 2.1.102.
  Remove cli-deps from sources.
  Update Roslyn to 2.7.0-beta3-62707-11
  add nuget-build myget feed as source
  Insert NuGet Build 4.7.0-preview1.4982 into cli
  Update to the 15.6 RTM version of the test SDK in templates
  Update to consume aspnetcore 2.0.6-10011
  Updating TestPlatform to 15.6 RTM
  Updating runtime to 2.0.6.
  Update AspNetCore version
  Update the branding of the CLI to 2.1.101
  ...
2018-03-22 13:01:24 -07:00
Livar
bca991fddb
Update SDK to 2.1.200-preview-62717-01 2018-03-16 17:57:25 -07:00
Livar
e2c3f7e3d4
Updating the SDK to 2.1.200-preview-62716-06. 2018-03-16 13:32:07 -07:00
Livar
005f87257a
Merge pull request #8810 from dotnet/prkrishn/update-versions
Update AspNetCore package versions to 2.1.0-preview2-30338
2018-03-16 10:41:15 -07:00
Livar
eeca22fc71
Updating the SDK to 2.1.200-preview-62716-04 2018-03-15 21:23:22 -07:00
Nick Guerrera
fb093499f0
Update dotnet/sdk to latest
Includes fast ResolvePackageAssets
2018-03-15 18:37:39 -07:00
William Lee
3d13658f97 Update SDK to2.1.300-preview2-62715-07 (#8808) 2018-03-15 18:36:48 -07:00
Livar
b0acac94b8
Update SDK to 2.1.200-preview-62715-08 2018-03-15 17:08:38 -07:00
Pranav K
d5894edefa
Update AspNetCore package versions to 2.1.0-preview2-30338 2018-03-15 16:20:14 -07:00
Livar
680e72993b
Merge pull request #8795 from natemcmaster/aspnetcore-alpine
Upgrade to aspnetcore 2.1.0-preview2-30331 and pull aspnetcore for Alpine Linux
2018-03-15 14:23:20 -07:00
John Beisner
2a63f9e76c
Merge pull request #8788 from dotnet/merges/release/2.1.3xx-to-master
Merge release/2.1.3xx to master
2018-03-15 13:15:51 -07:00
Nate McMaster
c257087ca6 Upgrade to aspnetcore 2.1.0-preview2-30331 and pull aspnetcore for Alpine Linux 2018-03-14 16:47:59 -07:00
Livar
8fd0e7317d
Updating Roslyn to 2.8.0-beta2-62713-11 2018-03-13 20:26:51 -07:00
Livar Cunha
b87e9521cd Merge branch 'release/2.1.1xx' into merge_release_211xx_into_release_212xx
* release/2.1.1xx: (21 commits)
  Updating the SDK version to 2.1.100-preview-62714-01
  Updating the branding of the CLI to 2.1.102.
  Remove cli-deps from sources.
  Update Roslyn to 2.7.0-beta3-62707-11
  Update to the 15.6 RTM version of the test SDK in templates
  Update to consume aspnetcore 2.0.6-10011
  Updating TestPlatform to 15.6 RTM
  Updating runtime to 2.0.6.
  Update AspNetCore version
  Update the branding of the CLI to 2.1.101
  Build trigger commit.
  Update to consume aspnetcore 2.0.6-10008 notimestamp build
  Update to consume aspnetcore 2.0.6-10008 timestamp build
  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/DependencyVersions.props
	build/NugetConfigFile.targets
	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-03-13 20:23:33 -07:00
Livar
8d409357db
Merge pull request #8785 from dotnet/update_sdk
Updating the SDK version to 2.1.100-preview-62714-01
2018-03-13 20:16:10 -07:00
Livar
a662fda7aa
Merge pull request #8783 from dotnet/update_roslyn
Update Roslyn to 2.7.0-beta3-62707-11
2018-03-13 18:10:10 -07:00
Livar
2e7d92be25
Updating the SDK version to 2.1.100-preview-62714-01 2018-03-13 18:09:31 -07:00
Peter Huene
8444cb04b5
Merge pull request #8781 from peterhuene/msrc-merge
Merge release/2.1.1xx-MSRC to release/2.1.1xx
2018-03-13 17:34:13 -07:00
Livar
b197f75b45
Update Roslyn to 2.7.0-beta3-62707-11 2018-03-13 16:42:22 -07:00
Livar
fa5b011266
Merge pull request #8693 from mlorbetske/dev/mlorbe/UpdateTestTemplatesFor156
Update to the 15.6 RTM version of the test SDK in templates
2018-03-13 16:31:35 -07:00
Livar
e606c10013
Merge pull request #8630 from jayaranigarg/tpv2rtm15.6
Branding changes for  TestPlatform 15.6 RTM
2018-03-13 16:31:08 -07:00
Livar
3ebe4e552b
Merge branch 'release/2.1.3xx' into merges/release/2.1.2xx-to-release/2.1.3xx 2018-03-13 12:33:39 -07:00
dotnet-bot
70f2b13256 Update CoreSetup, CoreSetup, CoreSetup, Roslyn to preview2-26313-01, preview2-26313-01, preview2-26313-01, beta2-62713-01, respectively 2018-03-13 05:39:24 +00:00
NuGet Team Bot
90eed38b2d Insert NuGet Build 4.7.0-preview1.4982 into cli 2018-03-12 15:48:04 -07:00
dotnet-bot
6ec1bb93ab Update CoreSetup, CoreSetup, CoreSetup, Roslyn to preview2-26311-02, preview2-26311-02, preview2-26311-02, beta2-62711-03, respectively 2018-03-11 18:06:08 +00:00
Nate McMaster
ab4aa487e2
Update to aspnetcore 2.1.0-preview2-30281 2018-03-09 10:05:56 -08:00
dotnet-bot
23e8e34bb2 Update CoreSetup, CoreSetup, CoreSetup, Roslyn to preview2-26309-01, preview2-26309-01, preview2-26309-01, beta2-62708-11, respectively 2018-03-09 07:07:20 +00:00
Livar
f29118002c
Merge pull request #8730 from AndyGerlicher/MSBuild.15.6.66
MSBuild 15.7.66
2018-03-08 10:50:17 -08:00
dotnet bot
af526542a2 Update CoreSetup, CoreSetup, CoreSetup, Roslyn to preview2-26308-01, preview2-26308-01, preview2-26308-01, beta2-62708-04, respectively (#8742) 2018-03-08 09:18:05 -08:00
dotnet bot
2e7c5f123a Update CoreSetup to preview2-26306-04 (master) (#8731) 2018-03-07 19:23:05 -08:00
Pranav K
1d38617765
Update AspNetCore and WebSdk versions 2018-03-06 14:25:44 -08:00
Andy Gerlicher
9178360c54 MSBuild 15.7.66 2018-03-06 10:05:22 -08:00
Eric Erhardt
3d1caf1d63
Revert Roslyn update
In order to isolate the changes to find the break.
2018-03-06 09:23:25 -06:00
dotnet-bot
a4eaae7155 Update CoreSetup, CoreSetup, CoreSetup, Roslyn to preview2-26306-03, preview2-26306-03, preview2-26306-03, beta1-62628-07, respectively 2018-03-06 10:11:12 +00:00
Livar
7a733ffd0e
Merge pull request #8708 from mlorbetske/dev/mlorbe/Update21TestTemplatesTo157
Update 2.1 test templates to use the 15.7 preview 1 test SDK
2018-03-05 11:39:35 -08:00
Livar
68922e2a51
Merge pull request #8657 from dotnet/vramak/WebSdk_Update_2212018
Updating the WebSdk version to 2.1.300-preview2-20180221-1406058
2018-03-02 15:39:19 -08:00
Livar
b84eb1081b
Merge pull request #8702 from dotnet/johluo/update-dotnet-archive
Update Microsoft.DotNet.Archive version
2018-03-01 15:02:50 -08:00
Livar
28223a0caf
Merge pull request #8701 from dotnet/livarcocc-patch-1
Update SDK to 2.1.300-preview2-62628-06
2018-02-28 20:40:33 -08:00