Commit graph

2100 commits

Author SHA1 Message Date
Livar
d0aca6fb7b
Updating SDK to 2.1.200-preview-62805-05 2018-04-05 09:43:20 -07:00
Livar Cunha
2e2a8d6179 Merge branch 'release/2.1.1xx' into merge_1xx_into_2xx
* release/2.1.1xx:
  Fixing another typo in that is breaking RHEL.
  Fix a typo in the rpm.targets when testing the rpm generated packages.
  Update to aspnet 2.0.7 build 230
  Producing an empty commit to trigger a rebuild of the CLI
  Fix AspNetCoreRuntimeBuildDropFeed to use CoreSetupBlobRootUrl
  Adding a work around for publishing self-contained apps to RIDs that are not available for Microsoft.NETCore.App 2.0.0.
  Reverse the order in which old runtime stores are listed
  Update to ASP.NET Core 2.0.7 build 228
  Moving the opensuse 43.2 docker file to the right folder.
  Updating the CLI branding to 2.1.105, to go over the 104 release we will have to do for NuGet. Also, fixed the branding of the runtime in our installers to 2.0.7.
  Updating the runtime to 2.0.7 and the CLI branding to 2.1.104.
  Update SDK to 2.1.100-preview-62730-07
  Add msbuild myget.org feed
  MSBuild 15.6.84

 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-04-05 09:40:35 -07:00
Livar
4c948fefcc
Merge branch 'master' into merges/release/2.1.3xx-to-master 2018-04-05 09:09:45 -07:00
Livar Cunha
364ee996bf Fixing another typo in that is breaking RHEL. 2018-04-04 22:43:37 -07:00
Livar Cunha
d26719d8de Modifying branding.props to no longer have the version there manually updated. With this last change, updating the CLI version should require changes only in the Version.props file. 2018-04-04 21:21:10 -07:00
Livar Cunha
b09b6bff26 Generating the conclusion.html files dynamically so that we don't need to set the version in them everytime our branding changes. 2018-04-04 20:57:45 -07:00
Nick Guerrera
2d3b35f2f4
Merge pull request #8993 from nguerrera/fix-build-warning
Fix build warning about duplicate msbuild import
2018-04-04 15:37:47 -07:00
Nick Guerrera
b6174af511 Implement dotnet publish --no-build 2018-04-04 15:03:29 -07:00
dotnet-maestro-bot
69c380765c Update clicommandlineparser, climigrate, coresetup, coresetup, coresetup, fsharp, msbuild, nugetclient, roslyn, sdk, templating, templating, templating, websdk to alpha-62803-03, alpha-62803-04, preview2-26403-06, preview2-26403-06, preview2-26403-06, rtm-180403-0, preview-000144, preview4.5065, beta4-62803-03, preview2-62803-07, beta3-20180403-1549505, beta3-20180403-1549505, beta3-20180403-1549505, preview2-20180403-1549509, respectively 2018-04-04 21:31:25 +00:00
Livar Cunha
9fb0f9a35b Fix a typo in the rpm.targets when testing the rpm generated packages. 2018-04-04 13:14:13 -07:00
Nick Guerrera
1fc07e5748 Fix build warning about duplicate msbuild import 2018-04-04 13:02:30 -07:00
dotnet-maestro-bot
ffc1d286a1 Update Roslyn to beta4-62804-05 2018-04-04 19:47:16 +00:00
Livar Cunha
f496a9bb18 Updating windows msi code to use variables for the SDK and Runtime brandings. 2018-04-04 10:37:38 -07:00
Livar
334ac4f4f3
Merge branch 'release/2.1.3xx' into release/2.1.3xx-UpdateDependencies 2018-04-04 10:18:12 -07:00
Livar
a7bfaacf99
Merge branch 'master' into merges/release/2.1.3xx-to-master 2018-04-04 10:16:22 -07:00
Livar
721c068376
Merge branch 'release/2.1.2xx' into merges/release/2.1.1xx-to-release/2.1.2xx 2018-04-04 10:15:45 -07:00
Mayank Bansal
674f64c4c7 Insert Testplatform 15.7 RTM package in dotnet SDK 2018-04-04 14:08:12 +05:30
dotnet-maestro-bot
bcbfd02312 Update CoreSetup, CoreSetup, CoreSetup, Roslyn to preview3-26404-01, preview3-26404-01, preview3-26404-01, beta4-62802-07, respectively 2018-04-04 05:31:27 +00:00
Nate McMaster
21529f350d
Update to aspnet 2.0.7 build 230 2018-04-03 17:21:31 -07:00
Livar
3f05bb71ab
Updating SDK to 2.1.200-preview-62803-04
This contains a matching NuGet version to the one in the CLI.
2018-04-02 21:51:23 -07:00
William Li
e70f07178a
Apphost shim (#8893)
* Publish app host to folder under SDK

* Use carried apphost as shim

* Remove full framework launcher

* Fix test run command issue

* Use latest release/2.1 build

* Test with 32 bit env

* Add missing return

* Update to latest prodcon build

* Add xlfs
2018-04-02 12:37:25 -07:00
Livar
beea8c2e9b Fix AspNetCoreRuntimeBuildDropFeed to use CoreSetupBlobRootUrl
CoreSetupBlobRootUrl determines from which blob storage the CLI consumes bits. That's the right URL to use for consuming asp.net bits as well.
2018-04-02 11:09:22 -07:00
NuGet Team Bot
15c631b022 Insert NuGet Build 4.7.0-preview3.5059 into cli 2018-04-02 10:36:26 -07:00
Livar
12acb315d9
Merge pull request #8951 from natemcmaster/aspnet-2.0.7
Update to ASP.NET Core 2.0.7 build 228
2018-04-02 10:32:24 -07:00
Livar Cunha
c9059f20be Updated SDK version to 2.1.300-preview2-62731-04. 2018-03-31 21:08:32 -07:00
dotnet-maestro-bot
ea773d6321 Update clicommandlineparser, climigrate, coresetup, coresetup, coresetup, fsharp, msbuild, roslyn, sdk, templating, templating, templating, websdk to alpha-62730-03, alpha-62730-04, preview2-26330-03, preview2-26330-03, preview2-26330-03, rtm-180330-0, preview-000143, beta4-62730-07, preview2-62730-09, beta3-20180330-1538568, beta3-20180330-1538568, beta3-20180330-1538568, preview2-20180330-1538569, respectively 2018-03-31 18:45:57 +00:00
Nate McMaster
c20f79e8e3
Reverse the order in which old runtime stores are listed 2018-03-30 17:51:08 -07:00
Nate McMaster
c5f3e09520
Update to ASP.NET Core 2.0.7 build 228
- Remove unused myget feeds
- Refactor how we keep track of all previous versions of the runtime store
2018-03-30 15:36:48 -07:00
Daniel Plaisted
42e45e13a7 Update Microsoft.NET.Sdk package 2018-03-30 14:38:39 -07:00
Livar Cunha
caff97a3ee Updating the CLI branding to 2.1.105, to go over the 104 release we will have to do for NuGet. Also, fixed the branding of the runtime in our installers to 2.0.7. 2018-03-30 13:17:14 -07:00
Livar Cunha
5b8949e66b Updating the runtime to 2.0.7 and the CLI branding to 2.1.104. 2018-03-30 13:17:14 -07:00
Livar
48ec687460
Merge pull request #8953 from dotnet/update_sdk_1xx
Update SDK to 2.1.100-preview-62730-07
2018-03-30 13:03:16 -07:00
Daniel Plaisted
8b1b153651 Add latest patch versions to BundledVersions.props, and tests to make sure that they are up to date 2018-03-30 11:32:36 -07:00
Livar
fdcc478420
Merge pull request #8948 from AndyGerlicher/MSBuild15.6.84
MSBuild 15.6.84
2018-03-30 10:41:19 -07:00
Livar
27435ea589
Update SDK to 2.1.100-preview-62730-07
Contains a matching NuGet version to the one in the CLI.
2018-03-30 10:21:43 -07:00
Andy Gerlicher
d3a78f7d3f Add msbuild myget.org feed 2018-03-30 09:10:10 -07:00
Andy Gerlicher
b84a0eb8b2 MSBuild 15.6.84 2018-03-29 23:11:58 -07:00
Livar Cunha
9ba1de58de Revert the runtime to 2.0.6 because we need to service the SDK with a new NuGet. 2018-03-29 22:29:46 -07:00
Livar
820ea7c54f
Updating SDK to 2.1.200-preview-62730-02
This brings back an SDK with a matching version of NuGet.
2018-03-29 21:59:27 -07:00
Livar Cunha
1e42b63860 Updating the branding of the CLI to 2.1.104. 2018-03-29 21:33:27 -07:00
Livar
a0bb417c9f
Merge pull request #8926 from dotnet/nuget.client.release-5055-1-1
Insert NuGet Build 4.6.2-rtm-5055 into cli
2018-03-29 21:19:50 -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 Cunha
c4f42d3e6c Adding a step to shutdown the vbcscompiler after test execution. 2018-03-29 11:52:16 -07:00
NuGet Team Bot
c271df6f6a Insert NuGet Build 4.6.2-rtm-5055 into cli 2018-03-28 22:41:18 -07:00
NuGet Team Bot
32ac8d897b Insert NuGet Build 4.7.0-preview3.5052 into cli 2018-03-28 22:39:07 -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
f72e6926ca
Merge pull request #8897 from dotnet/merges/release/2.1.3xx-to-master
Merge release/2.1.3xx to master
2018-03-28 10:11:24 -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
56a01638e1 MSBuild 15.7.127.34537 2018-03-27 18:38:03 -05:00
Rainer Sigwald
80eb07bb0d MSBuild 15.7.127.34537 2018-03-27 18:36:20 -05:00