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

4892 commits

This branch
This branch
All branches
Author SHA1 Message Date
Justin Goshi
2f298ed616 Now add the original file without any rename 2017-02-15 11:57:11 -08:00
Justin Goshi
da81fcaa30 One more try. Delete the file first 2017-02-15 11:56:46 -08:00
Justin Goshi
832e8dc6e0 try new spacing 2017-02-15 11:54:35 -08:00
Justin Goshi
0c7a94e7cb Trying to figure out spacing 2017-02-15 11:52:14 -08:00
Justin Goshi
ce0ae2553d fix tabs 2017-02-15 11:51:00 -08:00
Justin Goshi
688195b8b5 try again 2017-02-15 11:47:33 -08:00
Justin Goshi
e85f4069c4 Now rename 2017-02-15 11:43:27 -08:00
Justin Goshi
7a894df413 Trying to fix the diff of one file 2017-02-15 11:42:34 -08:00
Justin Goshi
72db23ed4d Merge branch 'master' into dev/jgoshi/renamePropsFiles 2017-02-15 10:28:47 -08:00
Piotr Puszkiewicz
4cc0f9d8a5 Merge pull request #5706 from dotnet/naamunds/signing-msbuild15-fix 
Remove import of dir.props from Signing.proj
 2017-02-14 22:32:24 -08:00
Piotr Puszkiewicz
175ac5fc2e Merge pull request #5686 from omajid/master 
Use dotnet-install from the cli master branch
 2017-02-14 17:07:58 -08:00
Nate Amundson
73d59c423d Remove import of dir.props from Signing.proj 
The build agents in our VSTS pool don't yet have MSBuild 15, so the
signing project can't import any MSBuild 15 projects. (The signing
project is built with the desktop MSBuild because MicroBuild depends on
it.)  Once the agents have MSBuild 15, this import can be added back.
 2017-02-14 16:49:57 -08:00
Justin Goshi
27182f293d merge 2017-02-14 16:43:23 -08:00
Piotr Puszkiewicz
a906069859 Merge pull request #5693 from dotnet/dev/jgoshi/refactorBuildProj 
Remove more properties from build.proj
 2017-02-14 16:19:53 -08:00
Piotr Puszkiewicz
101d57dcb5 Merge pull request #5462 from ramarag/dotnet-cache 
Dotnet cache
 2017-02-14 16:18:53 -08:00
Justin Goshi
62abef428e Rename build files 2017-02-14 15:42:13 -08:00
Matt Ellis
0e0a419a3d Merge pull request #5695 from ellismg/fix-update-script 
Get update-dependenices working again
 2017-02-14 11:26:30 -08:00
Justin Goshi
87ee130ab5 Create CoreSetupInfo.props 2017-02-14 10:30:28 -08:00
Rama Krishnan Raghupathy
c20e106d75 Adding End to End test for cache and filtered publish 2017-02-13 17:56:25 -08:00
Justin Goshi
3b9ecf7f86 Address PR comments 2017-02-13 17:37:23 -08:00
Matt Ellis
5d932c6aba Get update-dependenices working again 
- Fix build issues due to .props file not existing on a clean
  enlistment
- Fix path separator issues on *NIX
- Add update-dependencies.sh
- Support -Update in update-dependencies.ps1
 2017-02-13 17:30:33 -08:00
Rama Krishnan Raghupathy
4fdc72890a Appending dotnet publish xlf 2017-02-13 16:01:16 -08:00
Rama Krishnan Raghupathy
da2cb43949 Adding xlf for dotnet cache 2017-02-13 16:01:10 -08:00
Rama Krishnan Raghupathy
badab4680d Adding the shim of dotnet-cache 
Adds filter profile option to publish
 2017-02-13 16:01:06 -08:00
Justin Goshi
3dad3afc03 Remove more properties from build.proj 2017-02-13 15:08:10 -08:00
Piotr Puszkiewicz
a101c703a1 First try at refactor of Prepare.targets (#5647) 
* First try at refactor of Prepare.targets

* Enable restore of CLI build tasks

* Fix up build

* Feedback

* Newlines

* Add new props to sln

* CommitCount

* NuGet.config

* WorkingDir

* packages dir path

* Add missing nuget.configs

* Workaround for https://github.com/NuGet/Home/issues/4583

* Match NuGet.Config casing

* Put back Version Badge Properties

* Remove duplicate
 2017-02-13 13:06:30 -08:00
Piotr Puszkiewicz
3806eeb151 Merge pull request #5660 from krwq/2017-02-10-tamisol 
TestAssets Isolation
 2017-02-13 11:24:43 -08:00
Omair Majid
d999f22788 Use dotnet-install from the cli master branch 
During the cli build, the cli downloads and executes the bootstrap
script from buildtools. The bootstrap script then downloads and executes
the dotnet-install script from cli, but in the 'rel/1.0.0' branch, not
the master branch.

This means that someone building cli's master branch will end up using
the dotnet-install.sh or dotnet-install.ps1 script from cli's rel/1.0.0
branch.

Fix that by telling the bootstrap script to download and use the version
of dotnet-install script from the master branch (which is the current
branch the user is building).

Ideally, we would just call the dotnet-install script in the current
repo/branch, but because the bootstrap script sits in the middle and is
part of a different repository, we can't.

This is a workaround for #5410.
 2017-02-13 14:12:19 -05:00
Eric Erhardt
01d2505c03 Merge pull request #5662 from eerhardt/FixNetStandardLibrary 
Fix dotnet new classlib to contain the correct NETStandard.Library version.
 2017-02-10 20:26:11 -06:00
Piotr Puszkiewicz
e9561f949f Merge pull request #5661 from dotnet/dev/jgoshi/refactorTasks 
Refactor tasks used in generate static props files
 2017-02-10 18:01:11 -08:00
Krzysztof Wicher
2917598544 Remove IsAncestor and use PathUtility.IsChildOfDirectory instead 2017-02-10 15:50:48 -08:00
Krzysztof Wicher
e3b36b2b65 remove leftover from debugging 2017-02-10 14:27:41 -08:00
Justin Goshi
483e6bd9c1 Address PR comments 2017-02-10 14:13:44 -08:00
Justin Goshi
64ccab43e8 Merge branch 'master' into dev/jgoshi/refactorTasks 2017-02-10 13:38:07 -08:00
Eric Erhardt
25f9a1bbc7 Fix dotnet new classlib to contain the correct NETStandard.Library version. 
Fix #5638
 2017-02-10 14:22:07 -06:00
Justin Goshi
33d83d6639 Refactor tasks 2017-02-10 12:13:44 -08:00
Eric Erhardt
e7689a3116 Merge pull request #5648 from eerhardt/master-UpdateDependencies 
Upgrade update-dependencies
 2017-02-10 14:02:12 -06:00
Krzysztof Wicher
dbd278e65e adjust nuget.config paths 2017-02-10 10:57:36 -08:00
Krzysztof Wicher
f77c5d76cb copy files and direct restore and build without adjusting paths 2017-02-10 10:54:05 -08:00
Eric Erhardt
31ff72e62d Respond to PR feedback. 2017-02-10 11:53:27 -06:00
Krzysztof Wicher
4952a819d4 wip 2017-02-10 09:49:21 -08:00
Piotr Puszkiewicz
68ad8bdec6 Merge pull request #5653 from jonsequitur/string-fix-for-cache-priming 
remove redundant word 'create'
 2017-02-09 22:24:30 -08:00
jonsequitur
bee34cc0ff remove redundant word 'create' 2017-02-09 18:28:34 -08:00
eerhardt
72af77de1b Update CoreSetup to beta-001509 2017-02-09 16:56:32 -06:00
Eric Erhardt
1e20550f5d Upgrade update-dependencies script. 
- Take the latest VersionTools, so we can take advantage of new features.
- Update what files need to be updated - DependencyVersions.props.
- Clean up the powershell script.
 2017-02-09 16:56:19 -06:00
Piotr Puszkiewicz
0986cc079a Merge pull request #5617 from dotnet/dev/jgoshi/firstPassProps 
Generate host and build info and store them in .props files
 2017-02-09 13:22:12 -08:00
Unknown
ee34309e4a Merge remote-tracking branch 'refs/remotes/dotnet/master' 
Conflicts:
	build/Microsoft.DotNet.Cli.Prepare.targets
 2017-02-09 11:00:02 -08:00
Piotr Puszkiewicz
806b294777 Overwrite props files if they exist 2017-02-09 10:50:21 -08:00
Eric Erhardt
5406d2af14 Merge pull request #5600 from piotrpMSFT/piotrpMSFT/merge/rel100toMaster 
Merge rel/1.0.0 to Master
 2017-02-09 12:14:45 -06:00
Eric Erhardt
454dd10f8d Update dotnet new to use the new 2.0 templates. 2017-02-09 10:18:39 -06:00