Skip to content

Bulk suppression performance fixes #6093

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
mavasani wants to merge 71 commits into from
Closed

Bulk suppression performance fixes #6093

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
71 commits
Select commit Hold shift + click to select a range
47dfe82
Fix for #5760
Oct 9, 2015
4d9c197
Removed accidental comment
Oct 12, 2015
2d989e2
Switch our CoreCLR projects to be ".NETPortable,v5.0"
Pilchie Oct 7, 2015
4113bb0
provide HelpKeyword information for offline help
heejaechang Oct 13, 2015
cd5481d
When renaming a VB form, cascade to the synthesized compiler "My" pro…
CyrusNajmabadi Oct 13, 2015
67632d2
Formatting
CyrusNajmabadi Oct 13, 2015
ea92e95
Change check to assert.
CyrusNajmabadi Oct 13, 2015
2fe85c4
Make the Type/Property cascading symmetric
CyrusNajmabadi Oct 13, 2015
29b6698
Add copyright headers
CyrusNajmabadi Oct 13, 2015
e44686f
Fix formatting of omitted arguments on their own line
Pilchie Oct 13, 2015
c303d63
Merge branch 'master' into renameVBForm
CyrusNajmabadi Oct 13, 2015
c183420
PR feedback
CyrusNajmabadi Oct 13, 2015
32f1852
Simplify the mechnanism for all languages to extend how we cascade be…
CyrusNajmabadi Oct 13, 2015
a074cae
Merge branch 'master' into renameVBForm
CyrusNajmabadi Oct 14, 2015
25d5681
Remove blank line
CyrusNajmabadi Oct 14, 2015
88f3693
Add comment
CyrusNajmabadi Oct 14, 2015
e719770
Add outdir parameter to BuildNuGets.csx
agocke Oct 13, 2015
32dc51b
Respond to PR comments
agocke Oct 14, 2015
469062c
Merge branch 'master' into renameVBForm
CyrusNajmabadi Oct 14, 2015
ed72ef8
Allow simple property assignments in expression tree lambdas in VB
VSadov Oct 14, 2015
5030bc2
Add proper null check.
CyrusNajmabadi Oct 14, 2015
bbcc616
Added check for the tree shape
VSadov Oct 14, 2015
21ca5b7
Added a test with parameterized property
VSadov Oct 14, 2015
a0bac7e
Fix null ref.
CyrusNajmabadi Oct 14, 2015
1a5178c
Merge pull request #5922 from CyrusNajmabadi/renameVBForm
CyrusNajmabadi Oct 15, 2015
d0c0f54
Merge branch 'stabilization'
tannergooding Oct 15, 2015
995ff71
Merge pull request #5939 from agocke/AddOutputDirToBuildNuGetsCsx
agocke Oct 15, 2015
2ab7ec4
Couple of fixes for bulk suppression:
mavasani Oct 15, 2015
41a313f
Undo shorter expression form
Oct 15, 2015
016c867
Add missing linebreak at eof
Oct 15, 2015
0b0ca9c
Fix error BC36005: 'ElseIf' must be preceded by a matching 'If' or 'E…
Oct 15, 2015
be5650f
Merge pull request #5958 from heejaechang/unusedusings
heejaechang Oct 15, 2015
2c40da2
Merge pull request #5980 from VSadov/fix4524
VSadov Oct 15, 2015
9e947b4
Update netci.groovy to allow all jobs to automatically process again.
tannergooding Oct 15, 2015
0b1e58b
Updating RoslynSemanticVersion to 1.2
tannergooding Oct 15, 2015
a4290a6
Merge pull request #5996 from tannergooding/master
tannergooding Oct 15, 2015
c3e4799
Updating TestRunner to sort unit test assemblies by size.
tannergooding Oct 15, 2015
6405563
Merge pull request #5928 from Pilchie/Fix5207-OmittedArgument-2
Pilchie Oct 15, 2015
1cb101e
Update the mono drops to include portable v5.0
agocke Oct 15, 2015
a9fb96f
Merge pull request #6003 from tannergooding/master
tannergooding Oct 15, 2015
aadfccf
Updating the TestRunner to always create the log folder.
tannergooding Oct 15, 2015
0df0937
Merge pull request #6011 from tannergooding/master
tannergooding Oct 15, 2015
e03c296
Unskip code model tests
DustinCampbell Oct 15, 2015
0920a47
Add back unit test that got removed
DustinCampbell Oct 15, 2015
0a0972f
Update TestRunner.cs to properly create the parent directory instead …
tannergooding Oct 15, 2015
3c14b04
Introduce new xunit performance tests
pharring Oct 15, 2015
36e3d45
Merge remote-tracking branch 'origin/master' into NewPerfTests
pharring Oct 15, 2015
162b8cf
Update CIBuild.sh to properly create the xUnitResults subfolder and p…
tannergooding Oct 15, 2015
01cf419
Add VB perf tests to Compilers.sln
pharring Oct 15, 2015
9461ea2
Once again
mattwar Oct 15, 2015
b015e63
made CreateExportProviderWithCSharpAndVisualBasic to truely create ne…
heejaechang Oct 16, 2015
30cca80
Changed "tests" -> "test assemblies" to better reflect what the test …
davkean Oct 16, 2015
e0734a8
Merge pull request #5907 from heejaechang/errorkeyword
heejaechang Oct 16, 2015
d65c130
Merge pull request #6004 from agocke/UsePortable50
agocke Oct 16, 2015
46840ea
Use CallerInfoPath instead of reflection to find script root
agocke Oct 16, 2015
b97d0b4
fixed null exception
heejaechang Oct 16, 2015
be589cc
Merge pull request #6021 from DustinCampbell/unskip-code-model-tests
DustinCampbell Oct 16, 2015
f7f8076
Merge pull request #6025 from pharring/NewPerfTests
pharring Oct 16, 2015
92d75cb
Update toolset compiler to 1.1.0-rc1-20151014-05
agocke Oct 14, 2015
fc8adfe
Update project.lock.json
agocke Oct 16, 2015
b8c4beb
Merge pull request #5822 from bkoelman/simplify-code
tannergooding Oct 16, 2015
b83bb11
Merge pull request #6050 from davkean/dev/davkean/testrunner
davkean Oct 16, 2015
b464d93
Merge remote-tracking branch 'origin/stabilization'
tannergooding Oct 16, 2015
4f73156
Change AppConfigBasicFail to use a drive that is connected
davkean Oct 16, 2015
06a60e2
Merge pull request #6019 from mattwar/Bug6012
mattwar Oct 16, 2015
b032971
Merge pull request #5981 from agocke/UpdateToolsetCompiler
agocke Oct 16, 2015
f43b7f0
This change adddress the performance issues for baselining/bulk suppr…
mavasani Oct 16, 2015
50bdd8e
Merge pull request #6063 from heejaechang/workspaceworker
heejaechang Oct 16, 2015
3db8d29
Merge pull request #6086 from davkean/dev/davkean/testrun
davkean Oct 16, 2015
6c2c0d6
Fix some formatting and comments.
mavasani Oct 16, 2015
e36b2a5
Sync to latest sources
mavasani Oct 16, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 47 additions & 2 deletions Compilers.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,16 +99,19 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VbcCore", "src\Compilers\Vi
EndProject
Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "TestUtilities.Shared", "src\Test\Utilities\Shared\TestUtilities.Shared.shproj", "{6FF42825-5464-4151-AC55-ED828168C192}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CSharpCompilerPerformanceTest", "src\Compilers\CSharp\Test\Performance\CSharpCompilerPerformanceTest.csproj", "{ECBB1F28-2672-4344-8CB3-83882F291739}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MSBuildTaskTests", "src\Compilers\Core\MSBuildTaskTests\MSBuildTaskTests.csproj", "{1DFEA9C5-973C-4179-9B1B-0F32288E1EF2}"
EndProject
Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "BasicCompilerPerformanceTest", "src\Compilers\VisualBasic\Test\Performance\BasicCompilerPerformanceTest.vbproj", "{0835A7FB-C472-4F7D-A500-F9FD072CFF21}"
EndProject
Global
GlobalSection(SharedMSBuildProjectFiles) = preSolution
src\Test\Utilities\Shared\TestUtilities.projitems*{6ff42825-5464-4151-ac55-ed828168c192}*SharedItemsImports = 13
src\Test\Utilities\Shared\TestUtilities.projitems*{f7712928-1175-47b3-8819-ee086753dee2}*SharedItemsImports = 4
src\Compilers\Core\AnalyzerDriver\AnalyzerDriver.projitems*{d0bc9be7-24f6-40ca-8dc6-fcb93bd44b34}*SharedItemsImports = 13
src\Compilers\Core\SharedCollections\SharedCollections.projitems*{afde6bea-5038-4a4a-a88e-dbd2e4088eed}*SharedItemsImports = 4
src\Compilers\Core\SharedCollections\SharedCollections.projitems*{1ee8cad3-55f9-4d91-96b2-084641da9a6c}*SharedItemsImports = 4
src\Compilers\Core\AnalyzerDriver\AnalyzerDriver.projitems*{1ee8cad3-55f9-4d91-96b2-084641da9a6c}*SharedItemsImports = 4
src\Compilers\Core\SharedCollections\SharedCollections.projitems*{1ee8cad3-55f9-4d91-96b2-084641da9a6c}*SharedItemsImports = 4
src\Compilers\CSharp\CSharpAnalyzerDriver\CSharpAnalyzerDriver.projitems*{b501a547-c911-4a05-ac6e-274a50dff30e}*SharedItemsImports = 4
src\Compilers\VisualBasic\BasicAnalyzerDriver\BasicAnalyzerDriver.projitems*{2523d0e6-df32-4a3e-8ae0-a19bffae2ef6}*SharedItemsImports = 4
src\Compilers\Core\SharedCollections\SharedCollections.projitems*{c1930979-c824-496b-a630-70f5369a636f}*SharedItemsImports = 13
Expand Down Expand Up @@ -849,6 +852,26 @@ Global
{8CE3A581-2969-4864-A803-013E9D977C3A}.Release|x64.ActiveCfg = Release|x64
{8CE3A581-2969-4864-A803-013E9D977C3A}.Release|x64.Build.0 = Release|x64
{8CE3A581-2969-4864-A803-013E9D977C3A}.Release|x86.ActiveCfg = Release|x64
{ECBB1F28-2672-4344-8CB3-83882F291739}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{ECBB1F28-2672-4344-8CB3-83882F291739}.Debug|Any CPU.Build.0 = Debug|Any CPU
{ECBB1F28-2672-4344-8CB3-83882F291739}.Debug|ARM.ActiveCfg = Debug|Any CPU
{ECBB1F28-2672-4344-8CB3-83882F291739}.Debug|ARM.Build.0 = Debug|Any CPU
{ECBB1F28-2672-4344-8CB3-83882F291739}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{ECBB1F28-2672-4344-8CB3-83882F291739}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{ECBB1F28-2672-4344-8CB3-83882F291739}.Debug|x64.ActiveCfg = Debug|Any CPU
{ECBB1F28-2672-4344-8CB3-83882F291739}.Debug|x64.Build.0 = Debug|Any CPU
{ECBB1F28-2672-4344-8CB3-83882F291739}.Debug|x86.ActiveCfg = Debug|Any CPU
{ECBB1F28-2672-4344-8CB3-83882F291739}.Debug|x86.Build.0 = Debug|Any CPU
{ECBB1F28-2672-4344-8CB3-83882F291739}.Release|Any CPU.ActiveCfg = Release|Any CPU
{ECBB1F28-2672-4344-8CB3-83882F291739}.Release|Any CPU.Build.0 = Release|Any CPU
{ECBB1F28-2672-4344-8CB3-83882F291739}.Release|ARM.ActiveCfg = Release|Any CPU
{ECBB1F28-2672-4344-8CB3-83882F291739}.Release|ARM.Build.0 = Release|Any CPU
{ECBB1F28-2672-4344-8CB3-83882F291739}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{ECBB1F28-2672-4344-8CB3-83882F291739}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{ECBB1F28-2672-4344-8CB3-83882F291739}.Release|x64.ActiveCfg = Release|Any CPU
{ECBB1F28-2672-4344-8CB3-83882F291739}.Release|x64.Build.0 = Release|Any CPU
{ECBB1F28-2672-4344-8CB3-83882F291739}.Release|x86.ActiveCfg = Release|Any CPU
{ECBB1F28-2672-4344-8CB3-83882F291739}.Release|x86.Build.0 = Release|Any CPU
{1DFEA9C5-973C-4179-9B1B-0F32288E1EF2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{1DFEA9C5-973C-4179-9B1B-0F32288E1EF2}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1DFEA9C5-973C-4179-9B1B-0F32288E1EF2}.Debug|ARM.ActiveCfg = Debug|ARM
Expand All @@ -869,6 +892,26 @@ Global
{1DFEA9C5-973C-4179-9B1B-0F32288E1EF2}.Release|x64.Build.0 = Release|x64
{1DFEA9C5-973C-4179-9B1B-0F32288E1EF2}.Release|x86.ActiveCfg = Release|Any CPU
{1DFEA9C5-973C-4179-9B1B-0F32288E1EF2}.Release|x86.Build.0 = Release|Any CPU
{0835A7FB-C472-4F7D-A500-F9FD072CFF21}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{0835A7FB-C472-4F7D-A500-F9FD072CFF21}.Debug|Any CPU.Build.0 = Debug|Any CPU
{0835A7FB-C472-4F7D-A500-F9FD072CFF21}.Debug|ARM.ActiveCfg = Debug|Any CPU
{0835A7FB-C472-4F7D-A500-F9FD072CFF21}.Debug|ARM.Build.0 = Debug|Any CPU
{0835A7FB-C472-4F7D-A500-F9FD072CFF21}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{0835A7FB-C472-4F7D-A500-F9FD072CFF21}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{0835A7FB-C472-4F7D-A500-F9FD072CFF21}.Debug|x64.ActiveCfg = Debug|Any CPU
{0835A7FB-C472-4F7D-A500-F9FD072CFF21}.Debug|x64.Build.0 = Debug|Any CPU
{0835A7FB-C472-4F7D-A500-F9FD072CFF21}.Debug|x86.ActiveCfg = Debug|Any CPU
{0835A7FB-C472-4F7D-A500-F9FD072CFF21}.Debug|x86.Build.0 = Debug|Any CPU
{0835A7FB-C472-4F7D-A500-F9FD072CFF21}.Release|Any CPU.ActiveCfg = Release|Any CPU
{0835A7FB-C472-4F7D-A500-F9FD072CFF21}.Release|Any CPU.Build.0 = Release|Any CPU
{0835A7FB-C472-4F7D-A500-F9FD072CFF21}.Release|ARM.ActiveCfg = Release|Any CPU
{0835A7FB-C472-4F7D-A500-F9FD072CFF21}.Release|ARM.Build.0 = Release|Any CPU
{0835A7FB-C472-4F7D-A500-F9FD072CFF21}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{0835A7FB-C472-4F7D-A500-F9FD072CFF21}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{0835A7FB-C472-4F7D-A500-F9FD072CFF21}.Release|x64.ActiveCfg = Release|Any CPU
{0835A7FB-C472-4F7D-A500-F9FD072CFF21}.Release|x64.Build.0 = Release|Any CPU
{0835A7FB-C472-4F7D-A500-F9FD072CFF21}.Release|x86.ActiveCfg = Release|Any CPU
{0835A7FB-C472-4F7D-A500-F9FD072CFF21}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down Expand Up @@ -914,6 +957,8 @@ Global
{E3CD2895-76A8-4D11-A316-EA67CB5EA42C} = {32A48625-F0AD-419D-828B-A50BDABA38EA}
{8CE3A581-2969-4864-A803-013E9D977C3A} = {C65C6143-BED3-46E6-869E-9F0BE6E84C37}
{6FF42825-5464-4151-AC55-ED828168C192} = {A41D1B99-F489-4C43-BBDF-96D61B19A6B9}
{ECBB1F28-2672-4344-8CB3-83882F291739} = {32A48625-F0AD-419D-828B-A50BDABA38EA}
{1DFEA9C5-973C-4179-9B1B-0F32288E1EF2} = {A41D1B99-F489-4C43-BBDF-96D61B19A6B9}
{0835A7FB-C472-4F7D-A500-F9FD072CFF21} = {C65C6143-BED3-46E6-869E-9F0BE6E84C37}
EndGlobalSection
EndGlobal
69 changes: 69 additions & 0 deletions Roslyn.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,6 +300,12 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Diagnostics", "src\Test\Dia
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestRuntime.FX46", "src\Test\Utilities\Runtime.FX46\TestRuntime.FX46.csproj", "{23683607-168A-4189-955E-908F0E80E60D}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CSharpCompilerPerformanceTest", "src\Compilers\CSharp\Test\Performance\CSharpCompilerPerformanceTest.csproj", "{ECBB1F28-2672-4344-8CB3-83882F291739}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Performance-Fixture", "src\Test\Performance\Fixture\Performance-Fixture.csproj", "{308CEBD4-418A-4C3B-97A5-24723B288157}"
EndProject
Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "BasicCompilerPerformanceTest", "src\Compilers\VisualBasic\Test\Performance\BasicCompilerPerformanceTest.vbproj", "{0835A7FB-C472-4F7D-A500-F9FD072CFF21}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CsiCore", "src\Interactive\CsiCore\CsiCore.csproj", "{D1B051A4-F2A1-4E97-9747-C41D13E475FD}"
EndProject
Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "VbiCore", "src\Interactive\VbiCore\VbiCore.vbproj", "{1EEFB4B6-A6CC-4869-AF05-A43C8B82A8FD}"
Expand Down Expand Up @@ -2632,6 +2638,66 @@ Global
{23683607-168A-4189-955E-908F0E80E60D}.Release|x64.Build.0 = Release|Any CPU
{23683607-168A-4189-955E-908F0E80E60D}.Release|x86.ActiveCfg = Release|Any CPU
{23683607-168A-4189-955E-908F0E80E60D}.Release|x86.Build.0 = Release|Any CPU
{ECBB1F28-2672-4344-8CB3-83882F291739}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{ECBB1F28-2672-4344-8CB3-83882F291739}.Debug|Any CPU.Build.0 = Debug|Any CPU
{ECBB1F28-2672-4344-8CB3-83882F291739}.Debug|ARM.ActiveCfg = Debug|Any CPU
{ECBB1F28-2672-4344-8CB3-83882F291739}.Debug|ARM.Build.0 = Debug|Any CPU
{ECBB1F28-2672-4344-8CB3-83882F291739}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{ECBB1F28-2672-4344-8CB3-83882F291739}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{ECBB1F28-2672-4344-8CB3-83882F291739}.Debug|x64.ActiveCfg = Debug|Any CPU
{ECBB1F28-2672-4344-8CB3-83882F291739}.Debug|x64.Build.0 = Debug|Any CPU
{ECBB1F28-2672-4344-8CB3-83882F291739}.Debug|x86.ActiveCfg = Debug|Any CPU
{ECBB1F28-2672-4344-8CB3-83882F291739}.Debug|x86.Build.0 = Debug|Any CPU
{ECBB1F28-2672-4344-8CB3-83882F291739}.Release|Any CPU.ActiveCfg = Release|Any CPU
{ECBB1F28-2672-4344-8CB3-83882F291739}.Release|Any CPU.Build.0 = Release|Any CPU
{ECBB1F28-2672-4344-8CB3-83882F291739}.Release|ARM.ActiveCfg = Release|Any CPU
{ECBB1F28-2672-4344-8CB3-83882F291739}.Release|ARM.Build.0 = Release|Any CPU
{ECBB1F28-2672-4344-8CB3-83882F291739}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{ECBB1F28-2672-4344-8CB3-83882F291739}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{ECBB1F28-2672-4344-8CB3-83882F291739}.Release|x64.ActiveCfg = Release|Any CPU
{ECBB1F28-2672-4344-8CB3-83882F291739}.Release|x64.Build.0 = Release|Any CPU
{ECBB1F28-2672-4344-8CB3-83882F291739}.Release|x86.ActiveCfg = Release|Any CPU
{ECBB1F28-2672-4344-8CB3-83882F291739}.Release|x86.Build.0 = Release|Any CPU
{308CEBD4-418A-4C3B-97A5-24723B288157}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{308CEBD4-418A-4C3B-97A5-24723B288157}.Debug|Any CPU.Build.0 = Debug|Any CPU
{308CEBD4-418A-4C3B-97A5-24723B288157}.Debug|ARM.ActiveCfg = Debug|ARM
{308CEBD4-418A-4C3B-97A5-24723B288157}.Debug|ARM.Build.0 = Debug|ARM
{308CEBD4-418A-4C3B-97A5-24723B288157}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{308CEBD4-418A-4C3B-97A5-24723B288157}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{308CEBD4-418A-4C3B-97A5-24723B288157}.Debug|x64.ActiveCfg = Debug|x64
{308CEBD4-418A-4C3B-97A5-24723B288157}.Debug|x64.Build.0 = Debug|x64
{308CEBD4-418A-4C3B-97A5-24723B288157}.Debug|x86.ActiveCfg = Debug|Any CPU
{308CEBD4-418A-4C3B-97A5-24723B288157}.Debug|x86.Build.0 = Debug|Any CPU
{308CEBD4-418A-4C3B-97A5-24723B288157}.Release|Any CPU.ActiveCfg = Release|Any CPU
{308CEBD4-418A-4C3B-97A5-24723B288157}.Release|Any CPU.Build.0 = Release|Any CPU
{308CEBD4-418A-4C3B-97A5-24723B288157}.Release|ARM.ActiveCfg = Release|ARM
{308CEBD4-418A-4C3B-97A5-24723B288157}.Release|ARM.Build.0 = Release|ARM
{308CEBD4-418A-4C3B-97A5-24723B288157}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{308CEBD4-418A-4C3B-97A5-24723B288157}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{308CEBD4-418A-4C3B-97A5-24723B288157}.Release|x64.ActiveCfg = Release|x64
{308CEBD4-418A-4C3B-97A5-24723B288157}.Release|x64.Build.0 = Release|x64
{308CEBD4-418A-4C3B-97A5-24723B288157}.Release|x86.ActiveCfg = Release|Any CPU
{308CEBD4-418A-4C3B-97A5-24723B288157}.Release|x86.Build.0 = Release|Any CPU
{0835A7FB-C472-4F7D-A500-F9FD072CFF21}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{0835A7FB-C472-4F7D-A500-F9FD072CFF21}.Debug|Any CPU.Build.0 = Debug|Any CPU
{0835A7FB-C472-4F7D-A500-F9FD072CFF21}.Debug|ARM.ActiveCfg = Debug|Any CPU
{0835A7FB-C472-4F7D-A500-F9FD072CFF21}.Debug|ARM.Build.0 = Debug|Any CPU
{0835A7FB-C472-4F7D-A500-F9FD072CFF21}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{0835A7FB-C472-4F7D-A500-F9FD072CFF21}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{0835A7FB-C472-4F7D-A500-F9FD072CFF21}.Debug|x64.ActiveCfg = Debug|Any CPU
{0835A7FB-C472-4F7D-A500-F9FD072CFF21}.Debug|x64.Build.0 = Debug|Any CPU
{0835A7FB-C472-4F7D-A500-F9FD072CFF21}.Debug|x86.ActiveCfg = Debug|Any CPU
{0835A7FB-C472-4F7D-A500-F9FD072CFF21}.Debug|x86.Build.0 = Debug|Any CPU
{0835A7FB-C472-4F7D-A500-F9FD072CFF21}.Release|Any CPU.ActiveCfg = Release|Any CPU
{0835A7FB-C472-4F7D-A500-F9FD072CFF21}.Release|Any CPU.Build.0 = Release|Any CPU
{0835A7FB-C472-4F7D-A500-F9FD072CFF21}.Release|ARM.ActiveCfg = Release|Any CPU
{0835A7FB-C472-4F7D-A500-F9FD072CFF21}.Release|ARM.Build.0 = Release|Any CPU
{0835A7FB-C472-4F7D-A500-F9FD072CFF21}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{0835A7FB-C472-4F7D-A500-F9FD072CFF21}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{0835A7FB-C472-4F7D-A500-F9FD072CFF21}.Release|x64.ActiveCfg = Release|Any CPU
{0835A7FB-C472-4F7D-A500-F9FD072CFF21}.Release|x64.Build.0 = Release|Any CPU
{0835A7FB-C472-4F7D-A500-F9FD072CFF21}.Release|x86.ActiveCfg = Release|Any CPU
{0835A7FB-C472-4F7D-A500-F9FD072CFF21}.Release|x86.Build.0 = Release|Any CPU
{D1B051A4-F2A1-4E97-9747-C41D13E475FD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{D1B051A4-F2A1-4E97-9747-C41D13E475FD}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D1B051A4-F2A1-4E97-9747-C41D13E475FD}.Debug|ARM.ActiveCfg = Debug|Any CPU
Expand Down Expand Up @@ -2811,6 +2877,9 @@ Global
{ABC7262E-1053-49F3-B846-E3091BB92E8C} = {38940C5F-97FD-4B2A-B2CD-C4E4EF601B05}
{E2E889A5-2489-4546-9194-47C63E49EAEB} = {8DBA5174-B0AA-4561-82B1-A46607697753}
{23683607-168A-4189-955E-908F0E80E60D} = {A41D1B99-F489-4C43-BBDF-96D61B19A6B9}
{ECBB1F28-2672-4344-8CB3-83882F291739} = {32A48625-F0AD-419D-828B-A50BDABA38EA}
{308CEBD4-418A-4C3B-97A5-24723B288157} = {A41D1B99-F489-4C43-BBDF-96D61B19A6B9}
{0835A7FB-C472-4F7D-A500-F9FD072CFF21} = {C65C6143-BED3-46E6-869E-9F0BE6E84C37}
{D1B051A4-F2A1-4E97-9747-C41D13E475FD} = {5CA5F70E-0FDB-467B-B22C-3CD5994F0087}
{1EEFB4B6-A6CC-4869-AF05-A43C8B82A8FD} = {5CA5F70E-0FDB-467B-B22C-3CD5994F0087}
{E8F0BAA5-7327-43D1-9A51-644E81AE55F1} = {C65C6143-BED3-46E6-869E-9F0BE6E84C37}
Expand Down
43 changes: 33 additions & 10 deletions build/BuildNuGets.csx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,42 +2,65 @@ using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.IO;
using System.Reflection;
using System.Runtime.CompilerServices;

string usage = @"usage: BuildNuGets.csx <binaries-dir> <build-version>";
string usage = @"usage: BuildNuGets.csx <binaries-dir> <build-version> <output-directory>";

if (Args.Length != 2)
if (Args.Count() != 3)
{
Console.WriteLine(usage);
Environment.Exit(1);
}

var binDir = Path.GetFullPath(Args[0]);
string ScriptRoot([CallerFilePath]string path = "") => Path.GetDirectoryName(path);

var slnRoot = Path.GetFullPath(Path.Combine(ScriptRoot(), "../"));

// Strip trailing '\' characters because if the path is later passed on the
// command line when surrounded by quotes (in case the path has spaces) some
// utilities will consider the '\"' as an escape sequence for the end quote

var binDir = Path.GetFullPath(Args[0]).TrimEnd('\\');
var buildVersion = Args[1].Trim();
var nuspecDirPath = Path.GetFullPath("../../src/NuGet");
var nuspecDirPath = Path.GetFullPath(Path.Combine(slnRoot, "src/NuGet"));
var outDir = Path.GetFullPath(Args[2]).TrimEnd('\\');

var licenseUrl = @"http://go.microsoft.com/fwlink/?LinkId=529443";
var authors = @"Microsoft";
var projectURL = @"http://msdn.com/roslyn";
var tags = @"Roslyn CodeAnalysis Compiler CSharp VB VisualBasic Parser Scanner Lexer Emit CodeGeneration Metadata IL Compilation Scripting Syntax Semantics";

var files = Directory.GetFiles(nuspecDirPath, "*.nuspec");
var procs = new List<Process>(files.Length);

int exit = 0;

foreach (var file in files)
{
var nugetArgs = $@"pack {file} " +
$@"-BasePath ""{binDir}"" " +
$@"-OutputDirectory ""{outDir}"" " +
"-ExcludeEmptyDirectories " +
$@"-prop licenseUrl=""{licenseUrl}"" " +
$@"-prop version=""{buildVersion}"" " +
$"-prop authors={authors} " +
$@"-prop projectURL=""{projectURL}"" " +
$@"-prop tags=""{tags}""";
Console.WriteLine(nugetArgs);
var p = Process.Start(Path.GetFullPath("../../nuget.exe"), nugetArgs);
}
var nugetExePath = Path.GetFullPath(Path.Combine(slnRoot, "nuget.exe"));
var p = new Process();
p.StartInfo.FileName = nugetExePath;
p.StartInfo.Arguments = nugetArgs;
p.StartInfo.UseShellExecute = false;

foreach (var p in procs)
{
Console.WriteLine($"Running: nuget.exe {nugetArgs}");
p.Start();
p.WaitForExit();
exit = p.ExitCode;

if (exit != 0)
{
break;
}
}

Environment.Exit(exit);
33 changes: 9 additions & 24 deletions build/Targets/VSL.Imports.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,30 +49,6 @@
</When>
</Choose>

<!-- Work around mono + msbuild bug https://github.com/Microsoft/msbuild/issues/191 -->
<PropertyGroup Condition="'$(TargetFrameworkIdentifier)' == 'DNXCore' and '$(OS)' != 'Windows_NT'">
<!-- Manually set assembly search paths so they don't get mangled later -->
<AssemblySearchPaths Condition=" '$(AssemblySearchPaths)' == ''">
{RawFileName};
$(OutDir)
</AssemblySearchPaths>
<RemoveAssemblyFoldersIfNoTargetFramework>false</RemoveAssemblyFoldersIfNoTargetFramework>
</PropertyGroup>

<!-- Work around issue in dotnet/roslyn issue #5213
Since MSBuild wants a reference assembly location and DNXCore doesn't have one,
trick MSBuild into using the .NETPortable,v5.0 reference assembly path which happens
to have the same set of reference assemblies as DNXCore (i.e., none). -->
<PropertyGroup Condition="'$(TargetFrameworkIdentifier)' == 'DNXCore'">
<_TargetFrameworkDirectories>$([System.String]::Join(";", $([Microsoft.Build.Utilities.ToolLocationHelper]::GetPathToReferenceAssemblies(".NETPortable", "v5.0", ""))))</_TargetFrameworkDirectories>
<_FullFrameworkReferenceAssemblyPaths>$(_TargetFrameworkDirectories)</_FullFrameworkReferenceAssemblyPaths>
</PropertyGroup>

<PropertyGroup Condition="'$(TargetFrameworkIdentifier)' == 'DNXCore'">
<BaseNuGetRuntimeIdentifier Condition="'$(OS)' == 'Windows_NT'">win7</BaseNuGetRuntimeIdentifier>
<BaseNuGetRuntimeIdentifier Condition="'$(OS)' == 'Unix'">ubuntu.14.04</BaseNuGetRuntimeIdentifier>
</PropertyGroup>

<Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.VisualBasic.targets"
Condition="'$(ProjectLanguage)' == 'VB' And '$(TargetFrameworkIdentifier)' == '.NETPortable'"/>
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets"
Expand All @@ -89,6 +65,15 @@
<Import Project="$(MSBuildExtensionsPath)\Microsoft\NuGet\Microsoft.NuGet.targets"
Condition="'$(OS)' != 'Windows_NT'" />

<PropertyGroup Condition="
'$(TargetFrameworkIdentifier)' == '.NETPortable' AND
'$(TargetFrameworkVersion)' == 'v5.0' AND
'$(OutputType)' == 'Exe'">
<NuGetTargetMoniker>DNXCore,Version=v5.0</NuGetTargetMoniker>
<BaseNuGetRuntimeIdentifier Condition="'$(OS)' == 'Windows_NT'">win7</BaseNuGetRuntimeIdentifier>
<BaseNuGetRuntimeIdentifier Condition="'$(OS)' == 'Unix'">ubuntu.14.04</BaseNuGetRuntimeIdentifier>
</PropertyGroup>

<!-- It looks like MSBuild has a bug on *nix where they aggressively
directory separators from '\' to '/', even when the '\'
is being used as an escape character in a define constant in VB.
Expand Down
Loading