Commit graph

234 commits

Author SHA1 Message Date
Daniel Plaisted
bfcc6fa2a0 Merge CLI 2.2.1xx changes 2018-10-08 18:59:34 -07:00
Daniel Plaisted
2ed37b3f49 Fix multiline powershell invocations 2018-09-26 13:15:34 -07:00
William Li
f3c7f5ed78 Merge remote-tracking branch 'oldcli/release/2.2.1xx' into merge-release/2.2.1xx 2018-09-09 20:42:17 -07:00
William Li
f5f4346310
Fix debian package tests clean up and set up (#9914)
Detect if package installed first and then uninstall
2018-08-30 10:16:28 -07:00
Daniel Plaisted
d97378c31b Bundle Wpf/WinForms shared framework in installer 2018-08-23 18:08:42 -07:00
Livar Cunha
057098046f Merge remote-tracking branch 'dotnet/release/2.1.5xx' into merges/release/2.1.5xx-to-release/2.2.1xx
* dotnet/release/2.1.5xx:
  MSBuild 15.9.8-preview
  MSBuild SDK Resolver Improvements (#9547)
  Remove fallback folder
  Remove redundent call, ensure no apt list
  Update links in the readme to release/2.1.5xx
  MSBuild 15.9.0-preview-000006
  Use prebuild image
  Revert "Disabled MSBuildTreatWarningsAsErrors"
  Disabled MSBuildTreatWarningsAsErrors
  Add back: "PUBLISH_NUPKG_TO_BLOB_FEED" to manage the no-suffix builds in 2.1
  Adding the 2.1.3 runtime blob feed as a feed for the CLI
  Update CLI branding to 2.1.402
  Updated test
  TestPlatform 15.9.0-preview Insertion
  Update CLI branding to 2.1.203.
  Fix warnings-as-errors in Linux packaging
  Don't let crossgen warnings become msbuild warnings-as-errors
  Fix build warning and treat msbuild warnings as errors

 Conflicts:
	README.md
	build/DependencyVersions.props
	build/package/Installer.DEB.proj
2018-08-22 20:39:52 -07:00
William Li
d2740ce0b6 Remove fallback folder 2018-08-15 14:58:17 -07:00
William Li
25509d31b1 Remove redundent call, ensure no apt list 2018-08-15 12:40:09 -07:00
Nick Guerrera
6242595613 Fix warnings-as-errors in Linux packaging 2018-08-06 17:55:06 -07:00
Nick Guerrera
29d3640768 Merge remote-tracking branch 'cli/release/2.2.1xx' into merge-cli/release/2.2.1xx-to-core-sdk/master 2018-07-27 14:47:38 -07:00
jbeisner
ba08432b35 Temporarily disable tests: 'GivenNewCommandItDisplaysCompletions', 'TestSdkRpm', and 'TestSdkDeb' 2018-07-26 21:48:10 +00:00
Nick Guerrera
c45905a1c9
Merge pull request #9695 from johnbeisner/FixRPMInstallErrors
Fix RPM install errors; CLI:release/2.2.1xx
2018-07-18 21:56:36 -07:00
jbeisner
2fc95c3efa Use "SharedFxRpmPackageFileVersion" for the SharedFxRpmPackageName 2018-07-18 22:52:57 +00:00
jbeisner
99f83a8053 Use the full version as the RPM package names for the runtime and ASP.NET runtime. 2018-07-18 22:02:00 +00:00
Nick Guerrera
ceffacfef8 Merge branch 'release/2.2.1xx' into merges/release/2.1.4xx-to-release/2.2.1xx 2018-07-17 18:17:04 -07:00
jbeisner
67abf5c634 'Warn and Continue' on the DEB removal errors. 2018-07-16 23:35:41 +00:00
jbeisner
d8735024f9 Use the full version as the DEB package names for the runtime and ASP.NET runtime. 2018-07-16 22:52:41 +00:00
jbeisner
782c4401d4 Back to "sudo dpkg -r" with ContinueOnError="WarnAndContinue" 2018-07-16 20:51:02 +00:00
jbeisner
f378070c25 Replace the "sudo dpkg -r” command with a more encompassing: “sudo apt-get purge -y”. 2018-07-16 19:52:12 +00:00
John Beisner
56d34499f4
Update ASP.NET version; Core-SDK (#30)
* Add an 'AllLinux' build and package CI leg.
* Update ASP.NET version.
* Remove the 'patch' number for the parameter: "sudo dpkg --ignore-depends=dotnet-runtime-X.X"
* Update variable name.
* Update coresetup, coresetup, coresetup, roslyn versions.
* Use "CONFIGURATION" not "BuildConfiguration"; "CONFIGURATION" has a "debug" default.
* 'AllLinux' CI legs and build only; no tests.
2018-07-12 16:20:39 -07:00
Daniel Plaisted
cf4a81a583 Temporarily disable creating Debian packages
https://github.com/dotnet/core-sdk/issues/27
2018-07-11 17:27:46 -07:00
Daniel Plaisted
b44a2bb723 Insert ASP.NET Core 3.0 2018-07-11 02:13:06 -07:00
William Li
0ef0b3296b
Add XSLT Transform for apphost (#9609)
To avoid sign check whitelist apphost.exe name changes very build. Sign check uses File Id in MSI as whitelist name. Template apphost.exe get a new "File Id" in msi different every time (since File Id is generated according to file path, and file path has version number). Use XSLT tranform to match the file path contains "AppHostTemplate\apphost.exe" and give it the same ID all the time.
2018-07-10 16:24:50 -07:00
jbeisner
692987b919 Disabling publishing for all 'MSBuildExtensions' artifacts. 2018-07-03 22:58:40 +00:00
Parallels
4d9b015f8f Fixing a merge issue and crossgen issues. 2018-06-26 14:44:55 -07:00
Livar Cunha
e2b679c4bb Merge branch 'master' of /Users/livarcocc/Documents/git/cli into merge_master_cli
* 'master' of /Users/livarcocc/Documents/git/cli: (1063 commits)
  Updating signing project to use new intermediate directory (int).
  Update runtimeconfig.json doc for 2.1 (#9382)
  Shortening the path to the intermediate folder by renaming it to int.
  fix typo (#9364)
  Updating asp.net to 2.2.0 as well.
  Updating the build and tests to work with the 2.2.0 runtime.
  Simplified combining dictionaries in Telemetry
  Fixing 'Channel' and 'BranchName': "release/2.1.4xx" to "master" (#9362)
  Fix extraction of folders (#9335)
  Update Sha256Hasher.cs
  Fix relative path tool path (#9330)
  Insert updated SDK from 2.1.4xx branch
  MSBuild 15.8.60
  Fix crash when user home directory cannot be determined.
  Make `CliFolderPathCalculator` a static class.
  Don't add the ReleaseSuffix to the branding on the CLI when DropSuffix is set to true.
  Add retry when Directory.Move (#9313)
  Override new SdkResult public properties
  Add reference to Microsoft.Build.NuGetSdkResolver
  Disable crossgen for MSBuild inline-task refs
  ...
2018-06-25 22:38:01 -07:00
Parallels
6b1b89a006 Using ~ versions for dependencies of deb packages, so that we do the right thing when comparing release/pre-release package versions. 2018-05-09 14:24:47 -07:00
Parallels
e9d0b154a4 Fixing deb native installer tests by installing packages using the package name instead of the file name. 2018-05-09 12:33:25 -07:00
Livar Cunha
e7cf325682 Using Major.Minor.Patch versions for rpm packages dependencies. 2018-05-09 11:52:26 -07:00
Parallels
a3879f8eb9 Updating the deb package of the SDK to specify a version range for the runtime and asp.net dependencies. 2018-05-08 18:42:57 -07:00
Parallels
4de0043f90 Updating the RPM dependency version of asp.net core to the full version, when it gets written to the metadata file. 2018-05-08 18:10:17 -07:00
Livar Cunha
e60d0a79e5 Making the CLI package name be only major.minor version and updating the version of the runtime packages that we depend on. 2018-05-08 18:10:17 -07:00
jbeisner
23f2d2782c Fixing typos... 2018-04-09 22:20:05 +00:00
Livar Cunha
b09b6bff26 Generating the conclusion.html files dynamically so that we don't need to set the version in them everytime our branding changes. 2018-04-04 20:57:45 -07:00
Livar Cunha
f496a9bb18 Updating windows msi code to use variables for the SDK and Runtime brandings. 2018-04-04 10:37:38 -07:00
John Beisner
2a63f9e76c
Merge pull request #8788 from dotnet/merges/release/2.1.3xx-to-master
Merge release/2.1.3xx to master
2018-03-15 13:15:51 -07:00
John Beisner
dbcd83075c
Creating and publishing 'symbols.nuget' to the blob feed. (#8712)
* Creating and publishing '*.symbols.nuget' to the blob feed.

* Reverting 'generatenupkg' methodology.

* Fixing formatting...

* Overwrite should = 'false'

* Second draft - Creating and publishing '*.symbols.nuget' to the blob feed.

* Fixing a VS auto-update.

* Removing the 'Microsoft.SymbolUploader.Build.Task' modifications; need to make a PR just for this.

* Change "sdk.*.Microsoft.DotNet.SDK.*.symbols.nupkg" to "runtime.*.Microsoft.DotNet.SDK.*.symbols.nupkg"; removing the 'DotNetRestore' on the Symbols.csproj

* Removing a 'todo' comment...

* Putting back the 'dotnet restore'

* Fixing a typo...

* Logical separation of the 'nupkg' from the 'symbols.nupkg' enumeration; fixed 'swr' pattern.

* Add "BLOBFEED_STORAGE_CONTAINER"
2018-03-13 08:19:15 -07:00
William Li
91fea0d7b4 ingest and publish rumtime agnostic package 2018-02-28 11:00:10 -08:00
Livar Cunha
8408322652 Merge branch 'release/2.1.1xx' into merge_release_211xx
* release/2.1.1xx: (45 commits)
  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
  update fsharp compiler to match vs2017.6 preview 3
  Insert NuGet Build 4.6.0-rtm-4825 into cli
  Fixing the prefercliruntime asset
  Updating the SDK dependency to 15.5.0-preview-62518-04 to fix the signing issue
  Updating the channel to release/2.1.1xx. We can manually update release/2.0 if necessary, but LTS is always updated every time we release.
  MSBuild 15.6.54
  Updates the TestPlatform to 15.6.0-preview-20180109-01
  ...

 Conflicts:
	build/BranchInfo.props
	build/Branding.props
	build/DependencyVersions.props
	build/NugetConfigFile.targets
	build/Version.props
	build/package/Installer.DEB.proj
	build/package/Installer.DEB.targets
	build/package/Installer.RPM.targets
	build_projects/dotnet-cli-build/dotnet-cli-build.csproj
	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
	scripts/obtain/dotnet-install.ps1
	scripts/obtain/dotnet-install.sh
	src/tool_fsharp/tool_fsc.csproj
	test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs
	test/Microsoft.DotNet.Cli.Utils.Tests/Microsoft.DotNet.Cli.Utils.Tests.csproj
2018-02-07 12:30:22 -08:00
Nate McMaster
bc486e787a Ensure ASP.NET Core is included in macos .pkg installer and update to 2.1.0-preview1-28226 2018-02-05 11:34:52 -08:00
Livar Cunha
65c88d8ea8 Disabling native installer tests whenever CLIBUILD_SKIP_TESTS is set to true. 2018-01-12 10:11:44 -08:00
Nate McMaster
781bffd59a Use RPM --install --nodeps to ignore aspnetcore-runtime's dependencies 2018-01-10 14:48:33 -08:00
Nate McMaster
3e05d2495a Update to aspnetcore 2.1.0-preview1-28042
- Update to 2.1.0-preview1-28042
 - Remove references to the aspnetcore-store package
 - Allow pulling aspnetcore from orchestrated build
2018-01-10 09:05:49 -08:00
Nate McMaster
811f3dcc27 Update TestSdkDeb targets to ignore coherence issues with dotnet-runtime 2018-01-09 15:36:23 -08:00
Nate McMaster
576405af5f Fix reference to renamed MSBuild variable 2018-01-09 14:57:49 -08:00
Nate McMaster
825fa19198 PR feedback and reorder dpkg arguments 2018-01-09 14:13:37 -08:00
Nate McMaster
efa35bd31a Ignore failures due to incoherent dependencies on dotnet-runtime 2018-01-09 13:27:50 -08:00
Livar Cunha
6f46ea928a Merge branch 'release/2.1-MSRC' into merge_release_21_msrc
* release/2.1-MSRC:
  Update to consume aspnetcore 2.0.5-155
  Update to consume aspnetcore 2.0.5-152
  Revert "Update to consume aspnetcore 2.0.5-152"
  Update to consume aspnetcore 2.0.5-152
  Commit to trigger a rebuild of the CLI because of a build in place from the Runtime.
  Adding the 2.0.3 asp.net store to the native installer tests.
  Update to consume aspnetcore 2.0.5-147
  Update to consume aspnetcore 2.0.5-146
  Updating the runtime to 2.0.5.
  Update to consume aspnetcore 2.0.5-142
  Fixing the expected fx-version.
  Adding a separate dependency version for Microsoft.Build.Runtime.
  Updating the branding of the CLI to 2.1.4 and the runtime to 2.0.5.

 Conflicts:
  build/DependencyVersions.props
2018-01-09 12:49:58 -08:00
Nate McMaster
fb2df937fe Replace aspnetcore-store with the aspnetcore-runtime
Update downloaded installers and wixlib to pull the ASP.NET Core Runtime (aka shared framework)
2018-01-05 19:31:24 -08:00
jbeisner
8d95d05f1a Uninstall the 'dotnet-host' before 'dotnet-runtime-deps' 2018-01-06 00:49:43 +00:00