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

5420 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Piotr Puszkiewicz
6b7ad0544f small refactor 2017-02-09 00:26:40 -08:00
Livar
a88df7953c Merge branch 'rel/1.0.0' into drop_suffix 2017-02-08 20:35:49 -08:00
Livar
f2ad5a39ab Merge pull request #5624 from dotnet/dev/jgoshi/deprecatedMigrate 
Migrate compilationOptions even when other deprecated options are present
 2017-02-08 20:35:29 -08:00
Justin Goshi
12e540920b Fix build break 2017-02-08 19:34:48 -08:00
Justin Goshi
13fd6d85d7 Remove stuff from prepare.targets 2017-02-08 19:22:56 -08:00
Justin Goshi
2eac755db7 Refactor 2017-02-08 19:13:30 -08:00
Livar
f5618b8969 Merge branch 'rel/1.0.0' into dev/jgoshi/deprecatedMigrate 2017-02-08 18:23:24 -08:00
Livar
a8c88b4f37 Merge pull request #5628 from dotnet/updatenuget-2275 
update nuget to 4.0.0-rtm-2275
 2017-02-08 18:23:10 -08:00
Livar Cunha
d373ce8911 Enabling publish with drop suffix to still publish to a suffix based folder in blob to avoid conflicts. 2017-02-08 18:17:04 -08:00
Justin Goshi
b419f25d67 Merge branch 'master' into dev/jgoshi/firstPassProps 2017-02-08 17:18:54 -08:00
Piotr Puszkiewicz
8b71ebef9a Merge branch 'rel/1.0.0' into updatenuget-2275 2017-02-08 16:45:46 -08:00
Livar Cunha
35fc8c1d0e Step one of introducing a flag to drop the suffix out of our build versions. 2017-02-08 15:26:47 -08:00
Eric Erhardt
0dc62d0778 Merge pull request #5627 from eerhardt/FixSln 
Fix the CLI .sln file to load and build in VS 2017.
 2017-02-08 17:18:04 -06:00
Justin Goshi
5e3f368338 Update the test 2017-02-08 14:26:14 -08:00
Justin Goshi
c0da70adf6 Merge branch 'rel/1.0.0' into dev/jgoshi/deprecatedMigrate 2017-02-08 14:03:03 -08:00
Justin Goshi
50493d2dab Address PR comments 2017-02-08 14:02:29 -08:00
Justin Goshi
d51bfd1bea Merge branch 'master' into dev/jgoshi/firstPassProps 2017-02-08 11:57:58 -08:00
Eric Erhardt
546d62061a Merge branch 'master' into rel100toMaster 2017-02-08 12:30:32 -06:00
Eric Erhardt
56d391caad Fix up the merge so it gets past Prepare and Compile. 2017-02-08 12:26:04 -06:00
Piotr Puszkiewicz
eebd77efe3 Merge pull request #5615 from jchannon/patch-3 
Change preview4 references to RC4
 2017-02-08 09:21:06 -08:00
Piotr Puszkiewicz
a9e734050e Merge pull request #5623 from piotrpMSFT/piotrpMSFT/infra/omnisharp 
Remove project.json-based omnisharp.json
 2017-02-08 09:17:59 -08:00
Piotr Puszkiewicz
0f711d9aaa Merge pull request #5620 from piotrpMSFT/piotrpMSFT/infra/removeStage1 
Remove Stage1 compilation
 2017-02-08 09:17:26 -08:00
Rohit Agrawal
6d492a9ab1 Update Microsoft.DotNet.Cli.DependencyVersions.props 2017-02-08 08:25:30 -08:00
Eric Erhardt
8e2a7bfa12 Fix the CLI .sln file to load and build in VS 2017. 2017-02-08 10:03:06 -06:00
Justin Goshi
50c10decf5 Migrate compilationOptions 2017-02-08 00:20:04 -08:00
Piotr Puszkiewicz
4b55081428 Remove project.json-based omnisharp.json 2017-02-07 23:26:29 -08:00
Piotr Puszkiewicz
13cca61c2a Merge branch 'rel/1.0.0' into patch-3 2017-02-07 22:36:11 -08:00
Piotr Puszkiewicz
211255d6c4 Remove Stage1 compilation 2017-02-07 19:41:45 -08:00
Piotr Puszkiewicz
18c01886cd Merge pull request #5613 from dotnet/emgarten/testFixes 
Removing extra PackageReference workaround for tests
 2017-02-07 18:29:34 -08:00
Justin Goshi
2b15651716 Trying to fix the build breaks first 2017-02-07 17:34:41 -08:00
Eric Erhardt
33294e494c Merge pull request #5597 from eerhardt/UpdateREADME 
Update the daily build table.
 2017-02-07 19:20:23 -06:00
Justin Goshi
b927922b65 Address PR comments and fix build break 2017-02-07 16:52:08 -08:00
Justin Goshi
83b46ebc17 Generate host and build info and store them in .props files 2017-02-07 15:45:19 -08:00
Jonathan Channon
cc191f61b3 Change preview4 references to RC4 
Preview4 is actually RC4 as all documentation and dotnet --info shows. I thought they were 2 separate things.
 2017-02-07 23:11:13 +00:00
Justin Emgarten
1c256d7c56 Removing extra PackageReference workaround for tests 
Fixes https://github.com/NuGet/Home/issues/4416
 2017-02-07 14:31:27 -08:00
Piotr Puszkiewicz
d881d45b75 Merge pull request #5609 from piotrpMSFT/piotrpmsft/infra/msiincrementaltiy 
Add incrementality check for MSI generation
 2017-02-07 11:28:07 -08:00
Piotr Puszkiewicz
0a634d5174 Add incrementality check for MSI generation 2017-02-07 10:56:06 -08:00
Piotr Puszkiewicz
5612b8b25f Merge pull request #5608 from dotnet/piotrpMSFT-patch-1 
Update README.md
 2017-02-07 10:23:25 -08:00
Piotr Puszkiewicz
b38934b4e8 Update README.md 2017-02-07 10:22:21 -08:00
jonsequitur
161b10d0d0 WIP 2017-02-07 10:08:14 -08:00
Livar
4228198f0e Merge pull request #5603 from mlorbetske/dev/mlorbe/Issue5602-RemoveRazorPrecompilation 
Update template engine templates version to absorb the fix for #5602
 2017-02-06 15:27:27 -08:00
Eric Erhardt
da15d5435f Merge pull request #5601 from eerhardt/FixMaster 
A few small fixes in master
 2017-02-06 15:55:07 -06:00
Mike Lorbetske
947fbfbd5b Update template engine templates version to absorb the fix 2017-02-06 13:55:05 -08:00
Eric Erhardt
8bab104956 Remove workaround for https://github.com/dotnet/standard/issues/191. 2017-02-06 14:44:51 -06:00
Piotr Puszkiewicz
b0a5d53ed5 Merge rel/1.0.0 to master 2017-02-06 12:43:57 -08:00