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
8fe964e05c
Merge pull request #8627 from dotnet/merges/release/2.1.1xx-to-release/2.1.2xx 
Merge release/2.1.1xx to release/2.1.2xx
 2018-02-16 09:14:04 -08:00
jagarg
c618b6fcbb Updating TestPlatform to 15.6 RTM 2018-02-16 18:44:31 +05:30
Peter Huene
a08229178d Merged PR 106752: Merge release/2.1.1xx to release/2.1.1xx-MSRC 2018-02-15 21:36:38 +00:00
Peter Huene
f359a1f842
Merge branch 'release/2.1.1xx' release/2.1.1xx-MSRC 
* release/2.1.1xx:
  Updating Roslyn to 2.7.0-beta3-62615-05
  Update FSharp Compiler
  Fix README.md for 2.1.1xx (#8600)
  MSBuild 15.6.82
  Update fsharp
 2018-02-15 13:32:16 -08:00
Livar
83a9e76bdd
Merge pull request #8619 from dotnet/merges/release/2.1.1xx-to-release/2.1.2xx 
Merge release/2.1.1xx to release/2.1.2xx
 2018-02-15 13:14:57 -08:00
Livar
bc014c390e
Merge pull request #8624 from livarcocc/update_branch_info 
Updating the branch info of 2.1.2xx.
 2018-02-15 13:10:39 -08:00
Livar
4604466afb
Merge pull request #8620 from KevinRansom/UpdateFSharpCompiler 
Update FSharp Compiler
 2018-02-15 13:09:38 -08:00
Livar
635e74944a
Updating links to point to 2.1.2xx builds 2018-02-15 11:51:37 -08:00
Livar Cunha
3e9346cd7b Updating the branch info of 2.1.2xx. 2018-02-15 11:37:29 -08:00
Livar
58ae49cb90
Merge branch 'release/2.1.1xx' into UpdateFSharpCompiler 2018-02-15 11:21:20 -08:00
Livar
1db8e4c62a
Merge pull request #8623 from dotnet/update_roslyn 
Updating Roslyn to 2.7.0-beta3-62615-05
 2018-02-15 11:04:53 -08:00
Livar
f2d6d36cc6
Updating Roslyn to 2.7.0-beta3-62615-05 2018-02-15 10:16:20 -08:00
Kevin Ransom
020c57923c Update FSharp Compiler 2018-02-14 16:52:45 -08:00
Livar
4695e3bc30
Merge pull request #8594 from KevinRansom/UpdateFSharp 
Update fsharp
 2018-02-14 16:14:45 -08:00
Livar
cfc6b3d0a1
Merge pull request #8616 from AndyGerlicher/MSBuild15.6.82 
MSBuild 15.6.82
 2018-02-14 16:14:25 -08:00
Nick Guerrera
dbce65da30
Fix README.md for 2.1.1xx (#8600) 
It was still pointing to 15.5 downloads
 2018-02-14 15:28:49 -08:00
Livar
99fc344435
Merge branch 'release/2.1.1xx' into UpdateFSharp 2018-02-14 15:20:45 -08:00
Andy Gerlicher
bbd1b50a17 MSBuild 15.6.82 2018-02-14 15:09:12 -08:00
Peter Huene
ce62d3db19 Merged PR 106551: Merge release/2.1-MSRC to release/2.1.1xx-MSRC 2018-02-14 20:58:57 +00:00
Peter Huene
7cf46327ee
Merge branch 'release/2.1-MSRC' into release/2.1.1xx-MSRC 
* release/2.1-MSRC:
  Updating runtime to 2.0.6.
  Update AspNetCore version
  Build trigger commit.
  Update to consume aspnetcore 2.0.6-10008 notimestamp build
  Update to consume aspnetcore 2.0.6-10008 timestamp build
 2018-02-14 11:54:48 -08:00
Peter Huene
94316e269e Merged PR 106425: Update the branding of the CLI to 2.1.101 
Update the branding of the CLI to 2.1.101
 2018-02-14 18:07:30 +00:00
Peter Huene
83f53da055 Merged PR 106480: Updating runtime to 2.0.6. 
Updating runtime to 2.0.6.
 2018-02-14 18:07:18 +00:00
Livar
0b7f66c291
Merge pull request #8607 from dotnet/merges/release/2.1.1xx-to-release/2.1.2xx 
Merge release/2.1.1xx to release/2.1.2xx
 2018-02-14 09:56:28 -08:00
Peter Huene
32eeb5ddd5
Updating runtime to 2.0.6. 2018-02-13 18:54:35 -08:00
Pranav Krishnamoorthy
7b43526c6c Merged PR 106465: Update AspNetCore version 
Update AspNetCore version
 2018-02-14 02:01:30 +00:00
Pranav K
3547a1227c Update AspNetCore version 2018-02-13 17:54:33 -08:00
Peter Huene
c8c08433a7
Update the branding of the CLI to 2.1.101 2018-02-13 16:19:35 -08:00
Peter Huene
0370ac2681 Merged PR 106422: Merge release/2.1-MSRC to release/2.1.1xx-MSRC 
This also merges release/2.1.1xx to release/2.1.1xx-MSRC (no conflicts)
 2018-02-14 00:10:45 +00:00
Peter Huene
118e5e56b5
Merge branch 'release/2.1-MSRC' into release/2.1.1xx-MSRC 
* release/2.1-MSRC:
  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/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-02-13 16:00:27 -08:00
Peter Huene
a2b679e1d2
Merge branch 'release/2.1.1xx' into release/2.1.1xx-MSRC 
* release/2.1.1xx: (25 commits)
  Use satellites from roslyn package, not cli-deps-satellites
  Update to roslyn 2.7.0-beta3-62612-07 for 2.1.1xx
  Insert NuGet Build 4.6.0-rtm-4918 into cli
  Adding roslyn to automatic dependency flow through maestro.
  Fixing update dependency by using the new APIs. We broke this when we updated the version of VersionTools.
  MSBuild 15.6.81
  MSBuild 15.6.80
  Adding the VBCSCompiler to the list of signed files due to crossgen.
  Remove obsolete F# satellite package
  MSBuild 15.6.76
  Update F# to match dev15.6 preview 4
  Excluding shared framework assemblies from the Roslyn folder in the SDK.
  Insert NuGet Build 4.6.0-rtm-4880 into cli
  Updating Roslyn to 2.7.0-beta3-62529-05.
  Update fsharp compiler to match preview 4
  Insert NuGet Build 4.6.0-rtm-4862 into cli
  MSBuild 15.6.70
  Insert NuGet Build 4.6.0-rtm-4859 into cli
  MSBuild 15.6.69
  Update package reference
  ...
 2018-02-13 15:43:11 -08:00
Peter Huene
2f46bd7edd
Merge branch 'release/2.1' into release/2.1-MSRC 
* release/2.1:
  Updating the templates version to 1.0.0-beta3-20171117-314. We had it at an older version by mistake.
 2018-02-13 15:23:32 -08:00
Livar
ced1f50b54
Merge pull request #8597 from dotnet/merges/release/2.1.1xx-to-release/2.1.2xx 
Merge release/2.1.1xx to release/2.1.2xx
 2018-02-13 13:49:57 -08:00
Nick Guerrera
8265c551de
Merge pull request #8595 from nguerrera/update-roslyn-2.1.1xx 
Update to roslyn 2.7.0-beta3-62612-07 for 2.1.1xx
 2018-02-13 10:56:05 -08:00
Nick Guerrera
bc1fb44364 Use satellites from roslyn package, not cli-deps-satellites 2018-02-12 16:52:26 -08:00
Nick Guerrera
8fcbb631c9 Update to roslyn 2.7.0-beta3-62612-07 for 2.1.1xx 2018-02-12 15:56:07 -08:00
Kevin Ransom
2f9d8f8f9c Update fsharp 2018-02-12 11:38:37 -08:00
Livar
be8e1eddfa
Merge pull request #8591 from dotnet/merges/release/2.1.1xx-to-release/2.1.2xx 
Merge release/2.1.1xx to release/2.1.2xx
 2018-02-12 09:42:58 -08:00
Livar
0468da6ada
Merge pull request #8575 from rainersigwald/msbuild-15.6.81 
MSBuild 15.6.81
 2018-02-12 09:41:24 -08:00
Livar
04dc2d19ca
Merge pull request #8580 from dotnet/nuget.client.release-4918-1-1 
Insert NuGet Build 4.6.0-rtm-4918 into cli
 2018-02-10 16:32:36 -08:00
Livar
442881fe58
Merge pull request #8578 from livarcocc/port_update_dependencies_change 
Port update dependencies change
 2018-02-09 11:44:28 -08:00
NuGet Team Bot
6003685b86 Insert NuGet Build 4.6.0-rtm-4918 into cli 2018-02-09 10:52:38 -08:00
Livar Cunha
43b84cf1e2 Adding roslyn to automatic dependency flow through maestro. 2018-02-09 10:32:12 -08:00
Livar Cunha
978957315b Fixing update dependency by using the new APIs. We broke this when we updated the version of VersionTools. 2018-02-09 10:31:53 -08:00
Rainer Sigwald
eecb8f63a5 MSBuild 15.6.81 2018-02-09 09:43:55 -06:00
Livar
dd7664e74f
Merge pull request #8565 from AndyGerlicher/MSBuild15.6.80 
MSBuild 15.6.80
 2018-02-08 10:10:31 -08:00
Andy Gerlicher
e0d138e0df MSBuild 15.6.80 2018-02-07 19:24:28 -08:00
Livar
fb75d6a28d
Merge pull request #8542 from livarcocc/add_vbcscompiler_for_signing 
Adding the VBCSCompiler to the list of signed files due to crossgen.
 2018-02-05 14:58:54 -08:00
Livar Cunha
5ea7f68d59 Adding the VBCSCompiler to the list of signed files due to crossgen. 2018-02-05 14:26:08 -08:00
Nick Guerrera
cdf3901658
Merge pull request #8498 from livarcocc/update_roslyn 
Updating Roslyn to 2.7.0-beta3-62529-05.
 2018-02-05 10:28:30 -08:00
Livar
5b081a2ba2
Merge pull request #8508 from dotnet/nuget.client.release-4880-1-1 
Insert NuGet Build 4.6.0-rtm-4880 into cli
 2018-02-05 10:17:41 -08:00