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

7513 commits

This branch
This branch
All branches
Author SHA1 Message Date
Livar
44d0188781
Merge pull request #8947 from dotnet/update_sdk_2xx 
Updating SDK to 2.1.200-preview-62730-02
 2018-03-29 23:22:05 -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
cf9e4e3b15
Merge pull request #8925 from dotnet/nuget.client.release-5052-1-1 
Insert NuGet Build 4.7.0-preview3.5052 into cli
 2018-03-29 17:47:14 -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
5f15f0a786
Merge pull request #8915 from rainersigwald/MSBuild-15.7.127-2xx 
MSBuild 15.7.127.34537 for 2.1.2xx
 2018-03-28 10:12:08 -07:00
Rainer Sigwald
56a01638e1 MSBuild 15.7.127.34537 2018-03-27 18:38:03 -05:00
Livar
8111911a27
Merge pull request #8904 from mlorbetske/dev/mlorbe/UpdateTestSdkFor20TemplatesFor157 
Update test SDK for 2.0 templates in the 15.7 SDK
 2018-03-26 15:21:53 -07:00
Mike Lorbetske
b783795dc9 Update test SDK for 2.0 templates in the 15.7 SDK 2018-03-26 14:37:55 -07:00
Livar
23abbd4afe
Merge pull request #8899 from dotnet/update_sdk_2xx 
Update SDK to 2.1.200-preview-62726-02
 2018-03-26 10:55:13 -07:00
Livar
3e0cee922d
Update SDK to 2.1.200-preview-62726-02 2018-03-26 09:34:40 -07:00
Livar
ce4d914eda
Merge pull request #8894 from rainersigwald/MSBuild-15.7.122-2.1.2xx 
MSBuild 15.7.124 for 2.1.2xx
 2018-03-25 19:15:26 -07:00
NuGet Team Bot
00c7557960 Insert NuGet Build 4.7.0-preview3.5039 into cli 2018-03-25 07:29:42 -05:00
Rainer Sigwald
29ac66f7d2 Keep stdout for test execution 
Work around https://github.com/Microsoft/vstest/issues/1503 by using the
MSBuild escape hatch variable MSBUILDENSURESTDOUTFORTASKPROCESSES and
ensuring that tests don't run in a disconnected MSBuild process by
passing /nr:false.
 2018-03-25 07:28:42 -05:00
Andy Gerlicher
5e6765093a MSBuild 15.7.124-preview 2018-03-25 07:28:29 -05:00
Livar
c3b9a9559d
Merge pull request #8885 from dotnet/update_roslyn_2xx 
Update Roslyn to 2.8.0-beta3-62722-05
 2018-03-23 18:56:45 -07:00
Livar
c27084b484
Merge pull request #8887 from dotnet/nuget.client.release-5039-1-1 
Insert NuGet Build 4.7.0-preview3.5039 into cli
 2018-03-23 15:42:26 -07:00
NuGet Team Bot
e49fab7143 Insert NuGet Build 4.7.0-preview3.5039 into cli 2018-03-23 14:17:25 -07:00
Livar Cunha
0d22280e08 Update msbuild to 15.7.0-preview-000122 2018-03-23 12:25:16 -07:00
Livar
fdac4bcbb9
Update Roslyn to 2.8.0-beta3-62722-05 2018-03-23 12:16:12 -07:00
Livar Cunha
39f08229a3 Updating InteropServices.Runtime to 4.3.0 in CLI utils and adding an explicit reference to netstandard 2.0 to TestFramework. 2018-03-22 20:00:34 -07:00
Jeff Kluge
8d7009cb83 Move some projects to netstandard2.0 (#8692) 
* Move some projects to netstandard2.0

* Use version agnostic $(TargetFrameworkIdentifier) property to make changing versions easier since we only care about .NET Framework vs .NET Standard
* Add missing project to solution file
* Update TestPackageProjects.targets to use netstandard2.0 on non-Windows
 2018-03-22 16:11:51 -07:00
Andy Gerlicher
c4cae059a9 MSBuild 15.7.108 
* Add feed to msbuild myget
* Update MSBuild to 15.7.108 (contains both netcoreapp2.0 and
netcoreapp2.1)
 2018-03-22 16:08:18 -07:00
Livar
e4689e7bf1
Merge pull request #8866 from mayankbansal018/updateTestplatformSDK2 
TestPlatform 15.7 preview 3 insertion
 2018-03-22 16:07:16 -07:00
John Beisner
03da2a4e19
Merge pull request #8864 from dotnet/merges/release/2.1.1xx-to-release/2.1.2xx 
Merge release/2.1.1xx to release/2.1.2xx
 2018-03-22 09:06:56 -07:00
John Beisner
7bb20759c0
Merge branch 'release/2.1.2xx' into merges/release/2.1.1xx-to-release/2.1.2xx 2018-03-22 08:32:38 -07:00
Mayank Bansal
bedf79f444 [WIP]TestPlatform 15.7 preview 3 insertion 2018-03-22 14:25:38 +05:30
John Beisner
29ca0e29e0
Merge pull request #8859 from dotnet/merges/release/2.1.1xx-to-release/2.1.2xx 
Merge release/2.1.1xx to release/2.1.2xx
 2018-03-21 10:58:50 -07:00
John Beisner
0f54f8b749
Merge branch 'release/2.1.2xx' into merges/release/2.1.1xx-to-release/2.1.2xx 2018-03-21 08:37:52 -07:00
Livar
60218cecb5
Merge pull request #8858 from dotnet/update_sdk 
Update SDK to 2.1.100-preview-62721-01
 2018-03-21 00:07:42 -07:00
Livar
9b0e592e30
Update SDK to 2.1.100-preview-62721-01 2018-03-20 23:33:21 -07:00
Livar
c91ab95952
Merge pull request #8853 from livarcocc/update_nuget 
Updating NuGet to 4.6.1-rtm-5019
 2018-03-20 15:56:43 -07:00
Livar Cunha
58703f72ae Updating the branding of the CLI to 2.1.103. 2018-03-20 14:29:43 -07:00
Livar Cunha
f557859feb Updating NuGet to 4.6.1-rtm-5019 2018-03-20 14:22:54 -07:00
Livar
892cb5248b
Merge pull request #8828 from dotnet/update_sdk 
Update SDK to 2.1.200-preview-62717-01
 2018-03-19 11:24:20 -07:00
Livar
bca991fddb
Update SDK to 2.1.200-preview-62717-01 2018-03-16 17:57:25 -07:00
Livar
512aefa43a
Merge pull request #8811 from dotnet/update_sdk 
Update SDK to 2.1.200-preview-62715-08
 2018-03-16 17:34:31 -07:00
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