mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge remote-tracking branch 'upstream/rel/1.0.0' into rel101

Browse source
This commit is contained in:
Eric Erhardt 2017-02-25 14:30:53 -06:00
commit ab887ec024
31 changed files with 1349 additions and 323 deletions
Download patch file Download diff file Expand all files Collapse all files

0
TestAssets/NonRestoredTestProjects/PJDeprecatedContent/ContentFile1.txt → TestAssets/NonRestoredTestProjects/PJDeprecatedContent/project/ContentFile1.txt1
View file

0
TestAssets/NonRestoredTestProjects/PJDeprecatedContent/ContentFile2.txt → TestAssets/NonRestoredTestProjects/PJDeprecatedContent/project/ContentFile2.txt1
View file

0
TestAssets/NonRestoredTestProjects/PJDeprecatedContent/ContentFileBuiltIn1.txt → TestAssets/NonRestoredTestProjects/PJDeprecatedContent/project/ContentFileBuiltIn1.txt1
View file

0
TestAssets/NonRestoredTestProjects/PJDeprecatedContent/ContentFileBuiltIn2.txt → TestAssets/NonRestoredTestProjects/PJDeprecatedContent/project/ContentFileBuiltIn2.txt1
View file

4
TestAssets/NonRestoredTestProjects/PJDeprecatedContent/project/project.json
View file

@ -2,8 +2,8 @@
"version": "1.0.0-*",
"content": "*.txt",
"contentExclude": "ExcludeThis1.txt",
"contentFiles": [ "../ContentFile1.txt", "../ContentFile2.txt" ],
"contentBuiltIn": [ "../ContentFileBuiltIn1.txt", "../ContentFileBuiltIn2.txt" ],
"contentFiles": [ "ContentFile1.txt1", "ContentFile2.txt1" ],
"contentBuiltIn": [ "ContentFileBuiltIn1.txt1", "ContentFileBuiltIn2.txt1" ],
"publishExclude": "ExcludeThis2.txt",
"buildOptions": {
"debugType": "portable",