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

485 commits

Author SHA1 Message Date
Nick Guerrera
57d256dbf5 Make copy idempotent 2017-10-18 16:12:13 -07:00
Nick Guerrera
c9eeef1790 Remove dependency on VersionTools in source builds 2017-10-18 16:12:13 -07:00
Nick Guerrera
26d8d75fef Use stable System.Reflection.Metadata 2017-10-18 16:12:13 -07:00
Nick Guerrera
5a1021ac4b Only remove Azure dependency for source builds 2017-10-18 16:12:13 -07:00
Matt Ellis
b63fb1aaf8 Remove Azure dependency from build 2017-10-18 16:12:13 -07:00
Nick Guerrera
62224b3435 Add back NuGet.Protocol dependency 2017-10-18 16:12:12 -07:00
Matt Ellis
ce7d434ae8 Remove some unneeded package references 2017-10-18 16:12:12 -07:00
Nick Guerrera
218b887d87 Download stage0 when DOTNET_TOOL_DIR is not set 2017-10-18 12:43:34 -07:00
Matt Ellis
eacc4d248c Don't pull down stage 0 from the internet 
The composed build will set `PREBUILT_DOTNET_TOOL_DIR` to a location
where the dotnet tool can be copied from.

Long term we should get rid of the copy in favor of just using one
from a common location, but some of the Stage0 logic in the CLI build
system will need to change, I think.
 2017-10-18 12:43:33 -07:00
Livar Cunha
e1916cc4dc Merge remote-tracking branch 'dotnet/release/15.5' into merges/release/15.5-to-master-20171016-070031 
* dotnet/release/15.5: (21 commits)
  Manually merging some changes that git merged wrong and deleted from the 15.5 branch.
  Separating the 'legacy' URL construction from the 'current' URL construction methods and logic.
  Use temporary path for fake deps.json in test
  Use same build number for roslyn and F# satellites
  Updating Roslyn satellites and SDK versions
  Insert NuGet Build 4.5.0-preview2-4529 into cli
  Update NuGet to 4529 (signed)
  MSBuild 15.5.154
  MSBuild 15.5.153
  removed commented out config I'd meant to remove
  added a way to specify the asp.net template versions
  Porting 'dotnet-install.sh' from CLI:master to CLI:release/2.0.0
  'NuGet.master.config' does not appear to be used.
  Fixed tests
  Update branch info to release/15.5
  Updating the websdk version to 2.0.0-rel-20171010-665
  Insert NuGet Build 4.5.0-preview1-4526 into cli
  Update DependencyVersions.props
  Updated version of TestPlatform to 15.5.0-preview-20170923-02
  MSBuild 15.4.8
  ...
 2017-10-16 15:42:40 -07:00
John Beisner
0c4bcdcc55 Enabling the publish of CLI NuPkg to the unified Transport feed. 2017-10-16 14:33:50 -07:00
Nick Guerrera
ddae0875cf Revert release/2.0.0 back to 1bcee43995 
There were incorrect merges from release/15.5 to release/2.0.0 since then
 2017-10-09 13:55:13 -07:00
Nick Guerrera
4a2d3fae16 Fix up roslyn satellite assembly handling to match new insertion mechanism 
1. Publish satellites with a separate project and merge the resulting .deps.json
   into (csc|vbc).deps.json

2. Move the build tasks satellites to the correct location next to main assembly
   (one level higher than bincore\)
 2017-10-03 16:00:56 -07:00
William Lee
85ce73dfb5 Use Newtonsoft.Json for UploadToLinuxPackageRepository (#7745) 2017-10-02 16:39:37 -07:00
Ashley Hauck
97b027b232 Remove CscToolPath 2017-10-02 12:26:52 -07:00
John Beisner
044343f0e9 Fixing a publish break in master: "UploadToLinuxPackageRepository" 2017-09-29 12:40:39 -07:00
John Beisner
fbb61475f7 Handling the 'badge' naming for RedHat6 2017-09-28 11:19:49 -07:00
Nick Guerrera
e83ae613d6 Fix build errors and warnings after porting fixes to 2.0.x 2017-09-27 16:52:11 -07:00
Daniel Plaisted
b0c4508917 Fix DotNetRestore after merging upstream changes 
(cherry picked from commit fc6f2f3bfa)
 2017-09-27 14:40:13 -07:00
Daniel Plaisted
f39315771e Generate properties to pass to the next stage of the build 
(cherry picked from commit 12f8c2377f)
 2017-09-27 14:22:19 -07:00
Daniel Plaisted
2b134c91fe Support new artifacts layout in tests and other build logic 
(cherry picked from commit 13da213183)
 2017-09-27 14:20:05 -07:00
Daniel Plaisted
8385d37185 Move dir.props to auto-imported Directory.Build.props 
This is necessary for setting the intermediate output path to work correctly

(cherry picked from commit ae0aa8ed24)
 2017-09-27 14:16:37 -07:00
William Li
36ee426998 Port #7571 from master to 2.0.x 
Add log to UploadToLinuxPackageRepository

(cherry picked from commit 8b8aef7e44)
 2017-09-27 14:10:40 -07:00
William Li
c834676ecb Port #7460 from master to 2.0.x 
Use Rest Api to upload to the feed

Add pulling logic to make sure it is uploaded to the feed.

Add retry logic for the whole upload process

Remove the old upload script

(cherry picked from commit 7f54ccb903)
 2017-09-27 14:08:31 -07:00
Nick Guerrera
87268c57ad Use fixed RTM build of PlatformAbstractions from build project 
(cherry picked from commit 0a1be24e2f)
 2017-09-27 13:26:47 -07:00
William Li
a2268990da Replace with all linux distros badge 2017-09-15 09:30:35 -07:00
Eric Erhardt
a36d67fe07 Fix update-dependencies by using the correct TFM. 
stage0 comes with 2.1 runtime now, so need to use netcoreapp2.1.
 2017-09-06 19:55:13 -05:00
Eric Erhardt
0491fd3826 Fix update-dependencies. 
Don't import the root Directory.Build.props during update-dependencies because it imports generated .props files that don't exist outside of the build.
 2017-09-06 15:27:16 -05:00
Daniel Plaisted
9b331673fe Merge upstream changes 2017-09-01 13:17:40 -07:00
Nick Guerrera
8ef162fd13 Merge pull request #7579 from dotnet/merges/release/2.0.0-to-master-20170901-070026 
Merge release/2.0.0 to master
 2017-09-01 13:16:42 -07:00
William Li
8b8aef7e44 Add log to UploadToLinuxPackageRepository 2017-09-01 12:51:38 -07:00
Nick Guerrera
252218c3d0 Merge 'release/2.0.0' into merges/release/2.0.0-to-master-20170901-070026 
Conflicts:
	README.md
	build/Branding.props
	build/DependencyVersions.props
	netci.groovy
	test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs
	test/dotnet-new.Tests/GivenThatIWantANewApp.cs
 2017-09-01 11:55:26 -07:00
William Li
cd963e7bdb Remove out of support ubuntu1610 2017-08-31 16:59:17 -07:00
William Li
7f54ccb903 Use Rest Api to upload to the feed 
Add pulling logic to make sure it is uploaded to the feed.

Add retry logic for the whole upload process

Remove the old upload script
 2017-08-30 06:54:34 -07:00
Daniel Plaisted
fc6f2f3bfa Fix DotNetRestore after merging upstream changes 2017-08-28 12:39:12 -07:00
Daniel Plaisted
107252ebe7 Merge upstream changes 2017-08-28 11:09:19 -07:00
Nick Guerrera
0a1be24e2f Use fixed RTM build of PlatformAbstractions from build project 2017-08-25 20:17:32 -07:00
Daniel Plaisted
12f8c2377f Generate properties to pass to the next stage of the build 2017-08-24 15:51:37 -07:00
Daniel Plaisted
13da213183 Support new artifacts layout in tests and other build logic 2017-08-24 15:49:13 -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
John Doe
8fc8a03081 typo 2017-08-14 21:26:49 -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
Nick Guerrera
a1c423c0f6 Honor UI language override in test runs 
Also fix some incorrect unlocalized test expectations that slipped in.
 2017-07-18 22:03:31 -07:00
Mike Lorbetske
ea467db3af Update test to pass --no-restore to templates 2017-07-10 16:27:54 -07:00
William Li
bf496a9b12 Update bages to aligan with linux buid definition 2017-06-30 19:33:37 -07:00
Nick Guerrera
cad156947d Merge pull request #7036 from nguerrera/fix-local-tests 
Fix test failures in local build due to environment variable filter
 2017-06-29 16:47:20 -07:00
Nick Guerrera
59bbc5783f Fix test failures in local build due to environment variable filter 2017-06-29 13:45:01 -07:00
Mike Lorbetske
d8087d35d4 Update engine and templates, update to SetupCrossgen 224 - Coherence 25975 2017-06-29 10:16:02 -07:00
Eric Erhardt
6119a29f83 Reenable UpdateVersionsRepo 
Now that https://github.com/dotnet/buildtools/issues/1547 is fixed.
 2017-06-23 09:09:56 -05:00
jbeisner
add33234a5 Merge pull request #6857 from johnbeisner/RuntimeCoherence 
Enable creation and consumption of a 'coherent' pointer
 2017-06-15 10:22:40 -07:00
Livar
47223c9400 Merge pull request #6861 from livarcocc/update_sdk 
Updating the SDK. Mostly, had to change PackageTargetFallback to Asse…
 2017-06-14 10:34:17 -07:00
John Beisner
af29c61f01 We stopped producing distribution specific assets for Linux; removing the check for existence before publishing to 'latest'. 2017-06-14 09:02:36 -07:00
Livar Cunha
0a4a0a082c Updating the SDK. Mostly, had to change PackageTargetFallback to AssetTargetFallback. 2017-06-14 00:27:26 -07:00
John Beisner
c497bf498f Write a 'latest.coherent.version' file at blob storage so users have a 'coherent' option to SDK installations. 2017-06-13 16:45:29 -07:00
William Li
3419a87d6f Produce RPM packages 
Reference from https://github.com/dotnet/core-setup/tree/master/src/pkg/packaging/rpm

The goal is to have parity with Debian,
but does not publish to the feed

When run the script with rhel, it will
produce rpm file in the package step
and publish rpm to the blob storage
 2017-06-13 15:00:35 -07:00
Daniel Plaisted
9cd4e5a956 Add Microsoft.NET.Build.Extensions files to package for VS insertion 2017-06-09 11:18:46 -07:00
Livar Cunha
0b19d6889e Updating the vstest.console to use the same runtime that is shipping with the CLI. 2017-06-08 16:45:29 -07:00
Nick Guerrera
a08ebb95a0 Generate equivalent of resx .Designer.cs in build 2017-06-06 21:47:58 -07:00
John Beisner
b48b7d2ea0 .NET Core 2+ Naming and Versioning 
New file name structure for the runtime and the CLI
per: https://github.com/dotnet/designs/issues/2

The renaming of assets, therefore the dotnet installation scripts must change to accommodate.

Trivial:
"Write-Host" should be "Write-Output"
 2017-05-26 15:46:56 -07:00
Livar Cunha
38fc8875f2 Enabling VB in the CLI. 
Fixing the permissions for RunVbc.sh.
 2017-05-17 22:16:22 -07:00
Eric Erhardt
f82fa91f58 Fix update-dependencies by slimming it way down. 
It can no longer be dependent on Cli.Utils, since that will affect which version of NuGet gets used.  It's better for this small console app to just depend on VersionTools.
 2017-05-11 10:15:05 -05:00
Eric Erhardt
928c510c84 Clean up unused build code. 2017-05-11 08:59:38 -05:00
Eric Erhardt
f4c4db4d3a update-dependencies hard-coded values 
Read MSBuild property values to get GITHUB_UPSTREAM_BRANCH and CORESETUP_VERSION_FRAGMENT instead of hard-coding them in update-dependencies.
 2017-04-26 13:28:27 -05:00
Livar
4f6fbc4a7f Merge pull request #6362 from mlorbetske/dev/mlorbe/Update20Templates 
Update templates and engine, pin ASP.NET package versions, add web item templates
 2017-04-22 12:00:08 -07:00
Eric Erhardt
7b04142ddd Fix update-dependencies 
Update all core-setup dependencies.
Fix the app to get its shared framework from stage0 instead of what is currently checked in to the repo (which my mis-match when many builds of core-setup come out at a time).
 2017-04-21 13:04:19 -05:00
Rama Krishnan Raghupathy
bb4298ddc2 Updating SDk to 20170414 2017-04-14 14:55:01 -07:00
Rama Krishnan Raghupathy
2f5673f953 moving dependecymodel and platformabstraction to preview1-001960 2017-04-11 17:00:50 -07:00
Mike Lorbetske
fc77d7e152 Update templates & engine, rename --skip-restore to --no-restore 2017-04-10 20:00:17 -07:00
Livar
e1b4556641 Merge pull request #6254 from mlorbetske/dev/mlorbe/UpdateTemplatesAndEngine 
Update template engine & template versions
 2017-04-06 18:01:12 -07:00
Mike Lorbetske
379dd5c9e0 Update template engine & template versions 2017-04-05 13:50:12 -07:00
Eric Erhardt
a7becbe6d8 Fix passing /p:DISABLE_CROSSGEN on cli. 
When passing a property using the commandline, it is not flown through to "dotnet publish" calls.  So instead of using "dotnet publish", just use the MSBuild task to invoke the Publish target on the reidst project.  This way properties flow correctly.

I also did a little cleaning of unused build logic.
 2017-04-04 17:50:28 -05:00
Eric Erhardt
a97b572e49 Use the portable linux-x64 runtime when building on Linux. 2017-03-24 16:19:52 -05:00
Matt Ellis
8b7d1c6e2a Target update-dependencies to netstandard2.0 
Previously, this was 1.0 app. Since stage0 no longer contains a 1.0.X
shared framework, it would not run.

Move to 2.0.0 (instead of 1.1.X since the 1.1.X shared framework will
stop being in stage0 soon as well).
 2017-03-23 15:04:32 -07:00
Matt Ellis
949fbd59db Remove dotnet-cli-build's dependency on CoreCLR 
dotnet-cli-build had a package reference to both CoreCLR and a new
version of Microsoft.NETCore.App in order to pull down
crossgen. Crossgen is now restored by a specific project that only
deals will pulling down crossgen, so we can remove this code.

Fixes #6093
 2017-03-21 18:32:07 -07:00
jonsequitur
4effd9354c merge 2017-03-21 11:57:08 -07:00
Livar Cunha
df496d0959 Fixing the extra distros. 2017-03-20 12:41:47 -07:00
Jon Sequeira
ca914334ea revert logger colon change 2017-03-19 13:02:09 -07:00
Livar Cunha
cfd0874c96 Modified test assets and added the new rids back as badges and CI. Still need to update tests. 2017-03-17 20:32:50 -07:00
Piotr Puszkiewicz
659744d83d Fix build 2017-03-10 14:00:26 -08:00
Piotr Puszkiewicz
0df2462344 Merge remote-tracking branch 'dotnet/master' into tab-completion 2017-03-10 12:03:01 -08:00
jonsequitur
58bf70a476 merge 2017-03-09 18:36:05 -08:00
Eric Erhardt
43263cc9c3 Add logging for publishing src\redist.csproj 2017-03-09 16:30:29 -06:00
Justin Goshi
132b175395 Add new badge for linux_x64 (#5968) 2017-03-09 07:08:49 -10:00
Justin Goshi
45a1e9e56c Allow host info passed in from the command line to override machine settings (#5904) 
* Allow host info passed in from the command line to override machine settings

* Simplify the logic

* Address PR comments to keep a separate HostRid and HostOSName that are static

* Rename to BuildInfo.props

* Address PR comments

* Fix the previous merge

* Fix spacing

* Address PR comments
 2017-03-08 09:10:53 -10:00
Daniel Plaisted
abdbc6f274 Restore package with crossgen 2017-03-07 16:01:53 -08:00
Jon Sequeira
3dafe9a6e2 add logging to build 2017-03-06 22:10:37 -08:00
Eric Erhardt
21080fc5be Fix UpdateVersionsRepo to pass file paths instead of a directory 2017-03-06 11:22:28 -06:00
Eric Erhardt
21471aa956 Fix UpdateVersionsRepo to always write the files correctly. 
We were only building nupkgs on windows, which meant if a non-windows machine was the last leg to finish, we were writing a blank file to the versions repo.

Fix #4399
 2017-03-03 21:43:38 -06:00
Piotr Puszkiewicz
a07ebe2e7b Merge remote-tracking branch 'refs/remotes/dotnet/master' 
Conflicts:
	TestAssets/DesktopTestProjects/AppWithProjTool2Fx/App.csproj
	TestAssets/NonRestoredTestProjects/AppThrowingException/App/AppThrowingException.csproj
	TestAssets/NonRestoredTestProjects/AppThrowingException/AppDependingOnOtherAsTool/AppDependingOnOtherAsTool.csproj
	TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/EmptyItemGroup/EmptyItemGroup.csproj
	TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/Lib/Lib.csproj
	TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/MoreThanOne/a.csproj
	TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/MoreThanOne/b.csproj
	TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/Net452AndNetCoreApp10Lib/Net452AndNetCoreApp10Lib.csproj
	TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/Net45Lib/Net45Lib.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/WithRefCondNonUniform/WithRefCondNonUniform.csproj
	TestAssets/NonRestoredTestProjects/DotnetAddP2PProjects/WithRefNoCondNonUniform/WithRefNoCondNonUniform.csproj
	TestAssets/NonRestoredTestProjects/ToolWithRandomPackageName/AppWithDepOnTool/AppWithDepOnTool.csproj
	TestAssets/TestPackages/dotnet-dependency-context-test/dotnet-dependency-context-test.csproj
	TestAssets/TestPackages/dotnet-dependency-tool-invoker/dotnet-dependency-tool-invoker.csproj
	TestAssets/TestPackages/dotnet-portable/dotnet-portable.csproj
	TestAssets/TestProjects/AppWithDepOnToolWithOutputName/AppWithDepOnToolWithOutputName.csproj
	TestAssets/TestProjects/AppWithDirectDepWithOutputName/AppWithDirectDepWithOutputName.csproj
	TestAssets/TestProjects/AppWithMultipleFxAndTools/MSBuildAppWithMultipleFrameworksAndTools.csproj
	TestAssets/TestProjects/AppWithToolDependency/AppWithToolDependency.csproj
	TestAssets/TestProjects/DependencyContextFromTool/DependencyContextFromTool.csproj
	TestAssets/TestProjects/MSBuildAppWithMultipleFrameworks/MSBuildAppWithMultipleFrameworks.csproj
	TestAssets/TestProjects/MSBuildAppWithMultipleFrameworksAndTools/MSBuildAppWithMultipleFrameworksAndTools.csproj
	TestAssets/TestProjects/TestAppSimple/TestAppSimple.csproj
	TestAssets/TestProjects/TestAppWithProjDepTool/TestAppWithProjDepTool.csproj
	TestAssets/TestProjects/VSTestDesktopAndNetCore/VSTestDesktopAndNetCore.csproj
	TestAssets/TestProjects/VSTestDotNetCore/VSTestDotNetCore.csproj
	TestAssets/TestProjects/VSTestXunitDesktopAndNetCore/VSTestXunitDesktopAndNetCore.csproj
	TestAssets/TestProjects/VSTestXunitDotNetCore/VSTestXunitDotNetCore.csproj
	build_projects/Microsoft.DotNet.Cli.Build.Framework/Microsoft.DotNet.Cli.Build.Framework.csproj
	build_projects/dotnet-cli-build/dotnet-cli-build.csproj
	build_projects/shared-build-targets-utils/shared-build-targets-utils.csproj
	test/Microsoft.DotNet.ProjectJsonMigration.Tests/Rules/GivenThatIWantToMigrateConfigurations.cs
	test/Microsoft.DotNet.ProjectJsonMigration.Tests/Rules/GivenThatIWantToMigrateTFMs.cs
 2017-03-02 23:49:01 -08:00
Piotr Puszkiewicz
5048f65703 Merged branch master into piotrpMSFT/infra/CodeCleanup 2017-03-02 21:56:50 -08:00
Livar
a47cce6150 Merge pull request #5905 from piotrpMSFT/piotrpMSFT/infra/TasklessGitInfo 
Remove task usage in commitcount & hash calculation
 2017-03-02 21:44:25 -08:00
Piotr Puszkiewicz
d55a8f8188 Add missing copyright headers to all cs files 2017-03-02 21:04:03 -08:00
Piotr Puszkiewicz
841846f32b Standardize on newline between Property|ItemGroup areas 2017-03-02 20:38:56 -08:00
Piotr Puszkiewicz
e617376bc7 Trailing newlines + standardize tabs -> spaces 2017-03-02 20:35:20 -08:00
Piotr Puszkiewicz
d9a06ba95c Remove unnecessary Release constants 
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
    <DefineConstants>$(DefineConstants);RELEASE</DefineConstants>
  </PropertyGroup>
 2017-03-02 20:11:21 -08:00
Piotr Puszkiewicz
f39eeaf1c3 Version as Metadata in build_projects/ 2017-03-02 19:50:19 -08:00
Piotr Puszkiewicz
958fc85962 Merge pull request #5870 from ellismg/make-update-dependencies-idempotent 
Make update-dependencies idempotent in the only update case
 2017-03-02 18:51:31 -08:00
Piotr Puszkiewicz
fbb75e1a47 Remove task usage in commitcount calculation 2017-03-02 18:46:08 -08:00
Livar Cunha
3a9525b5ac Merge branch 'rel/1.0.1' into merge_rel101_into_master 
* rel/1.0.1: (66 commits)
  Update LZMA license with correct text
  Bump to 2.0.0-rc5-61427-04
  Remove duplicate installer suffix
  Add license text to LZMA SDK license notice
  Updating the SDK to 1.0.0-alpha-20170224-6
  Updating both platform abstractions and dependency model to 1.0.3.
  Bump Roslyn to 2.0.0-rc5-61424-02
  Update Stage0 to use the latest build.
  Update README with new distros.
  Back porting #5597 into rel/1.0.0
  Fixing the exclude pattern used by the Migration to exclude WEB SDK globs.
  Remove RID from test package creation
  Disable migrate and publish web app with content because CI does not have NPM
  Adding an E2E test for pack with content during migration.
  Fixing a failing test and adding a few more E2E tests around binplace content for migrated projects.
  Fix debian_config.json on ubuntu16.10
  Updating publish, pack and build of content to use None with Never/false/Never in their metadata for excluded items.
  Intermediate commit to get a WIP PR out. This adds the None Update with CopyToOutputDirectory set to Never.
  Switching the CopyToOutput for build and publish and the file for pack to use None Update instead of include. Also, fixed the exclude patterns for web apps.
  Do not migrate Content that is already included in the Web SDK for web apps.
  ...
 2017-03-01 20:50:42 -08:00
Eric Erhardt
b64068291b Remove OpenSUSE13 and Fedora23 since they are end of lifed. 2017-03-01 15:27:50 -06:00