mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions
dotnet-installer/packaging/windows/clisdk
History
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
..
bundle.thm Windows installer refresh 2017-06-16 12:47:11 -07:00
bundle.wxl Merge branch 'release/2.1.1xx' into merge_release_211xx_into_release_212xx 2018-03-13 20:23:33 -07:00
bundle.wxs Installer Success Reporting for Windows 2017-07-07 12:56:21 -07:00
dotnet.wxs Updating the native installers to use a fully qualified path to dotnet.dll and execute it with dotnet exec, so that the first run experience to populate the offline cache will trigger for the SDK being installed, instead of for the latest one in the box. 2017-07-26 23:10:48 -07:00
dummyeula.rtf Add dummy eula for Windows installer 2017-06-22 09:03:35 -07:00
generatebundle.ps1 Add dummy eula for Windows installer 2017-06-22 09:03:35 -07:00
generatemsi.ps1 Add dummy eula for Windows installer 2017-06-22 09:03:35 -07:00
generatenupkg.ps1 .NET Core 2+ Naming and Versioning 2017-05-26 15:46:56 -07:00
provider.wxs fix reg key in cli msi 2016-06-10 16:37:09 -07:00
registrykeys.wxs Update installer monikers. 2017-02-06 13:08:44 -06:00
variables.wxi Use WixQuietExec to run command sliently 2017-04-27 10:55:39 -07:00
VS.Redist.Common.Net.Core.SDK.MSBuildExtensions.nuspec Package bundled version props in to a VS insertion nupkg 2017-03-24 11:11:31 -07:00
VS.Redist.Common.Net.Core.SDK.x64.nuspec Package bundled version props in to a VS insertion nupkg 2017-03-24 11:11:31 -07:00
VS.Redist.Common.Net.Core.SDK.x86.nuspec Package bundled version props in to a VS insertion nupkg 2017-03-24 11:11:31 -07:00