Commit graph

8917 commits

Author SHA1 Message Date
William Li
56c10f65c7
Merge pull request #9012 from dotnet/merges/release/2.1.3xx-to-master
Merge release/2.1.3xx to master
2018-04-06 13:39:37 -07:00
William Li
cbd6434c8b Adapt to no config file Apphost shim
Instead of writing the config file. Embed the relative path, instead of only the file name of app binary, to the AppHost itself.
2018-04-06 12:23:05 -07:00
dotnet-maestro-bot
936cc73ef2 Update CoreSetup, CoreSetup, CoreSetup, Roslyn to preview3-26406-06, preview3-26406-06, preview3-26406-06, beta4-62806-08, respectively 2018-04-06 17:53:37 +00:00
Kevin Ransom
8fa1c8230b Align dotnetcli with VS2017.4 compiler 2018-04-06 10:52:34 -07:00
Livar
900e11cbee
Revert links on Readme to master 2018-04-06 09:15:50 -07:00
Livar
2b2d9c2355
Merge pull request #8987 from livarcocc/disable_msbuild_node_reuse
Disabling msbuild node reuse for unix.
2018-04-06 09:07:05 -07:00
Livar
b9f50a0c76
Merge pull request #8896 from sdmaclea/PR-ARM64-CI-Official
[Arm64] Enable arm64 cli builds
2018-04-06 09:06:45 -07:00
Livar
7cb7535bae
Merge branch 'master' into merges/release/2.1.3xx-to-master 2018-04-06 09:05:57 -07:00
Eric Erhardt
a6cf823b9c
Merge pull request #9000 from dotnet-maestro-bot/master-UpdateDependencies
Update CoreSetup, CoreSetup, CoreSetup, Roslyn to preview3-26405-02, preview3-26405-02, preview3-26405-02, beta4-62805-01, respectively (master)
2018-04-06 09:18:59 -05:00
Nick Guerrera
4956bfea8c
Merge pull request #8996 from nguerrera/publish-no-build
Implement `dotnet publish --no-build`
2018-04-05 23:43:02 -07:00
Nick Guerrera
60e798598d Add test cases per PR feedback 2018-04-05 17:58:38 -07:00
Nick Guerrera
42e0afff1d Tweak --no-build messages based on PR feedback 2018-04-05 16:07:52 -07:00
Livar
d8eed7963e
Merge branch 'master' into master-UpdateDependencies 2018-04-05 15:32:36 -07:00
Livar
6179a01514
Merge pull request #9006 from dotnet/update_sdk
Updating SDK to 2.1.200-preview-62805-05
2018-04-05 15:30:46 -07:00
Livar
94a69a95b8
Merge pull request #8933 from dotnet/merges/release/2.1.3xx-to-master
Merge release/2.1.3xx to master
2018-04-05 13:27:53 -07:00
Livar
c43ea1458e
Merge pull request #9005 from livarcocc/merge_1xx_into_2xx
Merge release/2.1.1xx into release/2.1.2xx
2018-04-05 13:26:10 -07:00
Livar
c3a1fecd99
Merge pull request #9001 from livarcocc/automatic_build_numbers_installers
Automatic build numbers flow into installers
2018-04-05 10:50:33 -07:00
dotnet-maestro-bot
921c3849e2 Update CoreSetup, CoreSetup, CoreSetup, Roslyn to preview3-26405-02, preview3-26405-02, preview3-26405-02, beta4-62805-01, respectively 2018-04-05 17:40:43 +00:00
Livar Cunha
9706863629 Disabling msbuild node reuse for CLI full build. 2018-04-05 10:16:26 -07:00
Livar
822ae6d43a
Merge pull request #8995 from dotnet-maestro-bot/release/2.1.3xx-UpdateDependencies
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 (release/2.1.3xx)
2018-04-05 09:44:06 -07:00
Livar
e545b4c7a6
Merge pull request #8991 from mayankbansal018/testPlatformRTM
Insert Testplatform 15.7 RTM
2018-04-05 09:43:51 -07:00
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
3962910e5f
Merge pull request #8949 from dotnet/merges/release/2.1.1xx-to-release/2.1.2xx
Merge release/2.1.1xx to release/2.1.2xx
2018-04-05 09:14:06 -07:00
Livar
4c948fefcc
Merge branch 'master' into merges/release/2.1.3xx-to-master 2018-04-05 09:09:45 -07:00
Livar
fe590c614c
Merge pull request #9002 from livarcocc/fix_rhel_typo_2
Fixing another typo that is breaking RHEL.
2018-04-05 08:58:37 -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
Steve MacLean
ed35c638fb [Arm64] Enable arm64 cli builds 2018-04-04 17:47:58 -04:00
Livar
1e2e8138b9
Merge pull request #8992 from dotnet-maestro-bot/master-UpdateDependencies
Update Roslyn to beta4-62804-05 (master)
2018-04-04 14:46:11 -07:00
Livar
58792f58b6
Merge pull request #8994 from livarcocc/fix_typo
Fix a typo in the rpm.targets when testing the rpm generated packages.
2018-04-04 14:33:01 -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
Livar
b5c1631730
Merge pull request #8960 from dotnet-maestro-bot/release/2.1.3xx-UpdateDependencies
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 (release/2.1.3xx)
2018-04-04 12:58:21 -07:00
dotnet-maestro-bot
ffc1d286a1 Update Roslyn to beta4-62804-05 2018-04-04 19:47:16 +00:00
Peter Huene
5e8c807411
Merge pull request #8980 from peterhuene/tool-path-validation
Fix validation of tool-path option for tool list and uninstall commands.
2018-04-04 11:52:01 -07:00
Eric Erhardt
ed98e005e8
Merge pull request #8901 from dotnet-maestro-bot/master-UpdateDependencies
Update CoreSetup, CoreSetup, CoreSetup, Roslyn to preview3-26404-01, preview3-26404-01, preview3-26404-01, beta4-62802-07, respectively (master)
2018-04-04 13:42:49 -05: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
Livar
3ce82497ef
Merge pull request #8988 from natemcmaster/aspnet-207-230
Update to aspnet 2.0.7 build 230
2018-04-04 09:04:43 -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
Peter Huene
cee27d3970
Merge pull request #8886 from peterhuene/first-run-tool-path
Fix failure to add tools path on restricted Windows environments.
2018-04-03 21:14:30 -07:00
Nate McMaster
21529f350d
Update to aspnet 2.0.7 build 230 2018-04-03 17:21:31 -07:00