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

7455 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
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
Livar
133277037e
Merge pull request #8520 from AndyGerlicher/MSBuild15.6.76 
MSBuild 15.6.76
 2018-02-05 10:17:16 -08:00
Nick Guerrera
d4dedc616c
Merge branch 'release/2.1.1xx' into update_roslyn 2018-02-02 14:06:05 -08:00
Nick Guerrera
fef1e5c7a9
Merge pull request #8517 from KevinRansom/updateFSharp 
Update F# to match dev15.6 preview 4
 2018-02-02 10:55:34 -08:00
Nick Guerrera
ad1292bac2 Remove obsolete F# satellite package 2018-02-02 02:44:14 +01:00
Andy Gerlicher
617aa3725c MSBuild 15.6.76 2018-02-01 14:57:27 -08:00
Kevin Ransom
077b613d7e Update F# to match dev15.6 preview 4 2018-01-31 16:26:57 -08:00
Livar Cunha
3bf4751a8d Excluding shared framework assemblies from the Roslyn folder in the SDK. 2018-01-30 15:33:08 -08:00
NuGet Team Bot
dc6ae8beae Insert NuGet Build 4.6.0-rtm-4880 into cli 2018-01-30 15:18:26 -08:00
Livar Cunha
6fd727b646 Updating Roslyn to 2.7.0-beta3-62529-05. 2018-01-29 14:16:51 -08:00
Livar
0055785280
Merge pull request #8476 from dotnet/nuget.client.release-4862-1-1 
Insert NuGet Build 4.6.0-rtm-4862 into cli
 2018-01-26 14:55:55 -08:00
Peter Huene
f3b111d2c2
Build trigger commit. 
This is an empty commit to trigger the build.
 2018-01-26 14:09:31 -08:00
Livar
9a06806f78
Merge pull request #8481 from KevinRansom/updatefsharppreview4 
Update fsharp compiler to match preview 4
 2018-01-26 07:51:24 -08:00
Kevin Ransom
e6c8fa6cdd Update fsharp compiler to match preview 4 2018-01-25 18:13:02 -08:00
Livar
92636d514c
Merge pull request #8475 from AndyGerlicher/MSBuild15.6.70 
MSBuild 15.6.70
 2018-01-25 15:03:05 -08:00
John Luo
0bb52d0baa Merged PR 103472: Update to consume aspnetcore 2.0.6-10008 notimestamp build 
Revert to using notimstamp builds
 2018-01-25 22:53:14 +00:00
John Luo
264f9a8d3f Update to consume aspnetcore 2.0.6-10008 notimestamp build 2018-01-25 14:45:17 -08:00
John Luo
79d34827bf Merged PR 103434: Update to consume aspnetcore 2.0.6-10008 timestamp build 
This takes our latest build. I've also updated this PR to use our timestamp packages instead of non-timestamp because this is not the final build. I'm not sure if we have done this before but I'd like to make sure this mechanism works as well.
 2018-01-25 21:23:38 +00:00
NuGet Team Bot
ef6e049f27 Insert NuGet Build 4.6.0-rtm-4862 into cli 2018-01-25 13:17:38 -08:00
John Luo
88f10b47ee Update to consume aspnetcore 2.0.6-10008 timestamp build 2018-01-25 13:01:48 -08:00
Andy Gerlicher
46f55c34c6 MSBuild 15.6.70 2018-01-25 12:57:10 -08:00
Livar
04433c5141
Merge pull request #8470 from dotnet/nuget-insertbuild4859 
Insert NuGet Build 4.6.0-rtm-4859 into cli
 2018-01-25 12:42:27 -08:00
Peter Huene
f3ef1bffe9 Merged PR 103410: Merge release/2.1 to release/2.1-MSRC 2018-01-25 19:55:42 +00:00