mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
7627 commits 41 branches 190 tags 95 MiB
Commit graph

7627 commits

This branch
This branch
All branches
Author SHA1 Message Date
Livar
e2c3f7e3d4
Updating the SDK to 2.1.200-preview-62716-06. 2018-03-16 13:32:07 -07:00
Livar
eeca22fc71
Updating the SDK to 2.1.200-preview-62716-04 2018-03-15 21:23:22 -07:00
Livar
b0acac94b8
Update SDK to 2.1.200-preview-62715-08 2018-03-15 17:08:38 -07:00
Livar
06ce7628d3
Merge pull request #8786 from livarcocc/merge_release_211xx_into_release_212xx 
Merge release/2.1.1xx into release/2.1.2xx
 2018-03-13 21:01:00 -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
7d338430b3
Merge pull request #8784 from livarcocc/update_branding_to_102 
Updating the branding of the CLI to 2.1.102.
 2018-03-13 20:15:54 -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
Livar Cunha
80978d689b Updating the branding of the CLI to 2.1.102. 2018-03-13 18:05:41 -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
Peter Huene
b724d8be12
Remove cli-deps from sources. 
This commit removes cli-deps from sources.
 2018-03-13 16:59: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
1f18611189
Merge pull request #8772 from dotnet/nuget.client.release-4982-1-1 
Insert NuGet Build 4.7.0-preview1.4982 into cli
 2018-03-13 16:30:23 -07:00
Peter Huene
075bf14db6
Merge branch 'release/2.1.1xx-MSRC' into release/2.1.1xx 
* release/2.1.1xx-MSRC: (21 commits)
  Update to consume aspnetcore 2.0.6-10011
  Update SDK to 2.1.100-preview-62617-01
  Updating Roslyn to 2.7.0-beta3-62615-05
  Update FSharp Compiler
  Fix README.md for 2.1.1xx (#8600)
  MSBuild 15.6.82
  Updating runtime to 2.0.6.
  Update AspNetCore version
  Update the branding of the CLI to 2.1.101
  Update fsharp
  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.
  ...
 2018-03-13 15:01:01 -07:00
Rohit Agrawal (NUGET)
c311381ab3 add nuget-build myget feed as source 2018-03-13 12:37:07 -07:00
NuGet Team Bot
90eed38b2d Insert NuGet Build 4.7.0-preview1.4982 into cli 2018-03-12 15:48:04 -07:00
Livar
97a2cd9630
Merge pull request #8706 from mlorbetske/dev/mlorbe/Update20TestTemplatesFor157 
Update 2.0 test templates for the 15.7 test SDK
 2018-03-02 15:38:43 -08:00
Mike Lorbetske
d05a751e59 Update 2.0 test templates for the 15.7 test SDK 2018-02-28 14:43:18 -08:00
Mike Lorbetske
78efe50e65 Update to the 15.6 RTM version of the test SDK in templates 2018-02-27 12:41:58 -08:00
Livar
6b2d44ba5f
Merge pull request #8684 from abhishkk/testPlatformInsertion 
TestPlatform 15.7 preview insertion
 2018-02-26 10:44:45 -08:00
abhishk
6ea849b7ef TestPlatform 15.7 preview insertion 2018-02-26 11:36:25 +05:30
Livar
a627f5c524
Merge pull request #8659 from dotnet/vramak/websdk_Update_2212018_212xx 
Update the WebSdk Version to 2.0.0-rel-20180221-676
 2018-02-24 15:50:24 -08:00
Nick Guerrera
28e937e788
Merge pull request #8661 from dotnet/merges/release/2.1.1xx-to-release/2.1.2xx 
Merge release/2.1.1xx to release/2.1.2xx
 2018-02-23 10:18:50 -08:00
Nick Guerrera
b9e74c6520
Merge pull request #8660 from nguerrera/trigger-build 
Trigger build with unambiguous commit height
 2018-02-21 18:04:22 -08:00
Nick Guerrera
da1505ddd6
Update branding to 2.1.200 (#8658) 2018-02-21 16:53:23 -08:00
vramak
60651922bb Update the WebSdk Version to 2.0.0-rel-20180221-676 2018-02-21 14:16:54 -08:00
Nick Guerrera
fa9ecf5483 (empty commit) 2018-02-21 14:10:20 -08:00
Nick Guerrera
bc712af451 (empty commit) 2018-02-21 14:10:18 -08:00
Nick Guerrera
0d8fbccb98 (empty commit) 2018-02-21 14:10:15 -08:00
Nick Guerrera
8e9be230c0 (empty commit) 2018-02-21 14:10:10 -08:00
Nick Guerrera
b2d02701c6 (empty commit) 2018-02-21 14:10:07 -08:00
Nick Guerrera
f1c16b69c9 (empty commit) 2018-02-21 14:10:06 -08:00
Nick Guerrera
9602002483 (empty commit) 2018-02-21 14:10:05 -08:00
Nick Guerrera
3dfe29fe7a (empty commit) 2018-02-21 14:10:04 -08:00
Nick Guerrera
c2c673a114 (empty commit) 2018-02-21 14:10:02 -08:00
Nick Guerrera
ba3e79f8ac (empty commit) 2018-02-21 14:09:57 -08:00
Nick Guerrera
cba84e1781 (empty commit) 2018-02-21 14:09:52 -08:00
Peter Huene
6c22303bf0 Merged PR 107360: Update to consume aspnetcore 2.0.6-10011 
Update to consume aspnetcore 2.0.6-10011
 2018-02-21 00:54:49 +00:00
John Luo
9c6da08d66
Update to consume aspnetcore 2.0.6-10011 2018-02-20 16:53:38 -08:00
Nick Guerrera
618650adec
Merge pull request #8641 from dotnet/merges/release/2.1.1xx-to-release/2.1.2xx 
Merge release/2.1.1xx to release/2.1.2xx
 2018-02-20 16:06:43 -08:00
Livar Cunha
2445b0f28d Merged PR 107092: Merge release/2.1.1xx to release/2.1.1xx-MSRC 2018-02-17 05:59:33 +00:00
Livar Cunha
955005602e Merge branch 'release/2.1.1xx' into merge_release_211xx_into_release_211xx_msrc 
* release/2.1.1xx:
  Update SDK to 2.1.100-preview-62617-01
 2018-02-16 21:58:04 -08:00
Livar
08d21683d6
Merge pull request #8638 from dotnet/update_sdk 
Update SDK to 2.1.100-preview-62617-01
 2018-02-16 21:55:18 -08:00
Livar
51469d6253
Update SDK to 2.1.100-preview-62617-01 2018-02-16 21:13:41 -08:00
Livar
cbdaf6bb8d
Merge pull request #8634 from dotnet/nuget.client.release-4927-1-3 
Insert NuGet Build 4.7.0-preview1-4927 into cli
 2018-02-16 20:40:38 -08:00
NuGet Team Bot
29ce191177 Insert NuGet Build 4.7.0-preview1-4927 into cli 2018-02-16 14:13:05 -08:00