Commit graph

189 commits

Author SHA1 Message Date
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
jbeisner
eb2565719b Fixing the install and uninstall of the 'RuntimeDepsPackage' 2018-01-06 00:14:57 +00:00
jbeisner
002ddd6374 Fixing a typo... 2018-01-05 23:23:15 +00:00
jbeisner
ed8d9c6390 Download the 'dotnet-runtime-deps' installer file to address the 'BuildSDKDeb' errors. 2018-01-05 23:11:47 +00:00
William Lee
860de6339c
Update wix version (#8313) 2018-01-02 12:37:00 -08:00
Livar Cunha
d5c6133238 Adding the 2.0.3 asp.net store to the native installer tests. 2017-12-15 14:46:42 -08:00
Livar Cunha
90e254b9ed More fixes that were missing from the merge. 2017-12-07 13:23:27 -08:00
Livar Cunha
5a0e95897e Merge remote-tracking branch 'dotnet/release/15.5' into merges/release/15.5-to-master-20171206-080040
* dotnet/release/15.5: (26 commits)
  Fixing the reference to Microsoft.Build.Runtime from Cli.Utils.Tests. It was using the wrong package version property.
  One more old style version package name needed to change in redist.
  Fixing the versions of MSBuild and passing the right property to find roslyn files.
  Use "15.5.179" for the other Microsoft.Build.* packages
  Moving the 'MicrosoftBuildPackageVersion' forward.
  Fixing "RuntimeFrameworkVersion"
  Updating version naming convention.
  Fixed a typo...
  Nuget.config update to align with CLI:master - add comments in DependencyVersions.prop
  Even more package dependency re-names...
  Third pass clean-up of package names.
  Second pass clean-up of package names; resequencing download.
  Updating dependency version properties in alignment with sample orchestrated build file at: https://dotnetfeed.blob.core.windows.net/orchestrated/20171129-03/orchestration-metadata/PackageVersions.props
  The access key is already resolved: 'CoreSetupBlobAccessTokenParam'
  Fixed another typo...
  Fixed typo...
  The first pass will need the extra args [same as run-build.ps1].
  Dependency Uptake: download and import a package version props file.
  Accounting for MSRC builds with pre-set 'CoreSetupBlobRootUrl' and 'CoreSetupBlobAccessToke' properties.
  Changes per code review...
  ...

	TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/EmptyItemGroup/EmptyItemGroup.csproj
	TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/Lib/Lib.csproj
	TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/Net452AndNetCoreApp10Lib/Net452AndNetCoreApp10Lib.csproj
	TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/ValidRef/ValidRef.csproj
	TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithDoubledRef/WithDoubledRef.csproj
	TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithExistingRefCondOnItem/WithExistingRefCondOnItem.csproj
	TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithExistingRefCondWhitespaces/WithExistingRefCondWhitespaces.csproj
	TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithRefNoCondNonUniform/WithRefNoCondNonUniform.csproj
	TestAssets/TestProjects/AppWithMultipleFxAndTools/MSBuildAppWithMultipleFrameworksAndTools.csproj
	TestAssets/TestProjects/MSBuildAppWithMultipleFrameworksAndTools/MSBuildAppWithMultipleFrameworksAndTools.csproj
	TestAssets/TestProjects/XunitMulti/VSTestXunitDesktopAndNetCore.csproj
	build/BundledTemplates.props
	build/DependencyVersions.props
	build/NugetConfigFile.targets
	build/Test.targets
	build_projects/dotnet-cli-build/dotnet-cli-build.csproj
	dir.props
	run-build.sh
	src/Microsoft.DotNet.Archive/Microsoft.DotNet.Archive.csproj
	src/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj
	src/Microsoft.DotNet.Configurer/Microsoft.DotNet.Configurer.csproj
	src/dotnet/dotnet.csproj
	src/redist/redist.csproj
	src/tool_fsharp/tool_fsc.csproj
	test/ArgumentForwardingTests/ArgumentForwardingTests.csproj
	test/EndToEnd/EndToEnd.csproj
	test/Microsoft.DotNet.Cli.Sln.Internal.Tests/Microsoft.DotNet.Cli.Sln.Internal.Tests.csproj
	test/Microsoft.DotNet.Cli.Utils.Tests/Microsoft.DotNet.Cli.Utils.Tests.csproj
	test/Microsoft.DotNet.Tools.Tests.Utilities/Microsoft.DotNet.Tools.Tests.Utilities.csproj
	test/Msbuild.Tests.Utilities/Msbuild.Tests.Utilities.csproj
	test/binding-redirects.Tests/binding-redirects.Tests.csproj
	test/dotnet-add-package.Tests/dotnet-add-package.Tests.csproj
	test/dotnet-add-reference.Tests/dotnet-add-reference.Tests.csproj
	test/dotnet-back-compat.Tests/dotnet-back-compat.Tests.csproj
	test/dotnet-help.Tests/dotnet-help.Tests.csproj
	test/dotnet-migrate.Tests/dotnet-migrate.Tests.csproj
	test/dotnet-new.Tests/dotnet-new.Tests.csproj
	test/dotnet-remove-package.Tests/dotnet-remove-package.Tests.csproj
	test/dotnet-remove-reference.Tests/dotnet-remove-reference.Tests.csproj
	test/dotnet-restore.Tests/dotnet-restore.Tests.csproj
	test/dotnet-sln-add.Tests/dotnet-sln-add.Tests.csproj
	test/dotnet.Tests/dotnet.Tests.csproj
2017-12-07 09:55:12 -08:00
John Beisner
f0abfb6b12 Updating dependency version properties in alignment with sample orchestrated build file at: https://dotnetfeed.blob.core.windows.net/orchestrated/20171129-03/orchestration-metadata/PackageVersions.props 2017-12-01 20:07:48 -08:00
Parallels
83ddef69d6 Fixing the store consumption merge. 2017-11-30 14:15:38 -08:00
Livar Cunha
50ffb6bf72 Removing installing the 2.0.0 asp.net runtime store. We don't it anymore either. In master, just the preview one should be enough. 2017-11-30 12:55:23 -08:00
John Beisner
3d39772fe9 The URL root will include the "dotnet" container; the structure will be identical after the "dotnet" container. 2017-11-30 12:09:27 -08:00
Livar Cunha
d613ec5758 Making the cli-test-env shell script runnable and removing test workaround for preview runtimes. It is not needed in master. 2017-11-30 11:50:37 -08:00
John Beisner
5fb91f9661 Use the 'PB_AssetRootUrl' and 'PB_AssetRootAccessTokenSuffix' for all asset downloads if set - "TransportFeed" should be "BlobFeed". 2017-11-30 10:35:51 -08:00
Livar
01393ed3bc
Merge branch 'master' into merges/release/15.5-to-master-20171120-080035 2017-11-20 12:30:12 -08:00
Livar Cunha
dc8a8e02db Merge branch 'release/2.0.0-MSRC' into merge_2_0_0_MSRC
* release/2.0.0-MSRC:
  Updating SDK to 2.0.3-servicing-20171109-3
  Update SDK to 2.0.2-vspre-20170927-1.
  Update aspnetcore to 2.0.3 build 125
  Update aspnetcore to 2.0.3 build 124
  Update aspnetcore to 2.0.3 build 123
  Updating branding to 2.0.3, again
  Fixing closing tags in the DEB and RPM targets.
  Enabling our native installer tests to always get a 2.0.0 asp.net runtime store. We need to solve this in a more generic way in the future. But this will unblock the build for now.
  Update aspnetcore runtime store and LZMA to 2.0.3 build 120
  Adding the pre-release runtime version hack to RHEL as well. Basically, skip native installer tests when using a pre-release runtime.
  Adding the access token to the native installer URLs so that we can download those from protected locations when needed.
  Fixing the expected runtime version by the tool tests.
  Updating the runtime version.
  Updating the branding to 15.5.1
  Adding a test hack to allow the CLI to pass tests with a pre-release runtime for 2.0 TFM.
  Merged PR 82801: Allow non-anonymous storage account access for .lzma download
2017-11-14 12:51:43 -08:00
Livar Cunha
005eab5b3f Merge branch 'release/15.5-MSRC' into merge_15_5_msrc
* release/15.5-MSRC:
  Update aspnetcore to 2.0.3 build 125
  Update aspnetcore to 2.0.3 build 124
  Update aspnetcore to 2.0.3 build 123
  Updating branding to 2.0.3, again
  Fixing closing tags in the DEB and RPM targets.
  Enabling our native installer tests to always get a 2.0.0 asp.net runtime store. We need to solve this in a more generic way in the future. But this will unblock the build for now.
  Update aspnetcore runtime store and LZMA to 2.0.3 build 120
  Adding the pre-release runtime version hack to RHEL as well. Basically, skip native installer tests when using a pre-release runtime.
  Adding the access token to the native installer URLs so that we can download those from protected locations when needed.
  Fixing the expected runtime version by the tool tests.
  Updating the runtime version.
  Updating the branding to 15.5.1
  Adding a test hack to allow the CLI to pass tests with a pre-release runtime for 2.0 TFM.
  Merged PR 82801: Allow non-anonymous storage account access for .lzma download
2017-11-14 12:47:53 -08:00
Nick Guerrera
20d4d77586
Merge pull request #7998 from dotnet/release/15.5
Merge release/15.5 to master
2017-11-11 10:15:25 -08:00
Nick Guerrera
2a0569dc34 Fix build error when using SeparateSymbolsArchive=false 2017-11-03 15:22:41 -07:00
Nick Guerrera
4f31e3db66 Improve symbols zip archive
We were publishing a -debug zip with sdk code and symbols, but it was captured before
publishing was finished and had incorrect code content. Trying to use it would blow up
due to incorrect runtimeconfig.json.

Replace it with a -symbols zip that contains only symbols and that can be overlayed
over the main zip. This is just like the -langpack zip that has satellite assemblies.

Also add an option to leave the PDBs in the same directory/packages as code:
/p:SeparateSymbolsArchive=false. Setting this on local builds facilitates
debugging and profiling by removing the need to adjust symbol paths or copy PDBs
around.
2017-11-02 16:08:06 -07:00
Livar Cunha
e37e9f3fe8 Fixing closing tags in the DEB and RPM targets. 2017-10-20 14:43:29 -07:00
Livar Cunha
d4f980a02e Enabling our native installer tests to always get a 2.0.0 asp.net runtime store. We need to solve this in a more generic way in the future. But this will unblock the build for now. 2017-10-20 14:23:34 -07:00
Livar Cunha
34235acb37 Adding the pre-release runtime version hack to RHEL as well. Basically, skip native installer tests when using a pre-release runtime. 2017-10-09 15:27:05 -07:00
Livar Cunha
ec9b583eb4 Adding the access token to the native installer URLs so that we can download those from protected locations when needed. 2017-10-09 14:09:48 -07:00
Livar Cunha
36892f28e9 Adding a test hack to allow the CLI to pass tests with a pre-release runtime for 2.0 TFM. 2017-10-06 11:08:02 -07:00
William Lee
221ab05346 Use one build definition to produce all Linux distro specific packages (#7615)
By using `./build.sh /t:AllLiuxDistrosNativeInstaller`

Make a sandbox folder after compile step and copy compiled artifact to it. Since the content will be Linux generic, use package step with Docker in different distros.
After finishing all the distro specific packaging, upload all of them at once

Publish to debian only support all distro

Improve perf of AllLiuxDistrosNativeInstaller, by copying more cache in to sandbox

There will be a retry if package command failed
2017-09-14 13:33:46 -07:00
John Beisner
6a76bb8396 Incorrect token. 2017-09-06 08:53:01 -07:00
John Beisner
5000ba5f10 Adding required environmental variables. 2017-09-05 15:08:42 -07:00
Daniel Plaisted
6e0646f7bf Update environment variables for EndToEnd test run on Debian package 2017-09-01 18:21:25 -07:00
Daniel Plaisted
ac67434ea4 Fix debian package generation
Previously, dotnet-deb-tool-consumer.csproj was copied to the out/artifacts folder before being restored.  This no longer works as it depends on repo properties, and there is a Directory.Build.props in teh out directory to stop projects inside it from getting the repo properties.  So this change restores it in-place instead.
2017-09-01 12:12:10 -07:00
Daniel Plaisted
2222290394 Update MSI tests to use new output directory layout 2017-08-24 17:16:11 -07:00
Daniel Plaisted
c6e4c8f477 Rename Stage0 build variables to PreviousStage 2017-08-24 17:16:11 -07:00
Daniel Plaisted
ae0aa8ed24 Move dir.props to auto-imported Directory.Build.props
This is necessary for setting the intermediate output path to work correctly
2017-08-24 15:46:45 -07:00
William Li
1fa454bda4 Ingest new version Aspnet store
Change the url and name accordingly for the name naming convention
2017-08-14 16:05:22 -07:00
William Lee
be54917dc4 ingest store without timestamp (#7317)
- Handling no timestamp aspnetcore-store for deb native installers
- Handling no timestamp aspnetcore-store for rpm native installers
  AspNetCoreRuntimePackageName and the version in RPM package.
- Align the name for debian 8 and rhel 7 package.
2017-07-28 20:34:57 -07:00
William Li
20a7ab075a Add the missing / 2017-07-27 11:32:59 -07:00
Livar Cunha
9e04dcf8a4 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
Livar Cunha
1de47f5704 Producing a nupkg for Microsoft.NET.MSBuildResolver. Note that this package contains only the Resolver dll. The hostfxr dll will still have to be acquired separately. 2017-07-21 15:24:59 -07:00