diff --git a/.gitignore b/.gitignore index d65d9d2e06b..498550cff79 100644 --- a/.gitignore +++ b/.gitignore @@ -29,4 +29,6 @@ bin/ *.sdsettings *.DotSettings.user *.suo -.DS_Store \ No newline at end of file +.DS_Store +/.vs +/samples/AvalonEdit.Sample/.vs diff --git a/SharpDevelop.sln b/SharpDevelop.sln index 1de7a8d728d..aa0af2d5f9f 100644 --- a/SharpDevelop.sln +++ b/SharpDevelop.sln @@ -1,8 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2012 -# SharpDevelop 5.1 -VisualStudioVersion = 12.0.20827.3 +# Visual Studio 15 +VisualStudioVersion = 15.0.28010.2003 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Main", "Main", "{256F5C28-532C-44C0-8AB8-D8EC5E492E01}" EndProject @@ -195,330 +194,646 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Debugger.Core", "src\AddIns EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Debugger.AddIn", "src\AddIns\Debugger\Debugger.AddIn\Debugger.AddIn.csproj", "{EC06F96A-AEEC-49D6-B03D-AB87C6EB674C}" EndProject -Project("{00000000-0000-0000-0000-000000000000}") = "Tools", "src\Tools\Tools.build", "{3DF4060F-5EE0-41CF-8096-F27355FD5511}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tools", "src\Tools\Tools.csproj", "{C2777D59-5CB7-42F4-BF92-166DF88E8ACD}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU + Debug|x86 = Debug|x86 Release|Any CPU = Release|Any CPU + Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {B5F54272-49F0-40DB-845A-8D837875D3BA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {B5F54272-49F0-40DB-845A-8D837875D3BA}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B5F54272-49F0-40DB-845A-8D837875D3BA}.Debug|x86.ActiveCfg = Debug|Any CPU + {B5F54272-49F0-40DB-845A-8D837875D3BA}.Debug|x86.Build.0 = Debug|Any CPU {B5F54272-49F0-40DB-845A-8D837875D3BA}.Release|Any CPU.ActiveCfg = Release|Any CPU {B5F54272-49F0-40DB-845A-8D837875D3BA}.Release|Any CPU.Build.0 = Release|Any CPU + {B5F54272-49F0-40DB-845A-8D837875D3BA}.Release|x86.ActiveCfg = Release|Any CPU + {B5F54272-49F0-40DB-845A-8D837875D3BA}.Release|x86.Build.0 = Release|Any CPU {C3CBC8E3-81D8-4C5B-9941-DCCD12D50B1F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {C3CBC8E3-81D8-4C5B-9941-DCCD12D50B1F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {C3CBC8E3-81D8-4C5B-9941-DCCD12D50B1F}.Debug|x86.ActiveCfg = Debug|Any CPU + {C3CBC8E3-81D8-4C5B-9941-DCCD12D50B1F}.Debug|x86.Build.0 = Debug|Any CPU {C3CBC8E3-81D8-4C5B-9941-DCCD12D50B1F}.Release|Any CPU.ActiveCfg = Release|Any CPU {C3CBC8E3-81D8-4C5B-9941-DCCD12D50B1F}.Release|Any CPU.Build.0 = Release|Any CPU + {C3CBC8E3-81D8-4C5B-9941-DCCD12D50B1F}.Release|x86.ActiveCfg = Release|Any CPU + {C3CBC8E3-81D8-4C5B-9941-DCCD12D50B1F}.Release|x86.Build.0 = Release|Any CPU {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}.Debug|x86.ActiveCfg = Debug|Any CPU + {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}.Debug|x86.Build.0 = Debug|Any CPU {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}.Release|Any CPU.ActiveCfg = Release|Any CPU {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}.Release|Any CPU.Build.0 = Release|Any CPU + {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}.Release|x86.ActiveCfg = Release|Any CPU + {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}.Release|x86.Build.0 = Release|Any CPU {7E4A7172-7FF5-48D0-B719-7CD959DD1AC9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {7E4A7172-7FF5-48D0-B719-7CD959DD1AC9}.Debug|Any CPU.Build.0 = Debug|Any CPU + {7E4A7172-7FF5-48D0-B719-7CD959DD1AC9}.Debug|x86.ActiveCfg = Debug|Any CPU + {7E4A7172-7FF5-48D0-B719-7CD959DD1AC9}.Debug|x86.Build.0 = Debug|Any CPU {7E4A7172-7FF5-48D0-B719-7CD959DD1AC9}.Release|Any CPU.ActiveCfg = Release|Any CPU {7E4A7172-7FF5-48D0-B719-7CD959DD1AC9}.Release|Any CPU.Build.0 = Release|Any CPU + {7E4A7172-7FF5-48D0-B719-7CD959DD1AC9}.Release|x86.ActiveCfg = Release|Any CPU + {7E4A7172-7FF5-48D0-B719-7CD959DD1AC9}.Release|x86.Build.0 = Release|Any CPU {857CA1A3-FC88-4BE0-AB6A-D1EE772AB288}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {857CA1A3-FC88-4BE0-AB6A-D1EE772AB288}.Debug|Any CPU.Build.0 = Debug|Any CPU + {857CA1A3-FC88-4BE0-AB6A-D1EE772AB288}.Debug|x86.ActiveCfg = Debug|Any CPU + {857CA1A3-FC88-4BE0-AB6A-D1EE772AB288}.Debug|x86.Build.0 = Debug|Any CPU {857CA1A3-FC88-4BE0-AB6A-D1EE772AB288}.Release|Any CPU.ActiveCfg = Release|Any CPU {857CA1A3-FC88-4BE0-AB6A-D1EE772AB288}.Release|Any CPU.Build.0 = Release|Any CPU + {857CA1A3-FC88-4BE0-AB6A-D1EE772AB288}.Release|x86.ActiveCfg = Release|Any CPU + {857CA1A3-FC88-4BE0-AB6A-D1EE772AB288}.Release|x86.Build.0 = Release|Any CPU {2748AD25-9C63-4E12-877B-4DCE96FBED54}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {2748AD25-9C63-4E12-877B-4DCE96FBED54}.Debug|Any CPU.Build.0 = Debug|Any CPU + {2748AD25-9C63-4E12-877B-4DCE96FBED54}.Debug|x86.ActiveCfg = Debug|Any CPU + {2748AD25-9C63-4E12-877B-4DCE96FBED54}.Debug|x86.Build.0 = Debug|Any CPU {2748AD25-9C63-4E12-877B-4DCE96FBED54}.Release|Any CPU.ActiveCfg = Release|Any CPU {2748AD25-9C63-4E12-877B-4DCE96FBED54}.Release|Any CPU.Build.0 = Release|Any CPU + {2748AD25-9C63-4E12-877B-4DCE96FBED54}.Release|x86.ActiveCfg = Release|Any CPU + {2748AD25-9C63-4E12-877B-4DCE96FBED54}.Release|x86.Build.0 = Release|Any CPU {8035765F-D51F-4A0C-A746-2FD100E19419}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {8035765F-D51F-4A0C-A746-2FD100E19419}.Debug|Any CPU.Build.0 = Debug|Any CPU + {8035765F-D51F-4A0C-A746-2FD100E19419}.Debug|x86.ActiveCfg = Debug|Any CPU + {8035765F-D51F-4A0C-A746-2FD100E19419}.Debug|x86.Build.0 = Debug|Any CPU {8035765F-D51F-4A0C-A746-2FD100E19419}.Release|Any CPU.ActiveCfg = Release|Any CPU {8035765F-D51F-4A0C-A746-2FD100E19419}.Release|Any CPU.Build.0 = Release|Any CPU + {8035765F-D51F-4A0C-A746-2FD100E19419}.Release|x86.ActiveCfg = Release|Any CPU + {8035765F-D51F-4A0C-A746-2FD100E19419}.Release|x86.Build.0 = Release|Any CPU {1152B71B-3C05-4598-B20D-823B5D40559E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {1152B71B-3C05-4598-B20D-823B5D40559E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {1152B71B-3C05-4598-B20D-823B5D40559E}.Debug|x86.ActiveCfg = Debug|Any CPU + {1152B71B-3C05-4598-B20D-823B5D40559E}.Debug|x86.Build.0 = Debug|Any CPU {1152B71B-3C05-4598-B20D-823B5D40559E}.Release|Any CPU.ActiveCfg = Release|Any CPU {1152B71B-3C05-4598-B20D-823B5D40559E}.Release|Any CPU.Build.0 = Release|Any CPU + {1152B71B-3C05-4598-B20D-823B5D40559E}.Release|x86.ActiveCfg = Release|Any CPU + {1152B71B-3C05-4598-B20D-823B5D40559E}.Release|x86.Build.0 = Release|Any CPU {6F273DA5-E10C-45A6-9071-7313ECD98C90}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {6F273DA5-E10C-45A6-9071-7313ECD98C90}.Debug|Any CPU.Build.0 = Debug|Any CPU + {6F273DA5-E10C-45A6-9071-7313ECD98C90}.Debug|x86.ActiveCfg = Debug|Any CPU + {6F273DA5-E10C-45A6-9071-7313ECD98C90}.Debug|x86.Build.0 = Debug|Any CPU {6F273DA5-E10C-45A6-9071-7313ECD98C90}.Release|Any CPU.ActiveCfg = Release|Any CPU {6F273DA5-E10C-45A6-9071-7313ECD98C90}.Release|Any CPU.Build.0 = Release|Any CPU + {6F273DA5-E10C-45A6-9071-7313ECD98C90}.Release|x86.ActiveCfg = Release|Any CPU + {6F273DA5-E10C-45A6-9071-7313ECD98C90}.Release|x86.Build.0 = Release|Any CPU {7BA66A6B-1ED8-4B4C-970C-8928E891418B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {7BA66A6B-1ED8-4B4C-970C-8928E891418B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {7BA66A6B-1ED8-4B4C-970C-8928E891418B}.Debug|x86.ActiveCfg = Debug|Any CPU + {7BA66A6B-1ED8-4B4C-970C-8928E891418B}.Debug|x86.Build.0 = Debug|Any CPU {7BA66A6B-1ED8-4B4C-970C-8928E891418B}.Release|Any CPU.ActiveCfg = Release|Any CPU {7BA66A6B-1ED8-4B4C-970C-8928E891418B}.Release|Any CPU.Build.0 = Release|Any CPU + {7BA66A6B-1ED8-4B4C-970C-8928E891418B}.Release|x86.ActiveCfg = Release|Any CPU + {7BA66A6B-1ED8-4B4C-970C-8928E891418B}.Release|x86.Build.0 = Release|Any CPU {D68133BD-1E63-496E-9EDE-4FBDBF77B486}.Debug|Any CPU.ActiveCfg = net_4_0_Debug|Any CPU {D68133BD-1E63-496E-9EDE-4FBDBF77B486}.Debug|Any CPU.Build.0 = net_4_0_Debug|Any CPU + {D68133BD-1E63-496E-9EDE-4FBDBF77B486}.Debug|x86.ActiveCfg = pcl_Debug|Any CPU + {D68133BD-1E63-496E-9EDE-4FBDBF77B486}.Debug|x86.Build.0 = pcl_Debug|Any CPU {D68133BD-1E63-496E-9EDE-4FBDBF77B486}.Release|Any CPU.ActiveCfg = net_4_0_Release|Any CPU {D68133BD-1E63-496E-9EDE-4FBDBF77B486}.Release|Any CPU.Build.0 = net_4_0_Release|Any CPU + {D68133BD-1E63-496E-9EDE-4FBDBF77B486}.Release|x86.ActiveCfg = pcl_Release|Any CPU + {D68133BD-1E63-496E-9EDE-4FBDBF77B486}.Release|x86.Build.0 = pcl_Release|Any CPU {3B2A5653-EC97-4001-BB9B-D90F1AF2C371}.Debug|Any CPU.ActiveCfg = net_4_5_Debug|Any CPU {3B2A5653-EC97-4001-BB9B-D90F1AF2C371}.Debug|Any CPU.Build.0 = net_4_5_Debug|Any CPU + {3B2A5653-EC97-4001-BB9B-D90F1AF2C371}.Debug|x86.ActiveCfg = Debug|Any CPU + {3B2A5653-EC97-4001-BB9B-D90F1AF2C371}.Debug|x86.Build.0 = Debug|Any CPU {3B2A5653-EC97-4001-BB9B-D90F1AF2C371}.Release|Any CPU.ActiveCfg = net_4_5_Release|Any CPU {3B2A5653-EC97-4001-BB9B-D90F1AF2C371}.Release|Any CPU.Build.0 = net_4_5_Release|Any CPU + {3B2A5653-EC97-4001-BB9B-D90F1AF2C371}.Release|x86.ActiveCfg = Release|Any CPU + {3B2A5653-EC97-4001-BB9B-D90F1AF2C371}.Release|x86.Build.0 = Release|Any CPU {53DCA265-3C3C-42F9-B647-F72BA678122B}.Debug|Any CPU.ActiveCfg = net_4_5_Debug|Any CPU {53DCA265-3C3C-42F9-B647-F72BA678122B}.Debug|Any CPU.Build.0 = net_4_5_Debug|Any CPU + {53DCA265-3C3C-42F9-B647-F72BA678122B}.Debug|x86.ActiveCfg = Debug|Any CPU + {53DCA265-3C3C-42F9-B647-F72BA678122B}.Debug|x86.Build.0 = Debug|Any CPU {53DCA265-3C3C-42F9-B647-F72BA678122B}.Release|Any CPU.ActiveCfg = net_4_5_Release|Any CPU {53DCA265-3C3C-42F9-B647-F72BA678122B}.Release|Any CPU.Build.0 = net_4_5_Release|Any CPU + {53DCA265-3C3C-42F9-B647-F72BA678122B}.Release|x86.ActiveCfg = Release|Any CPU + {53DCA265-3C3C-42F9-B647-F72BA678122B}.Release|x86.Build.0 = Release|Any CPU {DC393B66-92ED-4CAD-AB25-CFEF23F3D7C6}.Debug|Any CPU.ActiveCfg = net_4_5_Debug|Any CPU {DC393B66-92ED-4CAD-AB25-CFEF23F3D7C6}.Debug|Any CPU.Build.0 = net_4_5_Debug|Any CPU + {DC393B66-92ED-4CAD-AB25-CFEF23F3D7C6}.Debug|x86.ActiveCfg = Debug|Any CPU + {DC393B66-92ED-4CAD-AB25-CFEF23F3D7C6}.Debug|x86.Build.0 = Debug|Any CPU {DC393B66-92ED-4CAD-AB25-CFEF23F3D7C6}.Release|Any CPU.ActiveCfg = net_4_5_Release|Any CPU {DC393B66-92ED-4CAD-AB25-CFEF23F3D7C6}.Release|Any CPU.Build.0 = net_4_5_Release|Any CPU + {DC393B66-92ED-4CAD-AB25-CFEF23F3D7C6}.Release|x86.ActiveCfg = Release|Any CPU + {DC393B66-92ED-4CAD-AB25-CFEF23F3D7C6}.Release|x86.Build.0 = Release|Any CPU {2B8F4F83-C2B3-4E84-A27B-8DEE1BE0E006}.Debug|Any CPU.ActiveCfg = net_4_5_Debug|Any CPU {2B8F4F83-C2B3-4E84-A27B-8DEE1BE0E006}.Debug|Any CPU.Build.0 = net_4_5_Debug|Any CPU + {2B8F4F83-C2B3-4E84-A27B-8DEE1BE0E006}.Debug|x86.ActiveCfg = Debug|Any CPU + {2B8F4F83-C2B3-4E84-A27B-8DEE1BE0E006}.Debug|x86.Build.0 = Debug|Any CPU {2B8F4F83-C2B3-4E84-A27B-8DEE1BE0E006}.Release|Any CPU.ActiveCfg = net_4_5_Release|Any CPU {2B8F4F83-C2B3-4E84-A27B-8DEE1BE0E006}.Release|Any CPU.Build.0 = net_4_5_Release|Any CPU + {2B8F4F83-C2B3-4E84-A27B-8DEE1BE0E006}.Release|x86.ActiveCfg = Release|Any CPU + {2B8F4F83-C2B3-4E84-A27B-8DEE1BE0E006}.Release|x86.Build.0 = Release|Any CPU {2A705FC6-1A9E-4941-9E47-254D79F2D9D5}.Debug|Any CPU.ActiveCfg = net_4_5_Debug|Any CPU {2A705FC6-1A9E-4941-9E47-254D79F2D9D5}.Debug|Any CPU.Build.0 = net_4_5_Debug|Any CPU + {2A705FC6-1A9E-4941-9E47-254D79F2D9D5}.Debug|x86.ActiveCfg = Debug|Any CPU + {2A705FC6-1A9E-4941-9E47-254D79F2D9D5}.Debug|x86.Build.0 = Debug|Any CPU {2A705FC6-1A9E-4941-9E47-254D79F2D9D5}.Release|Any CPU.ActiveCfg = net_4_5_Release|Any CPU {2A705FC6-1A9E-4941-9E47-254D79F2D9D5}.Release|Any CPU.Build.0 = net_4_5_Release|Any CPU + {2A705FC6-1A9E-4941-9E47-254D79F2D9D5}.Release|x86.ActiveCfg = Release|Any CPU + {2A705FC6-1A9E-4941-9E47-254D79F2D9D5}.Release|x86.Build.0 = Release|Any CPU {2FF700C2-A38A-48BD-A637-8CAFD4FE6237}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {2FF700C2-A38A-48BD-A637-8CAFD4FE6237}.Debug|Any CPU.Build.0 = Debug|Any CPU + {2FF700C2-A38A-48BD-A637-8CAFD4FE6237}.Debug|x86.ActiveCfg = Debug|Any CPU + {2FF700C2-A38A-48BD-A637-8CAFD4FE6237}.Debug|x86.Build.0 = Debug|Any CPU {2FF700C2-A38A-48BD-A637-8CAFD4FE6237}.Release|Any CPU.ActiveCfg = Release|Any CPU {2FF700C2-A38A-48BD-A637-8CAFD4FE6237}.Release|Any CPU.Build.0 = Release|Any CPU + {2FF700C2-A38A-48BD-A637-8CAFD4FE6237}.Release|x86.ActiveCfg = Release|Any CPU + {2FF700C2-A38A-48BD-A637-8CAFD4FE6237}.Release|x86.Build.0 = Release|Any CPU {6C55B776-26D4-4DB3-A6AB-87E783B2F3D1}.Debug|Any CPU.ActiveCfg = Debug|WithNRefactory {6C55B776-26D4-4DB3-A6AB-87E783B2F3D1}.Debug|Any CPU.Build.0 = Debug|WithNRefactory + {6C55B776-26D4-4DB3-A6AB-87E783B2F3D1}.Debug|x86.ActiveCfg = Debug|Net40 {6C55B776-26D4-4DB3-A6AB-87E783B2F3D1}.Release|Any CPU.ActiveCfg = Release|WithNRefactory {6C55B776-26D4-4DB3-A6AB-87E783B2F3D1}.Release|Any CPU.Build.0 = Release|WithNRefactory + {6C55B776-26D4-4DB3-A6AB-87E783B2F3D1}.Release|x86.ActiveCfg = Release|Net40 {4139CCF6-FB49-4A9D-B2CF-331E9EA3198D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {4139CCF6-FB49-4A9D-B2CF-331E9EA3198D}.Debug|Any CPU.Build.0 = Debug|Any CPU + {4139CCF6-FB49-4A9D-B2CF-331E9EA3198D}.Debug|x86.ActiveCfg = Debug|Any CPU + {4139CCF6-FB49-4A9D-B2CF-331E9EA3198D}.Debug|x86.Build.0 = Debug|Any CPU {4139CCF6-FB49-4A9D-B2CF-331E9EA3198D}.Release|Any CPU.ActiveCfg = Release|Any CPU {4139CCF6-FB49-4A9D-B2CF-331E9EA3198D}.Release|Any CPU.Build.0 = Release|Any CPU + {4139CCF6-FB49-4A9D-B2CF-331E9EA3198D}.Release|x86.ActiveCfg = Release|Any CPU + {4139CCF6-FB49-4A9D-B2CF-331E9EA3198D}.Release|x86.Build.0 = Release|Any CPU {DDE2A481-8271-4EAC-A330-8FA6A38D13D1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {DDE2A481-8271-4EAC-A330-8FA6A38D13D1}.Debug|Any CPU.Build.0 = Debug|Any CPU + {DDE2A481-8271-4EAC-A330-8FA6A38D13D1}.Debug|x86.ActiveCfg = Debug|Any CPU + {DDE2A481-8271-4EAC-A330-8FA6A38D13D1}.Debug|x86.Build.0 = Debug|Any CPU {DDE2A481-8271-4EAC-A330-8FA6A38D13D1}.Release|Any CPU.ActiveCfg = Release|Any CPU {DDE2A481-8271-4EAC-A330-8FA6A38D13D1}.Release|Any CPU.Build.0 = Release|Any CPU + {DDE2A481-8271-4EAC-A330-8FA6A38D13D1}.Release|x86.ActiveCfg = Release|Any CPU + {DDE2A481-8271-4EAC-A330-8FA6A38D13D1}.Release|x86.Build.0 = Release|Any CPU {984CC812-9470-4A13-AFF9-CC44068D666C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {984CC812-9470-4A13-AFF9-CC44068D666C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {984CC812-9470-4A13-AFF9-CC44068D666C}.Debug|x86.ActiveCfg = Debug|Any CPU + {984CC812-9470-4A13-AFF9-CC44068D666C}.Debug|x86.Build.0 = Debug|Any CPU {984CC812-9470-4A13-AFF9-CC44068D666C}.Release|Any CPU.ActiveCfg = Release|Any CPU {984CC812-9470-4A13-AFF9-CC44068D666C}.Release|Any CPU.Build.0 = Release|Any CPU + {984CC812-9470-4A13-AFF9-CC44068D666C}.Release|x86.ActiveCfg = Release|Any CPU + {984CC812-9470-4A13-AFF9-CC44068D666C}.Release|x86.Build.0 = Release|Any CPU {83F15BA7-8478-4664-81BB-A82F146D88B3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {83F15BA7-8478-4664-81BB-A82F146D88B3}.Debug|Any CPU.Build.0 = Debug|Any CPU + {83F15BA7-8478-4664-81BB-A82F146D88B3}.Debug|x86.ActiveCfg = Debug|Any CPU + {83F15BA7-8478-4664-81BB-A82F146D88B3}.Debug|x86.Build.0 = Debug|Any CPU {83F15BA7-8478-4664-81BB-A82F146D88B3}.Release|Any CPU.ActiveCfg = Release|Any CPU {83F15BA7-8478-4664-81BB-A82F146D88B3}.Release|Any CPU.Build.0 = Release|Any CPU + {83F15BA7-8478-4664-81BB-A82F146D88B3}.Release|x86.ActiveCfg = Release|Any CPU + {83F15BA7-8478-4664-81BB-A82F146D88B3}.Release|x86.Build.0 = Release|Any CPU {17F4D7E0-6933-4C2E-8714-FD7E98D625D5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {17F4D7E0-6933-4C2E-8714-FD7E98D625D5}.Debug|Any CPU.Build.0 = Debug|Any CPU + {17F4D7E0-6933-4C2E-8714-FD7E98D625D5}.Debug|x86.ActiveCfg = Debug|Any CPU + {17F4D7E0-6933-4C2E-8714-FD7E98D625D5}.Debug|x86.Build.0 = Debug|Any CPU {17F4D7E0-6933-4C2E-8714-FD7E98D625D5}.Release|Any CPU.ActiveCfg = Release|Any CPU {17F4D7E0-6933-4C2E-8714-FD7E98D625D5}.Release|Any CPU.Build.0 = Release|Any CPU + {17F4D7E0-6933-4C2E-8714-FD7E98D625D5}.Release|x86.ActiveCfg = Release|Any CPU + {17F4D7E0-6933-4C2E-8714-FD7E98D625D5}.Release|x86.Build.0 = Release|Any CPU {1F1AC7CD-D154-45BB-8EAF-804CA8055F5A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {1F1AC7CD-D154-45BB-8EAF-804CA8055F5A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {1F1AC7CD-D154-45BB-8EAF-804CA8055F5A}.Debug|x86.ActiveCfg = Debug|Any CPU + {1F1AC7CD-D154-45BB-8EAF-804CA8055F5A}.Debug|x86.Build.0 = Debug|Any CPU {1F1AC7CD-D154-45BB-8EAF-804CA8055F5A}.Release|Any CPU.ActiveCfg = Release|Any CPU {1F1AC7CD-D154-45BB-8EAF-804CA8055F5A}.Release|Any CPU.Build.0 = Release|Any CPU + {1F1AC7CD-D154-45BB-8EAF-804CA8055F5A}.Release|x86.ActiveCfg = Release|Any CPU + {1F1AC7CD-D154-45BB-8EAF-804CA8055F5A}.Release|x86.Build.0 = Release|Any CPU {E954F3CB-A446-492F-A664-2B376EBC86E8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {E954F3CB-A446-492F-A664-2B376EBC86E8}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E954F3CB-A446-492F-A664-2B376EBC86E8}.Debug|x86.ActiveCfg = Debug|Any CPU + {E954F3CB-A446-492F-A664-2B376EBC86E8}.Debug|x86.Build.0 = Debug|Any CPU {E954F3CB-A446-492F-A664-2B376EBC86E8}.Release|Any CPU.ActiveCfg = Release|Any CPU {E954F3CB-A446-492F-A664-2B376EBC86E8}.Release|Any CPU.Build.0 = Release|Any CPU + {E954F3CB-A446-492F-A664-2B376EBC86E8}.Release|x86.ActiveCfg = Release|Any CPU + {E954F3CB-A446-492F-A664-2B376EBC86E8}.Release|x86.Build.0 = Release|Any CPU {70966F84-74C9-4067-A379-0C674A929233}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {70966F84-74C9-4067-A379-0C674A929233}.Debug|Any CPU.Build.0 = Debug|Any CPU + {70966F84-74C9-4067-A379-0C674A929233}.Debug|x86.ActiveCfg = Debug|Any CPU + {70966F84-74C9-4067-A379-0C674A929233}.Debug|x86.Build.0 = Debug|Any CPU {70966F84-74C9-4067-A379-0C674A929233}.Release|Any CPU.ActiveCfg = Release|Any CPU {70966F84-74C9-4067-A379-0C674A929233}.Release|Any CPU.Build.0 = Release|Any CPU + {70966F84-74C9-4067-A379-0C674A929233}.Release|x86.ActiveCfg = Release|Any CPU + {70966F84-74C9-4067-A379-0C674A929233}.Release|x86.Build.0 = Release|Any CPU {7C96B65D-28A5-4F28-A35B-8D83CE831EE8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {7C96B65D-28A5-4F28-A35B-8D83CE831EE8}.Debug|Any CPU.Build.0 = Debug|Any CPU + {7C96B65D-28A5-4F28-A35B-8D83CE831EE8}.Debug|x86.ActiveCfg = Debug|Any CPU + {7C96B65D-28A5-4F28-A35B-8D83CE831EE8}.Debug|x86.Build.0 = Debug|Any CPU {7C96B65D-28A5-4F28-A35B-8D83CE831EE8}.Release|Any CPU.ActiveCfg = Release|Any CPU {7C96B65D-28A5-4F28-A35B-8D83CE831EE8}.Release|Any CPU.Build.0 = Release|Any CPU + {7C96B65D-28A5-4F28-A35B-8D83CE831EE8}.Release|x86.ActiveCfg = Release|Any CPU + {7C96B65D-28A5-4F28-A35B-8D83CE831EE8}.Release|x86.Build.0 = Release|Any CPU {D781721F-C2A7-4E95-B76F-247170AC3B13}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {D781721F-C2A7-4E95-B76F-247170AC3B13}.Debug|Any CPU.Build.0 = Debug|Any CPU + {D781721F-C2A7-4E95-B76F-247170AC3B13}.Debug|x86.ActiveCfg = Debug|Any CPU + {D781721F-C2A7-4E95-B76F-247170AC3B13}.Debug|x86.Build.0 = Debug|Any CPU {D781721F-C2A7-4E95-B76F-247170AC3B13}.Release|Any CPU.ActiveCfg = Release|Any CPU {D781721F-C2A7-4E95-B76F-247170AC3B13}.Release|Any CPU.Build.0 = Release|Any CPU + {D781721F-C2A7-4E95-B76F-247170AC3B13}.Release|x86.ActiveCfg = Release|Any CPU + {D781721F-C2A7-4E95-B76F-247170AC3B13}.Release|x86.Build.0 = Release|Any CPU {E1B288A2-08EE-4318-8BBB-8AB72C69E33E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {E1B288A2-08EE-4318-8BBB-8AB72C69E33E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E1B288A2-08EE-4318-8BBB-8AB72C69E33E}.Debug|x86.ActiveCfg = Debug|Any CPU + {E1B288A2-08EE-4318-8BBB-8AB72C69E33E}.Debug|x86.Build.0 = Debug|Any CPU {E1B288A2-08EE-4318-8BBB-8AB72C69E33E}.Release|Any CPU.ActiveCfg = Release|Any CPU {E1B288A2-08EE-4318-8BBB-8AB72C69E33E}.Release|Any CPU.Build.0 = Release|Any CPU + {E1B288A2-08EE-4318-8BBB-8AB72C69E33E}.Release|x86.ActiveCfg = Release|Any CPU + {E1B288A2-08EE-4318-8BBB-8AB72C69E33E}.Release|x86.Build.0 = Release|Any CPU {7048AE18-EB93-4A84-82D0-DD60EB58ADBD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {7048AE18-EB93-4A84-82D0-DD60EB58ADBD}.Debug|Any CPU.Build.0 = Debug|Any CPU + {7048AE18-EB93-4A84-82D0-DD60EB58ADBD}.Debug|x86.ActiveCfg = Debug|Any CPU + {7048AE18-EB93-4A84-82D0-DD60EB58ADBD}.Debug|x86.Build.0 = Debug|Any CPU {7048AE18-EB93-4A84-82D0-DD60EB58ADBD}.Release|Any CPU.ActiveCfg = Release|Any CPU {7048AE18-EB93-4A84-82D0-DD60EB58ADBD}.Release|Any CPU.Build.0 = Release|Any CPU + {7048AE18-EB93-4A84-82D0-DD60EB58ADBD}.Release|x86.ActiveCfg = Release|Any CPU + {7048AE18-EB93-4A84-82D0-DD60EB58ADBD}.Release|x86.Build.0 = Release|Any CPU {6D209CBB-D8C1-478A-BC30-D3FC87B7858F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {6D209CBB-D8C1-478A-BC30-D3FC87B7858F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {6D209CBB-D8C1-478A-BC30-D3FC87B7858F}.Debug|x86.ActiveCfg = Debug|Any CPU + {6D209CBB-D8C1-478A-BC30-D3FC87B7858F}.Debug|x86.Build.0 = Debug|Any CPU {6D209CBB-D8C1-478A-BC30-D3FC87B7858F}.Release|Any CPU.ActiveCfg = Release|Any CPU {6D209CBB-D8C1-478A-BC30-D3FC87B7858F}.Release|Any CPU.Build.0 = Release|Any CPU + {6D209CBB-D8C1-478A-BC30-D3FC87B7858F}.Release|x86.ActiveCfg = Release|Any CPU + {6D209CBB-D8C1-478A-BC30-D3FC87B7858F}.Release|x86.Build.0 = Release|Any CPU {94BBCA55-A20E-4782-93B0-3566D185F7C1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {94BBCA55-A20E-4782-93B0-3566D185F7C1}.Debug|Any CPU.Build.0 = Debug|Any CPU + {94BBCA55-A20E-4782-93B0-3566D185F7C1}.Debug|x86.ActiveCfg = Debug|Any CPU + {94BBCA55-A20E-4782-93B0-3566D185F7C1}.Debug|x86.Build.0 = Debug|Any CPU {94BBCA55-A20E-4782-93B0-3566D185F7C1}.Release|Any CPU.ActiveCfg = Release|Any CPU {94BBCA55-A20E-4782-93B0-3566D185F7C1}.Release|Any CPU.Build.0 = Release|Any CPU + {94BBCA55-A20E-4782-93B0-3566D185F7C1}.Release|x86.ActiveCfg = Release|Any CPU + {94BBCA55-A20E-4782-93B0-3566D185F7C1}.Release|x86.Build.0 = Release|Any CPU {9196DD8A-B4D4-4780-8742-C5762E547FC2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {9196DD8A-B4D4-4780-8742-C5762E547FC2}.Debug|Any CPU.Build.0 = Debug|Any CPU + {9196DD8A-B4D4-4780-8742-C5762E547FC2}.Debug|x86.ActiveCfg = Debug|Any CPU + {9196DD8A-B4D4-4780-8742-C5762E547FC2}.Debug|x86.Build.0 = Debug|Any CPU {9196DD8A-B4D4-4780-8742-C5762E547FC2}.Release|Any CPU.ActiveCfg = Release|Any CPU {9196DD8A-B4D4-4780-8742-C5762E547FC2}.Release|Any CPU.Build.0 = Release|Any CPU + {9196DD8A-B4D4-4780-8742-C5762E547FC2}.Release|x86.ActiveCfg = Release|Any CPU + {9196DD8A-B4D4-4780-8742-C5762E547FC2}.Release|x86.Build.0 = Release|Any CPU {7D5C266F-D6FF-4D14-B315-0C0FC6C4EF51}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {7D5C266F-D6FF-4D14-B315-0C0FC6C4EF51}.Debug|Any CPU.Build.0 = Debug|Any CPU + {7D5C266F-D6FF-4D14-B315-0C0FC6C4EF51}.Debug|x86.ActiveCfg = Debug|Any CPU + {7D5C266F-D6FF-4D14-B315-0C0FC6C4EF51}.Debug|x86.Build.0 = Debug|Any CPU {7D5C266F-D6FF-4D14-B315-0C0FC6C4EF51}.Release|Any CPU.ActiveCfg = Release|Any CPU {7D5C266F-D6FF-4D14-B315-0C0FC6C4EF51}.Release|Any CPU.Build.0 = Release|Any CPU + {7D5C266F-D6FF-4D14-B315-0C0FC6C4EF51}.Release|x86.ActiveCfg = Release|Any CPU + {7D5C266F-D6FF-4D14-B315-0C0FC6C4EF51}.Release|x86.Build.0 = Release|Any CPU {4B8F0F98-8BE1-402B-AA8B-C8D548577B38}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {4B8F0F98-8BE1-402B-AA8B-C8D548577B38}.Debug|Any CPU.Build.0 = Debug|Any CPU + {4B8F0F98-8BE1-402B-AA8B-C8D548577B38}.Debug|x86.ActiveCfg = Debug|Any CPU + {4B8F0F98-8BE1-402B-AA8B-C8D548577B38}.Debug|x86.Build.0 = Debug|Any CPU {4B8F0F98-8BE1-402B-AA8B-C8D548577B38}.Release|Any CPU.ActiveCfg = Release|Any CPU {4B8F0F98-8BE1-402B-AA8B-C8D548577B38}.Release|Any CPU.Build.0 = Release|Any CPU + {4B8F0F98-8BE1-402B-AA8B-C8D548577B38}.Release|x86.ActiveCfg = Release|Any CPU + {4B8F0F98-8BE1-402B-AA8B-C8D548577B38}.Release|x86.Build.0 = Release|Any CPU {6B1CFE35-DA17-4DEB-9C6E-227E5E251DA0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {6B1CFE35-DA17-4DEB-9C6E-227E5E251DA0}.Debug|Any CPU.Build.0 = Debug|Any CPU + {6B1CFE35-DA17-4DEB-9C6E-227E5E251DA0}.Debug|x86.ActiveCfg = Debug|Any CPU + {6B1CFE35-DA17-4DEB-9C6E-227E5E251DA0}.Debug|x86.Build.0 = Debug|Any CPU {6B1CFE35-DA17-4DEB-9C6E-227E5E251DA0}.Release|Any CPU.ActiveCfg = Release|Any CPU {6B1CFE35-DA17-4DEB-9C6E-227E5E251DA0}.Release|Any CPU.Build.0 = Release|Any CPU + {6B1CFE35-DA17-4DEB-9C6E-227E5E251DA0}.Release|x86.ActiveCfg = Release|Any CPU + {6B1CFE35-DA17-4DEB-9C6E-227E5E251DA0}.Release|x86.Build.0 = Release|Any CPU {0008FCE9-9EB4-4E2E-979B-553278E5BBA6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {0008FCE9-9EB4-4E2E-979B-553278E5BBA6}.Debug|Any CPU.Build.0 = Debug|Any CPU + {0008FCE9-9EB4-4E2E-979B-553278E5BBA6}.Debug|x86.ActiveCfg = Debug|Any CPU + {0008FCE9-9EB4-4E2E-979B-553278E5BBA6}.Debug|x86.Build.0 = Debug|Any CPU {0008FCE9-9EB4-4E2E-979B-553278E5BBA6}.Release|Any CPU.ActiveCfg = Release|Any CPU {0008FCE9-9EB4-4E2E-979B-553278E5BBA6}.Release|Any CPU.Build.0 = Release|Any CPU + {0008FCE9-9EB4-4E2E-979B-553278E5BBA6}.Release|x86.ActiveCfg = Release|Any CPU + {0008FCE9-9EB4-4E2E-979B-553278E5BBA6}.Release|x86.Build.0 = Release|Any CPU {D022A6CE-7438-41E8-AC64-F2DE18EC54C6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {D022A6CE-7438-41E8-AC64-F2DE18EC54C6}.Debug|Any CPU.Build.0 = Debug|Any CPU + {D022A6CE-7438-41E8-AC64-F2DE18EC54C6}.Debug|x86.ActiveCfg = Debug|Any CPU + {D022A6CE-7438-41E8-AC64-F2DE18EC54C6}.Debug|x86.Build.0 = Debug|Any CPU {D022A6CE-7438-41E8-AC64-F2DE18EC54C6}.Release|Any CPU.ActiveCfg = Release|Any CPU {D022A6CE-7438-41E8-AC64-F2DE18EC54C6}.Release|Any CPU.Build.0 = Release|Any CPU + {D022A6CE-7438-41E8-AC64-F2DE18EC54C6}.Release|x86.ActiveCfg = Release|Any CPU + {D022A6CE-7438-41E8-AC64-F2DE18EC54C6}.Release|x86.Build.0 = Release|Any CPU {80F76D10-0B44-4D55-B4BD-DAEB5464090C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {80F76D10-0B44-4D55-B4BD-DAEB5464090C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {80F76D10-0B44-4D55-B4BD-DAEB5464090C}.Debug|x86.ActiveCfg = Debug|Any CPU + {80F76D10-0B44-4D55-B4BD-DAEB5464090C}.Debug|x86.Build.0 = Debug|Any CPU {80F76D10-0B44-4D55-B4BD-DAEB5464090C}.Release|Any CPU.ActiveCfg = Release|Any CPU {80F76D10-0B44-4D55-B4BD-DAEB5464090C}.Release|Any CPU.Build.0 = Release|Any CPU + {80F76D10-0B44-4D55-B4BD-DAEB5464090C}.Release|x86.ActiveCfg = Release|Any CPU + {80F76D10-0B44-4D55-B4BD-DAEB5464090C}.Release|x86.Build.0 = Release|Any CPU {64A3E5E6-90BF-47F6-94DF-68C94B62C817}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {64A3E5E6-90BF-47F6-94DF-68C94B62C817}.Debug|Any CPU.Build.0 = Debug|Any CPU + {64A3E5E6-90BF-47F6-94DF-68C94B62C817}.Debug|x86.ActiveCfg = Debug|Any CPU + {64A3E5E6-90BF-47F6-94DF-68C94B62C817}.Debug|x86.Build.0 = Debug|Any CPU {64A3E5E6-90BF-47F6-94DF-68C94B62C817}.Release|Any CPU.ActiveCfg = Release|Any CPU {64A3E5E6-90BF-47F6-94DF-68C94B62C817}.Release|Any CPU.Build.0 = Release|Any CPU + {64A3E5E6-90BF-47F6-94DF-68C94B62C817}.Release|x86.ActiveCfg = Release|Any CPU + {64A3E5E6-90BF-47F6-94DF-68C94B62C817}.Release|x86.Build.0 = Release|Any CPU {B5D8C3E6-42EC-4D4B-AD05-3644B32563EF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {B5D8C3E6-42EC-4D4B-AD05-3644B32563EF}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B5D8C3E6-42EC-4D4B-AD05-3644B32563EF}.Debug|x86.ActiveCfg = Debug|Any CPU + {B5D8C3E6-42EC-4D4B-AD05-3644B32563EF}.Debug|x86.Build.0 = Debug|Any CPU {B5D8C3E6-42EC-4D4B-AD05-3644B32563EF}.Release|Any CPU.ActiveCfg = Release|Any CPU {B5D8C3E6-42EC-4D4B-AD05-3644B32563EF}.Release|Any CPU.Build.0 = Release|Any CPU + {B5D8C3E6-42EC-4D4B-AD05-3644B32563EF}.Release|x86.ActiveCfg = Release|Any CPU + {B5D8C3E6-42EC-4D4B-AD05-3644B32563EF}.Release|x86.Build.0 = Release|Any CPU {AE4AB0FA-6087-4480-AF37-0FA1452B3DA1}.Debug|Any CPU.ActiveCfg = Debug|x86 {AE4AB0FA-6087-4480-AF37-0FA1452B3DA1}.Debug|Any CPU.Build.0 = Debug|x86 + {AE4AB0FA-6087-4480-AF37-0FA1452B3DA1}.Debug|x86.ActiveCfg = Debug|x86 + {AE4AB0FA-6087-4480-AF37-0FA1452B3DA1}.Debug|x86.Build.0 = Debug|x86 {AE4AB0FA-6087-4480-AF37-0FA1452B3DA1}.Release|Any CPU.ActiveCfg = Release|x86 {AE4AB0FA-6087-4480-AF37-0FA1452B3DA1}.Release|Any CPU.Build.0 = Release|x86 + {AE4AB0FA-6087-4480-AF37-0FA1452B3DA1}.Release|x86.ActiveCfg = Release|x86 + {AE4AB0FA-6087-4480-AF37-0FA1452B3DA1}.Release|x86.Build.0 = Release|x86 {A406803B-C584-43A3-BCEE-A0BB3132CB5F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {A406803B-C584-43A3-BCEE-A0BB3132CB5F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A406803B-C584-43A3-BCEE-A0BB3132CB5F}.Debug|x86.ActiveCfg = Debug|Any CPU + {A406803B-C584-43A3-BCEE-A0BB3132CB5F}.Debug|x86.Build.0 = Debug|Any CPU {A406803B-C584-43A3-BCEE-A0BB3132CB5F}.Release|Any CPU.ActiveCfg = Release|Any CPU {A406803B-C584-43A3-BCEE-A0BB3132CB5F}.Release|Any CPU.Build.0 = Release|Any CPU + {A406803B-C584-43A3-BCEE-A0BB3132CB5F}.Release|x86.ActiveCfg = Release|Any CPU + {A406803B-C584-43A3-BCEE-A0BB3132CB5F}.Release|x86.Build.0 = Release|Any CPU {1B753D7F-7C77-4D5E-B928-02982690879C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {1B753D7F-7C77-4D5E-B928-02982690879C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {1B753D7F-7C77-4D5E-B928-02982690879C}.Debug|x86.ActiveCfg = Debug|Any CPU + {1B753D7F-7C77-4D5E-B928-02982690879C}.Debug|x86.Build.0 = Debug|Any CPU {1B753D7F-7C77-4D5E-B928-02982690879C}.Release|Any CPU.ActiveCfg = Release|Any CPU {1B753D7F-7C77-4D5E-B928-02982690879C}.Release|Any CPU.Build.0 = Release|Any CPU + {1B753D7F-7C77-4D5E-B928-02982690879C}.Release|x86.ActiveCfg = Release|Any CPU + {1B753D7F-7C77-4D5E-B928-02982690879C}.Release|x86.Build.0 = Release|Any CPU {E0A5E80A-003B-4335-A9DC-A76E2E46D38D}.Debug|Any CPU.ActiveCfg = Debug|x86 {E0A5E80A-003B-4335-A9DC-A76E2E46D38D}.Debug|Any CPU.Build.0 = Debug|x86 + {E0A5E80A-003B-4335-A9DC-A76E2E46D38D}.Debug|x86.ActiveCfg = Debug|x86 + {E0A5E80A-003B-4335-A9DC-A76E2E46D38D}.Debug|x86.Build.0 = Debug|x86 {E0A5E80A-003B-4335-A9DC-A76E2E46D38D}.Release|Any CPU.ActiveCfg = Release|x86 {E0A5E80A-003B-4335-A9DC-A76E2E46D38D}.Release|Any CPU.Build.0 = Release|x86 + {E0A5E80A-003B-4335-A9DC-A76E2E46D38D}.Release|x86.ActiveCfg = Release|x86 + {E0A5E80A-003B-4335-A9DC-A76E2E46D38D}.Release|x86.Build.0 = Release|x86 {60480C2F-F228-4D86-B98F-AF75A7DCEC34}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {60480C2F-F228-4D86-B98F-AF75A7DCEC34}.Debug|Any CPU.Build.0 = Debug|Any CPU + {60480C2F-F228-4D86-B98F-AF75A7DCEC34}.Debug|x86.ActiveCfg = Debug|Any CPU + {60480C2F-F228-4D86-B98F-AF75A7DCEC34}.Debug|x86.Build.0 = Debug|Any CPU {60480C2F-F228-4D86-B98F-AF75A7DCEC34}.Release|Any CPU.ActiveCfg = Release|Any CPU {60480C2F-F228-4D86-B98F-AF75A7DCEC34}.Release|Any CPU.Build.0 = Release|Any CPU + {60480C2F-F228-4D86-B98F-AF75A7DCEC34}.Release|x86.ActiveCfg = Release|Any CPU + {60480C2F-F228-4D86-B98F-AF75A7DCEC34}.Release|x86.Build.0 = Release|Any CPU {40CA84D4-ACFC-4646-9CDD-B87262D34093}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {40CA84D4-ACFC-4646-9CDD-B87262D34093}.Debug|Any CPU.Build.0 = Debug|Any CPU + {40CA84D4-ACFC-4646-9CDD-B87262D34093}.Debug|x86.ActiveCfg = Debug|Any CPU + {40CA84D4-ACFC-4646-9CDD-B87262D34093}.Debug|x86.Build.0 = Debug|Any CPU {40CA84D4-ACFC-4646-9CDD-B87262D34093}.Release|Any CPU.ActiveCfg = Release|Any CPU {40CA84D4-ACFC-4646-9CDD-B87262D34093}.Release|Any CPU.Build.0 = Release|Any CPU + {40CA84D4-ACFC-4646-9CDD-B87262D34093}.Release|x86.ActiveCfg = Release|Any CPU + {40CA84D4-ACFC-4646-9CDD-B87262D34093}.Release|x86.Build.0 = Release|Any CPU {0502FCF7-72F4-4587-936B-D0238CD0E072}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {0502FCF7-72F4-4587-936B-D0238CD0E072}.Debug|Any CPU.Build.0 = Debug|Any CPU + {0502FCF7-72F4-4587-936B-D0238CD0E072}.Debug|x86.ActiveCfg = Debug|Any CPU + {0502FCF7-72F4-4587-936B-D0238CD0E072}.Debug|x86.Build.0 = Debug|Any CPU {0502FCF7-72F4-4587-936B-D0238CD0E072}.Release|Any CPU.ActiveCfg = Release|Any CPU {0502FCF7-72F4-4587-936B-D0238CD0E072}.Release|Any CPU.Build.0 = Release|Any CPU + {0502FCF7-72F4-4587-936B-D0238CD0E072}.Release|x86.ActiveCfg = Release|Any CPU + {0502FCF7-72F4-4587-936B-D0238CD0E072}.Release|x86.Build.0 = Release|Any CPU {0162E499-42D0-409B-AA25-EED21F75336B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {0162E499-42D0-409B-AA25-EED21F75336B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {0162E499-42D0-409B-AA25-EED21F75336B}.Debug|x86.ActiveCfg = Debug|Any CPU + {0162E499-42D0-409B-AA25-EED21F75336B}.Debug|x86.Build.0 = Debug|Any CPU {0162E499-42D0-409B-AA25-EED21F75336B}.Release|Any CPU.ActiveCfg = Release|Any CPU {0162E499-42D0-409B-AA25-EED21F75336B}.Release|Any CPU.Build.0 = Release|Any CPU + {0162E499-42D0-409B-AA25-EED21F75336B}.Release|x86.ActiveCfg = Release|Any CPU + {0162E499-42D0-409B-AA25-EED21F75336B}.Release|x86.Build.0 = Release|Any CPU {E618A9CD-A39F-4925-A538-E8A3FEF24E54}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {E618A9CD-A39F-4925-A538-E8A3FEF24E54}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E618A9CD-A39F-4925-A538-E8A3FEF24E54}.Debug|x86.ActiveCfg = Debug|Any CPU + {E618A9CD-A39F-4925-A538-E8A3FEF24E54}.Debug|x86.Build.0 = Debug|Any CPU {E618A9CD-A39F-4925-A538-E8A3FEF24E54}.Release|Any CPU.ActiveCfg = Release|Any CPU {E618A9CD-A39F-4925-A538-E8A3FEF24E54}.Release|Any CPU.Build.0 = Release|Any CPU + {E618A9CD-A39F-4925-A538-E8A3FEF24E54}.Release|x86.ActiveCfg = Release|Any CPU + {E618A9CD-A39F-4925-A538-E8A3FEF24E54}.Release|x86.Build.0 = Release|Any CPU {DCA2703D-250A-463E-A68A-07ED105AE6BD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {DCA2703D-250A-463E-A68A-07ED105AE6BD}.Debug|Any CPU.Build.0 = Debug|Any CPU + {DCA2703D-250A-463E-A68A-07ED105AE6BD}.Debug|x86.ActiveCfg = Debug|Any CPU + {DCA2703D-250A-463E-A68A-07ED105AE6BD}.Debug|x86.Build.0 = Debug|Any CPU {DCA2703D-250A-463E-A68A-07ED105AE6BD}.Release|Any CPU.ActiveCfg = Release|Any CPU {DCA2703D-250A-463E-A68A-07ED105AE6BD}.Release|Any CPU.Build.0 = Release|Any CPU + {DCA2703D-250A-463E-A68A-07ED105AE6BD}.Release|x86.ActiveCfg = Release|Any CPU + {DCA2703D-250A-463E-A68A-07ED105AE6BD}.Release|x86.Build.0 = Release|Any CPU {DFB936AD-90EE-4B4F-941E-4F4A636F0D92}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {DFB936AD-90EE-4B4F-941E-4F4A636F0D92}.Debug|Any CPU.Build.0 = Debug|Any CPU + {DFB936AD-90EE-4B4F-941E-4F4A636F0D92}.Debug|x86.ActiveCfg = Debug|Any CPU + {DFB936AD-90EE-4B4F-941E-4F4A636F0D92}.Debug|x86.Build.0 = Debug|Any CPU {DFB936AD-90EE-4B4F-941E-4F4A636F0D92}.Release|Any CPU.ActiveCfg = Release|Any CPU {DFB936AD-90EE-4B4F-941E-4F4A636F0D92}.Release|Any CPU.Build.0 = Release|Any CPU + {DFB936AD-90EE-4B4F-941E-4F4A636F0D92}.Release|x86.ActiveCfg = Release|Any CPU + {DFB936AD-90EE-4B4F-941E-4F4A636F0D92}.Release|x86.Build.0 = Release|Any CPU {8AA421C8-D7AF-4957-9F43-5135328ACB24}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {8AA421C8-D7AF-4957-9F43-5135328ACB24}.Debug|Any CPU.Build.0 = Debug|Any CPU + {8AA421C8-D7AF-4957-9F43-5135328ACB24}.Debug|x86.ActiveCfg = Debug|Any CPU + {8AA421C8-D7AF-4957-9F43-5135328ACB24}.Debug|x86.Build.0 = Debug|Any CPU {8AA421C8-D7AF-4957-9F43-5135328ACB24}.Release|Any CPU.ActiveCfg = Release|Any CPU {8AA421C8-D7AF-4957-9F43-5135328ACB24}.Release|Any CPU.Build.0 = Release|Any CPU + {8AA421C8-D7AF-4957-9F43-5135328ACB24}.Release|x86.ActiveCfg = Release|Any CPU + {8AA421C8-D7AF-4957-9F43-5135328ACB24}.Release|x86.Build.0 = Release|Any CPU {85226AFB-CE71-4851-9A75-7EEC663A8E8A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {85226AFB-CE71-4851-9A75-7EEC663A8E8A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {85226AFB-CE71-4851-9A75-7EEC663A8E8A}.Debug|x86.ActiveCfg = Debug|Any CPU + {85226AFB-CE71-4851-9A75-7EEC663A8E8A}.Debug|x86.Build.0 = Debug|Any CPU {85226AFB-CE71-4851-9A75-7EEC663A8E8A}.Release|Any CPU.ActiveCfg = Release|Any CPU {85226AFB-CE71-4851-9A75-7EEC663A8E8A}.Release|Any CPU.Build.0 = Release|Any CPU + {85226AFB-CE71-4851-9A75-7EEC663A8E8A}.Release|x86.ActiveCfg = Release|Any CPU + {85226AFB-CE71-4851-9A75-7EEC663A8E8A}.Release|x86.Build.0 = Release|Any CPU {A9F12710-24E4-46D4-832C-6ECB395B9EAD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {A9F12710-24E4-46D4-832C-6ECB395B9EAD}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A9F12710-24E4-46D4-832C-6ECB395B9EAD}.Debug|x86.ActiveCfg = Debug|Any CPU + {A9F12710-24E4-46D4-832C-6ECB395B9EAD}.Debug|x86.Build.0 = Debug|Any CPU {A9F12710-24E4-46D4-832C-6ECB395B9EAD}.Release|Any CPU.ActiveCfg = Release|Any CPU {A9F12710-24E4-46D4-832C-6ECB395B9EAD}.Release|Any CPU.Build.0 = Release|Any CPU + {A9F12710-24E4-46D4-832C-6ECB395B9EAD}.Release|x86.ActiveCfg = Release|Any CPU + {A9F12710-24E4-46D4-832C-6ECB395B9EAD}.Release|x86.Build.0 = Release|Any CPU {B7823AE9-4B43-4859-8796-2EBDC116FBB8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {B7823AE9-4B43-4859-8796-2EBDC116FBB8}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B7823AE9-4B43-4859-8796-2EBDC116FBB8}.Debug|x86.ActiveCfg = Debug|Any CPU + {B7823AE9-4B43-4859-8796-2EBDC116FBB8}.Debug|x86.Build.0 = Debug|Any CPU {B7823AE9-4B43-4859-8796-2EBDC116FBB8}.Release|Any CPU.ActiveCfg = Release|Any CPU {B7823AE9-4B43-4859-8796-2EBDC116FBB8}.Release|Any CPU.Build.0 = Release|Any CPU + {B7823AE9-4B43-4859-8796-2EBDC116FBB8}.Release|x86.ActiveCfg = Release|Any CPU + {B7823AE9-4B43-4859-8796-2EBDC116FBB8}.Release|x86.Build.0 = Release|Any CPU {BAD94D6E-4159-4CB6-B991-486F412D9BB6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {BAD94D6E-4159-4CB6-B991-486F412D9BB6}.Debug|Any CPU.Build.0 = Debug|Any CPU + {BAD94D6E-4159-4CB6-B991-486F412D9BB6}.Debug|x86.ActiveCfg = Debug|Any CPU + {BAD94D6E-4159-4CB6-B991-486F412D9BB6}.Debug|x86.Build.0 = Debug|Any CPU {BAD94D6E-4159-4CB6-B991-486F412D9BB6}.Release|Any CPU.ActiveCfg = Release|Any CPU {BAD94D6E-4159-4CB6-B991-486F412D9BB6}.Release|Any CPU.Build.0 = Release|Any CPU + {BAD94D6E-4159-4CB6-B991-486F412D9BB6}.Release|x86.ActiveCfg = Release|Any CPU + {BAD94D6E-4159-4CB6-B991-486F412D9BB6}.Release|x86.Build.0 = Release|Any CPU {5C70D6AB-0A33-43F9-B8B5-54558C35BBB1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {5C70D6AB-0A33-43F9-B8B5-54558C35BBB1}.Debug|Any CPU.Build.0 = Debug|Any CPU + {5C70D6AB-0A33-43F9-B8B5-54558C35BBB1}.Debug|x86.ActiveCfg = Debug|Any CPU + {5C70D6AB-0A33-43F9-B8B5-54558C35BBB1}.Debug|x86.Build.0 = Debug|Any CPU {5C70D6AB-0A33-43F9-B8B5-54558C35BBB1}.Release|Any CPU.ActiveCfg = Release|Any CPU {5C70D6AB-0A33-43F9-B8B5-54558C35BBB1}.Release|Any CPU.Build.0 = Release|Any CPU + {5C70D6AB-0A33-43F9-B8B5-54558C35BBB1}.Release|x86.ActiveCfg = Release|Any CPU + {5C70D6AB-0A33-43F9-B8B5-54558C35BBB1}.Release|x86.Build.0 = Release|Any CPU {EEF5E054-4192-4A57-8FBF-E860D808A51D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {EEF5E054-4192-4A57-8FBF-E860D808A51D}.Debug|Any CPU.Build.0 = Debug|Any CPU + {EEF5E054-4192-4A57-8FBF-E860D808A51D}.Debug|x86.ActiveCfg = Debug|Any CPU + {EEF5E054-4192-4A57-8FBF-E860D808A51D}.Debug|x86.Build.0 = Debug|Any CPU {EEF5E054-4192-4A57-8FBF-E860D808A51D}.Release|Any CPU.ActiveCfg = Release|Any CPU {EEF5E054-4192-4A57-8FBF-E860D808A51D}.Release|Any CPU.Build.0 = Release|Any CPU + {EEF5E054-4192-4A57-8FBF-E860D808A51D}.Release|x86.ActiveCfg = Release|Any CPU + {EEF5E054-4192-4A57-8FBF-E860D808A51D}.Release|x86.Build.0 = Release|Any CPU {AFE34868-AFA1-4E1C-9450-47AB4BE329D5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {AFE34868-AFA1-4E1C-9450-47AB4BE329D5}.Debug|Any CPU.Build.0 = Debug|Any CPU + {AFE34868-AFA1-4E1C-9450-47AB4BE329D5}.Debug|x86.ActiveCfg = Debug|Any CPU + {AFE34868-AFA1-4E1C-9450-47AB4BE329D5}.Debug|x86.Build.0 = Debug|Any CPU {AFE34868-AFA1-4E1C-9450-47AB4BE329D5}.Release|Any CPU.ActiveCfg = Release|Any CPU {AFE34868-AFA1-4E1C-9450-47AB4BE329D5}.Release|Any CPU.Build.0 = Release|Any CPU + {AFE34868-AFA1-4E1C-9450-47AB4BE329D5}.Release|x86.ActiveCfg = Release|Any CPU + {AFE34868-AFA1-4E1C-9450-47AB4BE329D5}.Release|x86.Build.0 = Release|Any CPU {66A378A1-E9F4-4AD5-8946-D0EC06C2902F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {66A378A1-E9F4-4AD5-8946-D0EC06C2902F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {66A378A1-E9F4-4AD5-8946-D0EC06C2902F}.Debug|x86.ActiveCfg = Debug|Any CPU + {66A378A1-E9F4-4AD5-8946-D0EC06C2902F}.Debug|x86.Build.0 = Debug|Any CPU {66A378A1-E9F4-4AD5-8946-D0EC06C2902F}.Release|Any CPU.ActiveCfg = Release|Any CPU {66A378A1-E9F4-4AD5-8946-D0EC06C2902F}.Release|Any CPU.Build.0 = Release|Any CPU + {66A378A1-E9F4-4AD5-8946-D0EC06C2902F}.Release|x86.ActiveCfg = Release|Any CPU + {66A378A1-E9F4-4AD5-8946-D0EC06C2902F}.Release|x86.Build.0 = Release|Any CPU {88DA149F-21B2-48AB-82C4-28FB6BDFD783}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {88DA149F-21B2-48AB-82C4-28FB6BDFD783}.Debug|Any CPU.Build.0 = Debug|Any CPU + {88DA149F-21B2-48AB-82C4-28FB6BDFD783}.Debug|x86.ActiveCfg = Debug|Any CPU + {88DA149F-21B2-48AB-82C4-28FB6BDFD783}.Debug|x86.Build.0 = Debug|Any CPU {88DA149F-21B2-48AB-82C4-28FB6BDFD783}.Release|Any CPU.ActiveCfg = Release|Any CPU {88DA149F-21B2-48AB-82C4-28FB6BDFD783}.Release|Any CPU.Build.0 = Release|Any CPU + {88DA149F-21B2-48AB-82C4-28FB6BDFD783}.Release|x86.ActiveCfg = Release|Any CPU + {88DA149F-21B2-48AB-82C4-28FB6BDFD783}.Release|x86.Build.0 = Release|Any CPU {78CC29AC-CC79-4355-B1F2-97936DF198AC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {78CC29AC-CC79-4355-B1F2-97936DF198AC}.Debug|Any CPU.Build.0 = Debug|Any CPU + {78CC29AC-CC79-4355-B1F2-97936DF198AC}.Debug|x86.ActiveCfg = Debug|Any CPU + {78CC29AC-CC79-4355-B1F2-97936DF198AC}.Debug|x86.Build.0 = Debug|Any CPU {78CC29AC-CC79-4355-B1F2-97936DF198AC}.Release|Any CPU.ActiveCfg = Release|Any CPU {78CC29AC-CC79-4355-B1F2-97936DF198AC}.Release|Any CPU.Build.0 = Release|Any CPU + {78CC29AC-CC79-4355-B1F2-97936DF198AC}.Release|x86.ActiveCfg = Release|Any CPU + {78CC29AC-CC79-4355-B1F2-97936DF198AC}.Release|x86.Build.0 = Release|Any CPU {9A9D6FD4-6A2E-455D-ACC3-DDA775FE9865}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {9A9D6FD4-6A2E-455D-ACC3-DDA775FE9865}.Debug|Any CPU.Build.0 = Debug|Any CPU + {9A9D6FD4-6A2E-455D-ACC3-DDA775FE9865}.Debug|x86.ActiveCfg = Debug|Any CPU + {9A9D6FD4-6A2E-455D-ACC3-DDA775FE9865}.Debug|x86.Build.0 = Debug|Any CPU {9A9D6FD4-6A2E-455D-ACC3-DDA775FE9865}.Release|Any CPU.ActiveCfg = Release|Any CPU {9A9D6FD4-6A2E-455D-ACC3-DDA775FE9865}.Release|Any CPU.Build.0 = Release|Any CPU + {9A9D6FD4-6A2E-455D-ACC3-DDA775FE9865}.Release|x86.ActiveCfg = Release|Any CPU + {9A9D6FD4-6A2E-455D-ACC3-DDA775FE9865}.Release|x86.Build.0 = Release|Any CPU {7D7E92DF-ACEB-4B69-92C8-8AC7A703CD57}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {7D7E92DF-ACEB-4B69-92C8-8AC7A703CD57}.Debug|Any CPU.Build.0 = Debug|Any CPU + {7D7E92DF-ACEB-4B69-92C8-8AC7A703CD57}.Debug|x86.ActiveCfg = Debug|Any CPU + {7D7E92DF-ACEB-4B69-92C8-8AC7A703CD57}.Debug|x86.Build.0 = Debug|Any CPU {7D7E92DF-ACEB-4B69-92C8-8AC7A703CD57}.Release|Any CPU.ActiveCfg = Release|Any CPU {7D7E92DF-ACEB-4B69-92C8-8AC7A703CD57}.Release|Any CPU.Build.0 = Release|Any CPU + {7D7E92DF-ACEB-4B69-92C8-8AC7A703CD57}.Release|x86.ActiveCfg = Release|Any CPU + {7D7E92DF-ACEB-4B69-92C8-8AC7A703CD57}.Release|x86.Build.0 = Release|Any CPU {CBC6C247-747B-4908-B09A-4D2E0F640B6B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {CBC6C247-747B-4908-B09A-4D2E0F640B6B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {CBC6C247-747B-4908-B09A-4D2E0F640B6B}.Debug|x86.ActiveCfg = Debug|Any CPU + {CBC6C247-747B-4908-B09A-4D2E0F640B6B}.Debug|x86.Build.0 = Debug|Any CPU {CBC6C247-747B-4908-B09A-4D2E0F640B6B}.Release|Any CPU.ActiveCfg = Release|Any CPU {CBC6C247-747B-4908-B09A-4D2E0F640B6B}.Release|Any CPU.Build.0 = Release|Any CPU + {CBC6C247-747B-4908-B09A-4D2E0F640B6B}.Release|x86.ActiveCfg = Release|Any CPU + {CBC6C247-747B-4908-B09A-4D2E0F640B6B}.Release|x86.Build.0 = Release|Any CPU {1F261725-6318-4434-A1B1-6C70CE4CD324}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {1F261725-6318-4434-A1B1-6C70CE4CD324}.Debug|Any CPU.Build.0 = Debug|Any CPU + {1F261725-6318-4434-A1B1-6C70CE4CD324}.Debug|x86.ActiveCfg = Debug|Any CPU + {1F261725-6318-4434-A1B1-6C70CE4CD324}.Debug|x86.Build.0 = Debug|Any CPU {1F261725-6318-4434-A1B1-6C70CE4CD324}.Release|Any CPU.ActiveCfg = Release|Any CPU {1F261725-6318-4434-A1B1-6C70CE4CD324}.Release|Any CPU.Build.0 = Release|Any CPU + {1F261725-6318-4434-A1B1-6C70CE4CD324}.Release|x86.ActiveCfg = Release|Any CPU + {1F261725-6318-4434-A1B1-6C70CE4CD324}.Release|x86.Build.0 = Release|Any CPU {3EAA45A9-735C-4AC7-A799-947B93EA449D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {3EAA45A9-735C-4AC7-A799-947B93EA449D}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3EAA45A9-735C-4AC7-A799-947B93EA449D}.Debug|x86.ActiveCfg = Debug|Any CPU + {3EAA45A9-735C-4AC7-A799-947B93EA449D}.Debug|x86.Build.0 = Debug|Any CPU {3EAA45A9-735C-4AC7-A799-947B93EA449D}.Release|Any CPU.ActiveCfg = Release|Any CPU {3EAA45A9-735C-4AC7-A799-947B93EA449D}.Release|Any CPU.Build.0 = Release|Any CPU + {3EAA45A9-735C-4AC7-A799-947B93EA449D}.Release|x86.ActiveCfg = Release|Any CPU + {3EAA45A9-735C-4AC7-A799-947B93EA449D}.Release|x86.Build.0 = Release|Any CPU {C16BEA37-FEE8-4792-B860-48F5BFBD39A9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {C16BEA37-FEE8-4792-B860-48F5BFBD39A9}.Debug|Any CPU.Build.0 = Debug|Any CPU + {C16BEA37-FEE8-4792-B860-48F5BFBD39A9}.Debug|x86.ActiveCfg = Debug|Any CPU + {C16BEA37-FEE8-4792-B860-48F5BFBD39A9}.Debug|x86.Build.0 = Debug|Any CPU {C16BEA37-FEE8-4792-B860-48F5BFBD39A9}.Release|Any CPU.ActiveCfg = Release|Any CPU {C16BEA37-FEE8-4792-B860-48F5BFBD39A9}.Release|Any CPU.Build.0 = Release|Any CPU + {C16BEA37-FEE8-4792-B860-48F5BFBD39A9}.Release|x86.ActiveCfg = Release|Any CPU + {C16BEA37-FEE8-4792-B860-48F5BFBD39A9}.Release|x86.Build.0 = Release|Any CPU {08CE9972-283B-44F4-82FA-966F7DFA6B7A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {08CE9972-283B-44F4-82FA-966F7DFA6B7A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {08CE9972-283B-44F4-82FA-966F7DFA6B7A}.Debug|x86.ActiveCfg = Debug|Any CPU + {08CE9972-283B-44F4-82FA-966F7DFA6B7A}.Debug|x86.Build.0 = Debug|Any CPU {08CE9972-283B-44F4-82FA-966F7DFA6B7A}.Release|Any CPU.ActiveCfg = Release|Any CPU {08CE9972-283B-44F4-82FA-966F7DFA6B7A}.Release|Any CPU.Build.0 = Release|Any CPU + {08CE9972-283B-44F4-82FA-966F7DFA6B7A}.Release|x86.ActiveCfg = Release|Any CPU + {08CE9972-283B-44F4-82FA-966F7DFA6B7A}.Release|x86.Build.0 = Release|Any CPU {D1DA3B8F-7313-4BDA-8880-461C5F007751}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {D1DA3B8F-7313-4BDA-8880-461C5F007751}.Debug|Any CPU.Build.0 = Debug|Any CPU + {D1DA3B8F-7313-4BDA-8880-461C5F007751}.Debug|x86.ActiveCfg = Debug|Any CPU + {D1DA3B8F-7313-4BDA-8880-461C5F007751}.Debug|x86.Build.0 = Debug|Any CPU {D1DA3B8F-7313-4BDA-8880-461C5F007751}.Release|Any CPU.ActiveCfg = Release|Any CPU {D1DA3B8F-7313-4BDA-8880-461C5F007751}.Release|Any CPU.Build.0 = Release|Any CPU + {D1DA3B8F-7313-4BDA-8880-461C5F007751}.Release|x86.ActiveCfg = Release|Any CPU + {D1DA3B8F-7313-4BDA-8880-461C5F007751}.Release|x86.Build.0 = Release|Any CPU {3C532D80-32B4-40E5-B5FE-BC6BAE1A00E7}.Debug|Any CPU.ActiveCfg = Debug|x86 {3C532D80-32B4-40E5-B5FE-BC6BAE1A00E7}.Debug|Any CPU.Build.0 = Debug|x86 + {3C532D80-32B4-40E5-B5FE-BC6BAE1A00E7}.Debug|x86.ActiveCfg = Debug|x86 + {3C532D80-32B4-40E5-B5FE-BC6BAE1A00E7}.Debug|x86.Build.0 = Debug|x86 {3C532D80-32B4-40E5-B5FE-BC6BAE1A00E7}.Release|Any CPU.ActiveCfg = Release|x86 {3C532D80-32B4-40E5-B5FE-BC6BAE1A00E7}.Release|Any CPU.Build.0 = Release|x86 + {3C532D80-32B4-40E5-B5FE-BC6BAE1A00E7}.Release|x86.ActiveCfg = Release|x86 + {3C532D80-32B4-40E5-B5FE-BC6BAE1A00E7}.Release|x86.Build.0 = Release|x86 {72FFB35A-C9E2-4A31-B4FA-E3E3E28DED5F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {72FFB35A-C9E2-4A31-B4FA-E3E3E28DED5F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {72FFB35A-C9E2-4A31-B4FA-E3E3E28DED5F}.Debug|x86.ActiveCfg = Debug|Any CPU + {72FFB35A-C9E2-4A31-B4FA-E3E3E28DED5F}.Debug|x86.Build.0 = Debug|Any CPU {72FFB35A-C9E2-4A31-B4FA-E3E3E28DED5F}.Release|Any CPU.ActiveCfg = Release|Any CPU {72FFB35A-C9E2-4A31-B4FA-E3E3E28DED5F}.Release|Any CPU.Build.0 = Release|Any CPU + {72FFB35A-C9E2-4A31-B4FA-E3E3E28DED5F}.Release|x86.ActiveCfg = Release|Any CPU + {72FFB35A-C9E2-4A31-B4FA-E3E3E28DED5F}.Release|x86.Build.0 = Release|Any CPU {D294A12D-4B38-4F25-9AA6-3D4A6CE26E7B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {D294A12D-4B38-4F25-9AA6-3D4A6CE26E7B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {D294A12D-4B38-4F25-9AA6-3D4A6CE26E7B}.Debug|x86.ActiveCfg = Debug|Any CPU + {D294A12D-4B38-4F25-9AA6-3D4A6CE26E7B}.Debug|x86.Build.0 = Debug|Any CPU {D294A12D-4B38-4F25-9AA6-3D4A6CE26E7B}.Release|Any CPU.ActiveCfg = Release|Any CPU {D294A12D-4B38-4F25-9AA6-3D4A6CE26E7B}.Release|Any CPU.Build.0 = Release|Any CPU + {D294A12D-4B38-4F25-9AA6-3D4A6CE26E7B}.Release|x86.ActiveCfg = Release|Any CPU + {D294A12D-4B38-4F25-9AA6-3D4A6CE26E7B}.Release|x86.Build.0 = Release|Any CPU {FE88FE17-D9FB-4FCC-9A35-6BFFB6B26CC6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {FE88FE17-D9FB-4FCC-9A35-6BFFB6B26CC6}.Debug|Any CPU.Build.0 = Debug|Any CPU + {FE88FE17-D9FB-4FCC-9A35-6BFFB6B26CC6}.Debug|x86.ActiveCfg = Debug|Any CPU + {FE88FE17-D9FB-4FCC-9A35-6BFFB6B26CC6}.Debug|x86.Build.0 = Debug|Any CPU {FE88FE17-D9FB-4FCC-9A35-6BFFB6B26CC6}.Release|Any CPU.ActiveCfg = Release|Any CPU {FE88FE17-D9FB-4FCC-9A35-6BFFB6B26CC6}.Release|Any CPU.Build.0 = Release|Any CPU + {FE88FE17-D9FB-4FCC-9A35-6BFFB6B26CC6}.Release|x86.ActiveCfg = Release|Any CPU + {FE88FE17-D9FB-4FCC-9A35-6BFFB6B26CC6}.Release|x86.Build.0 = Release|Any CPU {BDA49550-5ED1-4C6B-B648-657B2CACD8E0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {BDA49550-5ED1-4C6B-B648-657B2CACD8E0}.Debug|Any CPU.Build.0 = Debug|Any CPU + {BDA49550-5ED1-4C6B-B648-657B2CACD8E0}.Debug|x86.ActiveCfg = Debug|Any CPU + {BDA49550-5ED1-4C6B-B648-657B2CACD8E0}.Debug|x86.Build.0 = Debug|Any CPU {BDA49550-5ED1-4C6B-B648-657B2CACD8E0}.Release|Any CPU.ActiveCfg = Release|Any CPU {BDA49550-5ED1-4C6B-B648-657B2CACD8E0}.Release|Any CPU.Build.0 = Release|Any CPU + {BDA49550-5ED1-4C6B-B648-657B2CACD8E0}.Release|x86.ActiveCfg = Release|Any CPU + {BDA49550-5ED1-4C6B-B648-657B2CACD8E0}.Release|x86.Build.0 = Release|Any CPU {1D18D788-F7EE-4585-A23B-34DC8EC63CB8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {1D18D788-F7EE-4585-A23B-34DC8EC63CB8}.Debug|Any CPU.Build.0 = Debug|Any CPU + {1D18D788-F7EE-4585-A23B-34DC8EC63CB8}.Debug|x86.ActiveCfg = Debug|Any CPU + {1D18D788-F7EE-4585-A23B-34DC8EC63CB8}.Debug|x86.Build.0 = Debug|Any CPU {1D18D788-F7EE-4585-A23B-34DC8EC63CB8}.Release|Any CPU.ActiveCfg = Release|Any CPU {1D18D788-F7EE-4585-A23B-34DC8EC63CB8}.Release|Any CPU.Build.0 = Release|Any CPU + {1D18D788-F7EE-4585-A23B-34DC8EC63CB8}.Release|x86.ActiveCfg = Release|Any CPU + {1D18D788-F7EE-4585-A23B-34DC8EC63CB8}.Release|x86.Build.0 = Release|Any CPU {EC06F96A-AEEC-49D6-B03D-AB87C6EB674C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {EC06F96A-AEEC-49D6-B03D-AB87C6EB674C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {EC06F96A-AEEC-49D6-B03D-AB87C6EB674C}.Debug|x86.ActiveCfg = Debug|Any CPU + {EC06F96A-AEEC-49D6-B03D-AB87C6EB674C}.Debug|x86.Build.0 = Debug|Any CPU {EC06F96A-AEEC-49D6-B03D-AB87C6EB674C}.Release|Any CPU.ActiveCfg = Release|Any CPU {EC06F96A-AEEC-49D6-B03D-AB87C6EB674C}.Release|Any CPU.Build.0 = Release|Any CPU - {3DF4060F-5EE0-41CF-8096-F27355FD5511}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3DF4060F-5EE0-41CF-8096-F27355FD5511}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3DF4060F-5EE0-41CF-8096-F27355FD5511}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3DF4060F-5EE0-41CF-8096-F27355FD5511}.Release|Any CPU.Build.0 = Release|Any CPU + {EC06F96A-AEEC-49D6-B03D-AB87C6EB674C}.Release|x86.ActiveCfg = Release|Any CPU + {EC06F96A-AEEC-49D6-B03D-AB87C6EB674C}.Release|x86.Build.0 = Release|Any CPU + {C2777D59-5CB7-42F4-BF92-166DF88E8ACD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {C2777D59-5CB7-42F4-BF92-166DF88E8ACD}.Debug|Any CPU.Build.0 = Debug|Any CPU + {C2777D59-5CB7-42F4-BF92-166DF88E8ACD}.Debug|x86.ActiveCfg = Debug|Any CPU + {C2777D59-5CB7-42F4-BF92-166DF88E8ACD}.Debug|x86.Build.0 = Debug|Any CPU + {C2777D59-5CB7-42F4-BF92-166DF88E8ACD}.Release|Any CPU.ActiveCfg = Release|Any CPU + {C2777D59-5CB7-42F4-BF92-166DF88E8ACD}.Release|Any CPU.Build.0 = Release|Any CPU + {C2777D59-5CB7-42F4-BF92-166DF88E8ACD}.Release|x86.ActiveCfg = Release|Any CPU + {C2777D59-5CB7-42F4-BF92-166DF88E8ACD}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -616,4 +931,7 @@ Global {1D18D788-F7EE-4585-A23B-34DC8EC63CB8} = {49CE38B8-0460-46BF-9DFF-5B33A0F9EB5E} {EC06F96A-AEEC-49D6-B03D-AB87C6EB674C} = {49CE38B8-0460-46BF-9DFF-5B33A0F9EB5E} EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {7E0E5C42-452C-4F34-9A66-752BEDCC7F71} + EndGlobalSection EndGlobal diff --git a/ToolsProject/Properties/AssemblyInfo.cs b/ToolsProject/Properties/AssemblyInfo.cs new file mode 100644 index 00000000000..21777205ad9 --- /dev/null +++ b/ToolsProject/Properties/AssemblyInfo.cs @@ -0,0 +1,55 @@ +using System.Reflection; +using System.Resources; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; +using System.Windows; + +// General Information about an assembly is controlled through the following +// set of attributes. Change these attribute values to modify the information +// associated with an assembly. +[assembly: AssemblyTitle("ToolsProject")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("ToolsProject")] +[assembly: AssemblyCopyright("Copyright © 2018")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from +// COM, set the ComVisible attribute to true on that type. +[assembly: ComVisible(false)] + +//In order to begin building localizable applications, set +//CultureYouAreCodingWith in your .csproj file +//inside a . For example, if you are using US english +//in your source files, set the to en-US. Then uncomment +//the NeutralResourceLanguage attribute below. Update the "en-US" in +//the line below to match the UICulture setting in the project file. + +//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)] + + +[assembly: ThemeInfo( + ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located + //(used if a resource is not found in the page, + // or application resource dictionaries) + ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located + //(used if a resource is not found in the page, + // app, or any theme specific resource dictionaries) +)] + + +// Version information for an assembly consists of the following four values: +// +// Major Version +// Minor Version +// Build Number +// Revision +// +// You can specify all the values or you can default the Build and Revision Numbers +// by using the '*' as shown below: +// [assembly: AssemblyVersion("1.0.*")] +[assembly: AssemblyVersion("1.0.0.0")] +[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/ToolsProject/Properties/Resources.Designer.cs b/ToolsProject/Properties/Resources.Designer.cs new file mode 100644 index 00000000000..ee84e3b592a --- /dev/null +++ b/ToolsProject/Properties/Resources.Designer.cs @@ -0,0 +1,71 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Runtime Version:4.0.30319.42000 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace ToolsProject.Properties +{ + + + /// + /// A strongly-typed resource class, for looking up localized strings, etc. + /// + // This class was auto-generated by the StronglyTypedResourceBuilder + // class via a tool like ResGen or Visual Studio. + // To add or remove a member, edit your .ResX file then rerun ResGen + // with the /str option, or rebuild your VS project. + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] + internal class Resources + { + + private static global::System.Resources.ResourceManager resourceMan; + + private static global::System.Globalization.CultureInfo resourceCulture; + + [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] + internal Resources() + { + } + + /// + /// Returns the cached ResourceManager instance used by this class. + /// + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + internal static global::System.Resources.ResourceManager ResourceManager + { + get + { + if ((resourceMan == null)) + { + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("ToolsProject.Properties.Resources", typeof(Resources).Assembly); + resourceMan = temp; + } + return resourceMan; + } + } + + /// + /// Overrides the current thread's CurrentUICulture property for all + /// resource lookups using this strongly typed resource class. + /// + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + internal static global::System.Globalization.CultureInfo Culture + { + get + { + return resourceCulture; + } + set + { + resourceCulture = value; + } + } + } +} diff --git a/ToolsProject/Properties/Resources.resx b/ToolsProject/Properties/Resources.resx new file mode 100644 index 00000000000..af7dbebbace --- /dev/null +++ b/ToolsProject/Properties/Resources.resx @@ -0,0 +1,117 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/ToolsProject/Properties/Settings.Designer.cs b/ToolsProject/Properties/Settings.Designer.cs new file mode 100644 index 00000000000..df89a3af5a1 --- /dev/null +++ b/ToolsProject/Properties/Settings.Designer.cs @@ -0,0 +1,30 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Runtime Version:4.0.30319.42000 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace ToolsProject.Properties +{ + + + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")] + internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase + { + + private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); + + public static Settings Default + { + get + { + return defaultInstance; + } + } + } +} diff --git a/ToolsProject/Properties/Settings.settings b/ToolsProject/Properties/Settings.settings new file mode 100644 index 00000000000..033d7a5e9e2 --- /dev/null +++ b/ToolsProject/Properties/Settings.settings @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/ToolsProject/ToolsProject.csproj b/ToolsProject/ToolsProject.csproj new file mode 100644 index 00000000000..6ab91ec300a --- /dev/null +++ b/ToolsProject/ToolsProject.csproj @@ -0,0 +1,77 @@ + + + + + Debug + AnyCPU + {C5B59412-9F32-417F-97A0-99BBA2834221} + WinExe + ToolsProject + ToolsProject + v4.7.2 + 512 + {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + 4 + true + true + + + AnyCPU + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + + + AnyCPU + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + + + + + + + + + + + + 4.0 + + + + + + + + Code + + + True + True + Resources.resx + + + True + Settings.settings + True + + + ResXFileCodeGenerator + Resources.Designer.cs + + + SettingsSingleFileGenerator + Settings.Designer.cs + + + + \ No newline at end of file diff --git a/debugbuild.bat b/debugbuild.bat index fbc59e4a417..2acfacf54fc 100755 --- a/debugbuild.bat +++ b/debugbuild.bat @@ -3,7 +3,7 @@ @if not exist "src\Libraries\AvalonEdit\ICSharpCode.AvalonEdit.sln" ( git submodule update --init || exit /b 1 ) -"%PROGFILES%\MSBuild\12.0\Bin\msbuild" /m SharpDevelop.sln /p:Configuration=Debug "/p:Platform=Any CPU" %* +"%PROGFILES%\Microsoft Visual Studio\2017\Community\MSBuild\15.0\Bin\msbuild" /m SharpDevelop.sln /p:Configuration=Debug "/p:Platform=Any CPU" %* @IF %ERRORLEVEL% NEQ 0 GOTO err @exit /B 0 :err diff --git a/src/AddIns/Analysis/CodeAnalysis/CodeAnalysis.csproj b/src/AddIns/Analysis/CodeAnalysis/CodeAnalysis.csproj index 899865c3a3e..ada0648bce1 100644 --- a/src/AddIns/Analysis/CodeAnalysis/CodeAnalysis.csproj +++ b/src/AddIns/Analysis/CodeAnalysis/CodeAnalysis.csproj @@ -1,5 +1,5 @@  - + Library ICSharpCode.CodeAnalysis @@ -17,7 +17,7 @@ 4096 4 false - v4.5 + v4.7.2 diff --git a/src/AddIns/Analysis/CodeCoverage/Project/CodeCoverage.csproj b/src/AddIns/Analysis/CodeCoverage/Project/CodeCoverage.csproj index 0e933ac44c4..a92f256786f 100644 --- a/src/AddIns/Analysis/CodeCoverage/Project/CodeCoverage.csproj +++ b/src/AddIns/Analysis/CodeCoverage/Project/CodeCoverage.csproj @@ -1,5 +1,5 @@  - + Library ICSharpCode.CodeCoverage @@ -16,7 +16,7 @@ 4096 4 False - v4.5 + v4.7.2 False @@ -114,7 +114,9 @@ - + + Component + diff --git a/src/AddIns/Analysis/CodeQuality/CodeQuality.csproj b/src/AddIns/Analysis/CodeQuality/CodeQuality.csproj index 2d9b18d0104..5b38ccac64b 100644 --- a/src/AddIns/Analysis/CodeQuality/CodeQuality.csproj +++ b/src/AddIns/Analysis/CodeQuality/CodeQuality.csproj @@ -1,5 +1,5 @@  - + {3C532D80-32B4-40E5-B5FE-BC6BAE1A00E7} Debug @@ -7,7 +7,7 @@ Library ICSharpCode.CodeQuality ICSharpCode.CodeQuality - v4.5 + v4.7.2 Properties ..\..\..\..\AddIns\Analysis\CodeQuality\ False @@ -113,15 +113,7 @@ - - - - - - - - - + diff --git a/src/AddIns/Analysis/MachineSpecifications/MachineSpecifications/MachineSpecifications.csproj b/src/AddIns/Analysis/MachineSpecifications/MachineSpecifications/MachineSpecifications.csproj index 352f98e36ae..4acd59f5480 100644 --- a/src/AddIns/Analysis/MachineSpecifications/MachineSpecifications/MachineSpecifications.csproj +++ b/src/AddIns/Analysis/MachineSpecifications/MachineSpecifications/MachineSpecifications.csproj @@ -1,5 +1,5 @@  - + Library ICSharpCode.MachineSpecifications @@ -19,7 +19,7 @@ Auto 4194304 4096 - v4.5 + v4.7.2 False @@ -137,8 +137,6 @@ False - - - + \ No newline at end of file diff --git a/src/AddIns/Analysis/Profiler/Controller/Profiler.Controller.csproj b/src/AddIns/Analysis/Profiler/Controller/Profiler.Controller.csproj index ab9dbf6b097..08fb9d0d975 100644 --- a/src/AddIns/Analysis/Profiler/Controller/Profiler.Controller.csproj +++ b/src/AddIns/Analysis/Profiler/Controller/Profiler.Controller.csproj @@ -1,5 +1,5 @@  - + Debug AnyCPU @@ -10,7 +10,7 @@ Properties ICSharpCode.Profiler.Controller ICSharpCode.Profiler.Controller - v4.5 + v4.7.2 512 True False @@ -168,9 +168,7 @@ true - - - + {fe88fe17-d9fb-4fcc-9a35-6bffb6b26cc6} diff --git a/src/AddIns/Analysis/Profiler/Frontend/AddIn/Profiler.AddIn.csproj b/src/AddIns/Analysis/Profiler/Frontend/AddIn/Profiler.AddIn.csproj index 1ecf707da1d..b9c94037d22 100644 --- a/src/AddIns/Analysis/Profiler/Frontend/AddIn/Profiler.AddIn.csproj +++ b/src/AddIns/Analysis/Profiler/Frontend/AddIn/Profiler.AddIn.csproj @@ -1,5 +1,5 @@  - + {D294A12D-4B38-4F25-9AA6-3D4A6CE26E7B} Debug @@ -7,7 +7,7 @@ Library ICSharpCode.Profiler.AddIn ICSharpCode.Profiler.AddIn - v4.5 + v4.7.2 False False 4 diff --git a/src/AddIns/Analysis/Profiler/Frontend/Controls/Profiler.Controls.csproj b/src/AddIns/Analysis/Profiler/Frontend/Controls/Profiler.Controls.csproj index 7fc301caf78..f20508bb559 100644 --- a/src/AddIns/Analysis/Profiler/Frontend/Controls/Profiler.Controls.csproj +++ b/src/AddIns/Analysis/Profiler/Frontend/Controls/Profiler.Controls.csproj @@ -1,5 +1,5 @@  - + {BDA49550-5ED1-4C6B-B648-657B2CACD8E0} Debug @@ -7,7 +7,7 @@ Library ICSharpCode.Profiler.Controls ICSharpCode.Profiler.Controls - v4.5 + v4.7.2 Properties C:\Dokumente und Einstellungen\HP\Anwendungsdaten\ICSharpCode/SharpDevelop3.0\Settings.SourceAnalysis False diff --git a/src/AddIns/Analysis/Profiler/X64Converter/Profiler.X64Converter.csproj b/src/AddIns/Analysis/Profiler/X64Converter/Profiler.X64Converter.csproj index 9ef3d87ab1d..16254890f6a 100644 --- a/src/AddIns/Analysis/Profiler/X64Converter/Profiler.X64Converter.csproj +++ b/src/AddIns/Analysis/Profiler/X64Converter/Profiler.X64Converter.csproj @@ -1,5 +1,5 @@  - + Debug AnyCPU @@ -10,7 +10,7 @@ Properties X64Converter Profiler.X64Converter - v4.5 + v4.7.2 512 C:\Users\Siegfried\AppData\Roaming\ICSharpCode/SharpDevelop3.0\Settings.SourceAnalysis False diff --git a/src/AddIns/Analysis/Profiler/X64Converter/app.config b/src/AddIns/Analysis/Profiler/X64Converter/app.config index 9008dd2558b..3f87f55148c 100644 --- a/src/AddIns/Analysis/Profiler/X64Converter/app.config +++ b/src/AddIns/Analysis/Profiler/X64Converter/app.config @@ -1,6 +1,6 @@ - + - + - \ No newline at end of file + diff --git a/src/AddIns/Analysis/SourceAnalysis/SourceAnalysis.csproj b/src/AddIns/Analysis/SourceAnalysis/SourceAnalysis.csproj index d0b10ce5d31..33aa944e7e3 100644 --- a/src/AddIns/Analysis/SourceAnalysis/SourceAnalysis.csproj +++ b/src/AddIns/Analysis/SourceAnalysis/SourceAnalysis.csproj @@ -1,5 +1,5 @@  - + Library ICSharpCode.SourceAnalysis @@ -17,7 +17,7 @@ 4096 4 False - v4.5 + v4.7.2 False False diff --git a/src/AddIns/Analysis/UnitTesting/UnitTesting.csproj b/src/AddIns/Analysis/UnitTesting/UnitTesting.csproj index f0fc6bba0f6..43c2161ad8e 100644 --- a/src/AddIns/Analysis/UnitTesting/UnitTesting.csproj +++ b/src/AddIns/Analysis/UnitTesting/UnitTesting.csproj @@ -1,5 +1,5 @@  - + Library ICSharpCode.UnitTesting @@ -17,7 +17,7 @@ 4096 4 false - v4.5 + v4.7.2 @@ -155,16 +155,7 @@ False - - - - - - - - - - + diff --git a/src/AddIns/BackendBindings/AspNet.Mvc/Project/AspNet.Mvc.csproj b/src/AddIns/BackendBindings/AspNet.Mvc/Project/AspNet.Mvc.csproj index 95273c0e26a..0cfdef60e61 100644 --- a/src/AddIns/BackendBindings/AspNet.Mvc/Project/AspNet.Mvc.csproj +++ b/src/AddIns/BackendBindings/AspNet.Mvc/Project/AspNet.Mvc.csproj @@ -1,5 +1,5 @@  - + {D781721F-C2A7-4E95-B76F-247170AC3B13} Debug @@ -7,7 +7,7 @@ Library ICSharpCode.AspNet.Mvc AspNet.Mvc - v4.5 + v4.7.2 Properties ..\..\..\..\..\AddIns\BackendBindings\AspNet.Mvc\ @@ -73,37 +73,47 @@ Create.tt True + True Delete.tt True + True Details.tt True + True Edit.tt True + True Empty.tt + True + True List.tt True + True Create.tt True + True Delete.tt True + True Details.tt True + True Details.tt @@ -112,13 +122,17 @@ Edit.tt True + True Empty.tt + True + True List.tt True + True @@ -239,7 +253,9 @@ - + + Component + @@ -256,23 +272,7 @@ - - - - - - - - - - - - - - - - - + diff --git a/src/AddIns/BackendBindings/AspNet.Mvc/Project/ItemTemplates/CSharp/CodeTemplates/AddView/AspxCSharp/Create.cs b/src/AddIns/BackendBindings/AspNet.Mvc/Project/ItemTemplates/CSharp/CodeTemplates/AddView/AspxCSharp/Create.cs index 52987a70a07..2899ecb913e 100644 --- a/src/AddIns/BackendBindings/AspNet.Mvc/Project/ItemTemplates/CSharp/CodeTemplates/AddView/AspxCSharp/Create.cs +++ b/src/AddIns/BackendBindings/AspNet.Mvc/Project/ItemTemplates/CSharp/CodeTemplates/AddView/AspxCSharp/Create.cs @@ -1,186 +1,85 @@ -//------------------------------------------------------------------------------ +// ------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.239 -// +// Runtime Version: 15.0.0.0 +// // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. // -//------------------------------------------------------------------------------ - -namespace ICSharpCode.AspNet.Mvc.AspxCSharp { +// ------------------------------------------------------------------------------ +namespace ICSharpCode.AspNet.Mvc.AspxCSharp +{ using ICSharpCode.AspNet.Mvc; using System.Collections.Generic; using System.Reflection; using System; + /// + /// Class to produce the template output + /// - public partial class Create : CreateBase { - - private global::Microsoft.VisualStudio.TextTemplating.ITextTemplatingEngineHost hostValue; - - - #line 75 "D:\projects\dotnet\SharpDevelop.AspNetMvc\src\AddIns\BackendBindings\AspNet.Mvc\Project\ItemTemplates\CSharp\CodeTemplates\AddView\AspxCSharp\Create.tt" - - MvcTextTemplateHost MvcHost { - get { return (MvcTextTemplateHost)Host; } - } - - public class ModelProperty - { - public string Name { get; set; } - public bool IsPrimaryKey { get; set; } - - public ModelProperty(PropertyInfo propertyInfo) - { - this.Name = propertyInfo.Name; - this.IsPrimaryKey = IsPrimaryKeyProperty(propertyInfo); - } - - bool IsPrimaryKeyProperty(PropertyInfo propertyInfo) - { - return - IsIdProperty(propertyInfo) || - IsIdPropertyPrefixedWithClassName(propertyInfo); - } - - bool IsIdProperty(PropertyInfo propertyInfo) - { - return IsMatchIgnoringCase(propertyInfo.Name, "id"); - } - - bool IsIdPropertyPrefixedWithClassName(PropertyInfo propertyInfo) - { - string prefixedIdPropertyName = propertyInfo.DeclaringType.Name + "id"; - return IsMatchIgnoringCase(propertyInfo.Name, prefixedIdPropertyName); - } - - static bool IsMatchIgnoringCase(string a, string b) - { - return String.Equals(a, b, StringComparison.OrdinalIgnoreCase); - } - } - - public string GetViewPageType() - { - string viewDataTypeName = MvcHost.ViewDataTypeName; - if (!String.IsNullOrEmpty(viewDataTypeName)) { - return String.Format("<{0}>", viewDataTypeName); - } - return String.Empty; - } - - public IEnumerable GetModelProperties() - { - var properties = new List(); - foreach (PropertyInfo propertyInfo in MvcHost.GetViewDataTypeProperties()) { - properties.Add(new ModelProperty(propertyInfo)); - } - return properties; - } - - #line default - #line hidden - - - public global::Microsoft.VisualStudio.TextTemplating.ITextTemplatingEngineHost Host { - get { - return this.hostValue; - } - set { - this.hostValue = value; - } - } - - public virtual string TransformText() { - this.GenerationEnvironment = null; - - #line 5 "D:\projects\dotnet\SharpDevelop.AspNetMvc\src\AddIns\BackendBindings\AspNet.Mvc\Project\ItemTemplates\CSharp\CodeTemplates\AddView\AspxCSharp\Create.tt" + #line 1 "C:\Users\Stefan\Source\Repos\SharpDevelop\src\AddIns\BackendBindings\AspNet.Mvc\Project\ItemTemplates\CSharp\CodeTemplates\AddView\AspxCSharp\Create.tt" + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "15.0.0.0")] + public partial class Create : CreateBase + { +#line hidden + /// + /// Create the template output + /// + public virtual string TransformText() + { + + #line 5 "C:\Users\Stefan\Source\Repos\SharpDevelop\src\AddIns\BackendBindings\AspNet.Mvc\Project\ItemTemplates\CSharp\CodeTemplates\AddView\AspxCSharp\Create.tt" if (MvcHost.IsPartialView) { #line default #line hidden - - #line 6 "D:\projects\dotnet\SharpDevelop.AspNetMvc\src\AddIns\BackendBindings\AspNet.Mvc\Project\ItemTemplates\CSharp\CodeTemplates\AddView\AspxCSharp\Create.tt" this.Write("<%@ Control Language=\"C#\" Inherits=\"System.Web.Mvc.ViewUserControl"); - #line default - #line hidden - - #line 6 "D:\projects\dotnet\SharpDevelop.AspNetMvc\src\AddIns\BackendBindings\AspNet.Mvc\Project\ItemTemplates\CSharp\CodeTemplates\AddView\AspxCSharp\Create.tt" - this.Write(this.ToStringHelper.ToStringWithCulture( GetViewPageType() )); + #line 6 "C:\Users\Stefan\Source\Repos\SharpDevelop\src\AddIns\BackendBindings\AspNet.Mvc\Project\ItemTemplates\CSharp\CodeTemplates\AddView\AspxCSharp\Create.tt" + this.Write(this.ToStringHelper.ToStringWithCulture(GetViewPageType())); #line default #line hidden - - #line 6 "D:\projects\dotnet\SharpDevelop.AspNetMvc\src\AddIns\BackendBindings\AspNet.Mvc\Project\ItemTemplates\CSharp\CodeTemplates\AddView\AspxCSharp\Create.tt" this.Write("\" %>\r\n\r\n"); - #line default - #line hidden - - #line 8 "D:\projects\dotnet\SharpDevelop.AspNetMvc\src\AddIns\BackendBindings\AspNet.Mvc\Project\ItemTemplates\CSharp\CodeTemplates\AddView\AspxCSharp\Create.tt" + #line 8 "C:\Users\Stefan\Source\Repos\SharpDevelop\src\AddIns\BackendBindings\AspNet.Mvc\Project\ItemTemplates\CSharp\CodeTemplates\AddView\AspxCSharp\Create.tt" } else if (MvcHost.IsContentPage) { #line default #line hidden - - #line 9 "D:\projects\dotnet\SharpDevelop.AspNetMvc\src\AddIns\BackendBindings\AspNet.Mvc\Project\ItemTemplates\CSharp\CodeTemplates\AddView\AspxCSharp\Create.tt" this.Write("<%@ Page Language=\"C#\" MasterPageFile=\""); - #line default - #line hidden - - #line 9 "D:\projects\dotnet\SharpDevelop.AspNetMvc\src\AddIns\BackendBindings\AspNet.Mvc\Project\ItemTemplates\CSharp\CodeTemplates\AddView\AspxCSharp\Create.tt" - this.Write(this.ToStringHelper.ToStringWithCulture( MvcHost.MasterPageFile )); + #line 9 "C:\Users\Stefan\Source\Repos\SharpDevelop\src\AddIns\BackendBindings\AspNet.Mvc\Project\ItemTemplates\CSharp\CodeTemplates\AddView\AspxCSharp\Create.tt" + this.Write(this.ToStringHelper.ToStringWithCulture(MvcHost.MasterPageFile)); #line default #line hidden - - #line 9 "D:\projects\dotnet\SharpDevelop.AspNetMvc\src\AddIns\BackendBindings\AspNet.Mvc\Project\ItemTemplates\CSharp\CodeTemplates\AddView\AspxCSharp\Create.tt" this.Write("\" Inherits=\"System.Web.Mvc.ViewPage"); - #line default - #line hidden - - #line 9 "D:\projects\dotnet\SharpDevelop.AspNetMvc\src\AddIns\BackendBindings\AspNet.Mvc\Project\ItemTemplates\CSharp\CodeTemplates\AddView\AspxCSharp\Create.tt" - this.Write(this.ToStringHelper.ToStringWithCulture( GetViewPageType() )); + #line 9 "C:\Users\Stefan\Source\Repos\SharpDevelop\src\AddIns\BackendBindings\AspNet.Mvc\Project\ItemTemplates\CSharp\CodeTemplates\AddView\AspxCSharp\Create.tt" + this.Write(this.ToStringHelper.ToStringWithCulture(GetViewPageType())); #line default #line hidden - - #line 9 "D:\projects\dotnet\SharpDevelop.AspNetMvc\src\AddIns\BackendBindings\AspNet.Mvc\Project\ItemTemplates\CSharp\CodeTemplates\AddView\AspxCSharp\Create.tt" this.Write("\" %>\r\n\r\n\r\n" + ""); - #line default - #line hidden - - #line 12 "D:\projects\dotnet\SharpDevelop.AspNetMvc\src\AddIns\BackendBindings\AspNet.Mvc\Project\ItemTemplates\CSharp\CodeTemplates\AddView\AspxCSharp\Create.tt" - this.Write(this.ToStringHelper.ToStringWithCulture( MvcHost.ViewName )); + #line 12 "C:\Users\Stefan\Source\Repos\SharpDevelop\src\AddIns\BackendBindings\AspNet.Mvc\Project\ItemTemplates\CSharp\CodeTemplates\AddView\AspxCSharp\Create.tt" + this.Write(this.ToStringHelper.ToStringWithCulture(MvcHost.ViewName)); #line default #line hidden - - #line 12 "D:\projects\dotnet\SharpDevelop.AspNetMvc\src\AddIns\BackendBindings\AspNet.Mvc\Project\ItemTemplates\CSharp\CodeTemplates\AddView\AspxCSharp\Create.tt" this.Write("\r\n\r\n\r\n\r\n"); - #line default - #line hidden - - #line 68 "D:\projects\dotnet\SharpDevelop.AspNetMvc\src\AddIns\BackendBindings\AspNet.Mvc\Project\ItemTemplates\CSharp\CodeTemplates\AddView\AspxCSharp\Create.tt" + #line 68 "C:\Users\Stefan\Source\Repos\SharpDevelop\src\AddIns\BackendBindings\AspNet.Mvc\Project\ItemTemplates\CSharp\CodeTemplates\AddView\AspxCSharp\Create.tt" } else { PopIndent(); @@ -340,225 +184,367 @@ public virtual string TransformText() { #line default #line hidden - - #line 72 "D:\projects\dotnet\SharpDevelop.AspNetMvc\src\AddIns\BackendBindings\AspNet.Mvc\Project\ItemTemplates\CSharp\CodeTemplates\AddView\AspxCSharp\Create.tt" this.Write("\t\r\n\r\n"); - #line default - #line hidden - - #line 74 "D:\projects\dotnet\SharpDevelop.AspNetMvc\src\AddIns\BackendBindings\AspNet.Mvc\Project\ItemTemplates\CSharp\CodeTemplates\AddView\AspxCSharp\Create.tt" + #line 74 "C:\Users\Stefan\Source\Repos\SharpDevelop\src\AddIns\BackendBindings\AspNet.Mvc\Project\ItemTemplates\CSharp\CodeTemplates\AddView\AspxCSharp\Create.tt" } #line default #line hidden return this.GenerationEnvironment.ToString(); } - - protected virtual void Initialize() { - } - } - - public class CreateBase { - - private global::System.Text.StringBuilder builder; - - private global::System.Collections.Generic.IDictionary session; - - private global::System.CodeDom.Compiler.CompilerErrorCollection errors; - - private string currentIndent = string.Empty; - - private global::System.Collections.Generic.Stack indents; - - private bool endsWithNewline; - - private ToStringInstanceHelper _toStringHelper = new ToStringInstanceHelper(); - - public virtual global::System.Collections.Generic.IDictionary Session { - get { - return this.session; + private global::Microsoft.VisualStudio.TextTemplating.ITextTemplatingEngineHost hostValue; + /// + /// The current host for the text templating engine + /// + public virtual global::Microsoft.VisualStudio.TextTemplating.ITextTemplatingEngineHost Host + { + get + { + return this.hostValue; } - set { - this.session = value; + set + { + this.hostValue = value; } } - public global::System.Text.StringBuilder GenerationEnvironment { - get { - if ((this.builder == null)) { - this.builder = new global::System.Text.StringBuilder(); + #line 75 "C:\Users\Stefan\Source\Repos\SharpDevelop\src\AddIns\BackendBindings\AspNet.Mvc\Project\ItemTemplates\CSharp\CodeTemplates\AddView\AspxCSharp\Create.tt" + + MvcTextTemplateHost MvcHost { + get { return (MvcTextTemplateHost)Host; } + } + + public class ModelProperty + { + public string Name { get; set; } + public bool IsPrimaryKey { get; set; } + + public ModelProperty(PropertyInfo propertyInfo) + { + this.Name = propertyInfo.Name; + this.IsPrimaryKey = IsPrimaryKeyProperty(propertyInfo); + } + + bool IsPrimaryKeyProperty(PropertyInfo propertyInfo) + { + return + IsIdProperty(propertyInfo) || + IsIdPropertyPrefixedWithClassName(propertyInfo); + } + + bool IsIdProperty(PropertyInfo propertyInfo) + { + return IsMatchIgnoringCase(propertyInfo.Name, "id"); + } + + bool IsIdPropertyPrefixedWithClassName(PropertyInfo propertyInfo) + { + string prefixedIdPropertyName = propertyInfo.DeclaringType.Name + "id"; + return IsMatchIgnoringCase(propertyInfo.Name, prefixedIdPropertyName); + } + + static bool IsMatchIgnoringCase(string a, string b) + { + return String.Equals(a, b, StringComparison.OrdinalIgnoreCase); + } + } + + public string GetViewPageType() + { + string viewDataTypeName = MvcHost.ViewDataTypeName; + if (!String.IsNullOrEmpty(viewDataTypeName)) { + return String.Format("<{0}>", viewDataTypeName); + } + return String.Empty; + } + + public IEnumerable GetModelProperties() + { + var properties = new List(); + foreach (PropertyInfo propertyInfo in MvcHost.GetViewDataTypeProperties()) { + properties.Add(new ModelProperty(propertyInfo)); + } + return properties; + } + + + #line default + #line hidden + } + + #line default + #line hidden + #region Base class + /// + /// Base class for this transformation + /// + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "15.0.0.0")] + public class CreateBase + { + #region Fields + private global::System.Text.StringBuilder generationEnvironmentField; + private global::System.CodeDom.Compiler.CompilerErrorCollection errorsField; + private global::System.Collections.Generic.List indentLengthsField; + private string currentIndentField = ""; + private bool endsWithNewline; + private global::System.Collections.Generic.IDictionary sessionField; + #endregion + #region Properties + /// + /// The string builder that generation-time code is using to assemble generated output + /// + protected System.Text.StringBuilder GenerationEnvironment + { + get + { + if ((this.generationEnvironmentField == null)) + { + this.generationEnvironmentField = new global::System.Text.StringBuilder(); } - return this.builder; + return this.generationEnvironmentField; } - set { - this.builder = value; + set + { + this.generationEnvironmentField = value; } } - - protected global::System.CodeDom.Compiler.CompilerErrorCollection Errors { - get { - if ((this.errors == null)) { - this.errors = new global::System.CodeDom.Compiler.CompilerErrorCollection(); + /// + /// The error collection for the generation process + /// + public System.CodeDom.Compiler.CompilerErrorCollection Errors + { + get + { + if ((this.errorsField == null)) + { + this.errorsField = new global::System.CodeDom.Compiler.CompilerErrorCollection(); } - return this.errors; - } - } - - public string CurrentIndent { - get { - return this.currentIndent; + return this.errorsField; } } - - private global::System.Collections.Generic.Stack Indents { - get { - if ((this.indents == null)) { - this.indents = new global::System.Collections.Generic.Stack(); + /// + /// A list of the lengths of each indent that was added with PushIndent + /// + private System.Collections.Generic.List indentLengths + { + get + { + if ((this.indentLengthsField == null)) + { + this.indentLengthsField = new global::System.Collections.Generic.List(); } - return this.indents; + return this.indentLengthsField; } } - - public ToStringInstanceHelper ToStringHelper { - get { - return this._toStringHelper; + /// + /// Gets the current indent we use when adding lines to the output + /// + public string CurrentIndent + { + get + { + return this.currentIndentField; } } - - public void Error(string message) { - this.Errors.Add(new global::System.CodeDom.Compiler.CompilerError(null, -1, -1, null, message)); - } - - public void Warning(string message) { - global::System.CodeDom.Compiler.CompilerError val = new global::System.CodeDom.Compiler.CompilerError(null, -1, -1, null, message); - val.IsWarning = true; - this.Errors.Add(val); - } - - public string PopIndent() { - if ((this.Indents.Count == 0)) { - return string.Empty; + /// + /// Current transformation session + /// + public virtual global::System.Collections.Generic.IDictionary Session + { + get + { + return this.sessionField; + } + set + { + this.sessionField = value; } - int lastPos = (this.currentIndent.Length - this.Indents.Pop()); - string last = this.currentIndent.Substring(lastPos); - this.currentIndent = this.currentIndent.Substring(0, lastPos); - return last; - } - - public void PushIndent(string indent) { - this.Indents.Push(indent.Length); - this.currentIndent = (this.currentIndent + indent); - } - - public void ClearIndent() { - this.currentIndent = string.Empty; - this.Indents.Clear(); } - - public void Write(string textToAppend) { - if (string.IsNullOrEmpty(textToAppend)) { + #endregion + #region Transform-time helpers + /// + /// Write text directly into the generated output + /// + public void Write(string textToAppend) + { + if (string.IsNullOrEmpty(textToAppend)) + { return; } - if ((((this.GenerationEnvironment.Length == 0) - || this.endsWithNewline) - && (this.CurrentIndent.Length > 0))) { - this.GenerationEnvironment.Append(this.CurrentIndent); + // If we're starting off, or if the previous text ended with a newline, + // we have to append the current indent first. + if (((this.GenerationEnvironment.Length == 0) + || this.endsWithNewline)) + { + this.GenerationEnvironment.Append(this.currentIndentField); + this.endsWithNewline = false; } - this.endsWithNewline = false; - char last = textToAppend[(textToAppend.Length - 1)]; - if (((last == '\n') - || (last == '\r'))) { + // Check if the current text ends with a newline + if (textToAppend.EndsWith(global::System.Environment.NewLine, global::System.StringComparison.CurrentCulture)) + { this.endsWithNewline = true; } - if ((this.CurrentIndent.Length == 0)) { + // This is an optimization. If the current indent is "", then we don't have to do any + // of the more complex stuff further down. + if ((this.currentIndentField.Length == 0)) + { this.GenerationEnvironment.Append(textToAppend); return; } - int lastNewline = 0; - for (int i = 0; (i - < (textToAppend.Length - 1)); i = (i + 1)) { - char c = textToAppend[i]; - if ((c == '\r')) { - if ((textToAppend[(i + 1)] == '\n')) { - i = (i + 1); - if ((i - == (textToAppend.Length - 1))) { - goto breakLoop; - } - } - } - else { - if ((c != '\n')) { - goto continueLoop; - } - } - i = (i + 1); - int len = (i - lastNewline); - if ((len > 0)) { - this.GenerationEnvironment.Append(textToAppend, lastNewline, (i - lastNewline)); - } - this.GenerationEnvironment.Append(this.CurrentIndent); - lastNewline = i; - continueLoop: - ; - } - breakLoop: - if ((lastNewline > 0)) { - this.GenerationEnvironment.Append(textToAppend, lastNewline, (textToAppend.Length - lastNewline)); + // Everywhere there is a newline in the text, add an indent after it + textToAppend = textToAppend.Replace(global::System.Environment.NewLine, (global::System.Environment.NewLine + this.currentIndentField)); + // If the text ends with a newline, then we should strip off the indent added at the very end + // because the appropriate indent will be added when the next time Write() is called + if (this.endsWithNewline) + { + this.GenerationEnvironment.Append(textToAppend, 0, (textToAppend.Length - this.currentIndentField.Length)); } - else { + else + { this.GenerationEnvironment.Append(textToAppend); } } - - public void Write(string format, params object[] args) { - this.Write(string.Format(format, args)); - } - - public void WriteLine(string textToAppend) { + /// + /// Write text directly into the generated output + /// + public void WriteLine(string textToAppend) + { this.Write(textToAppend); this.GenerationEnvironment.AppendLine(); this.endsWithNewline = true; } - - public void WriteLine(string format, params object[] args) { - this.WriteLine(string.Format(format, args)); + /// + /// Write formatted text directly into the generated output + /// + public void Write(string format, params object[] args) + { + this.Write(string.Format(global::System.Globalization.CultureInfo.CurrentCulture, format, args)); } - - public class ToStringInstanceHelper { - - private global::System.IFormatProvider formatProvider = global::System.Globalization.CultureInfo.InvariantCulture; - - public global::System.IFormatProvider FormatProvider { - get { - return this.formatProvider; + /// + /// Write formatted text directly into the generated output + /// + public void WriteLine(string format, params object[] args) + { + this.WriteLine(string.Format(global::System.Globalization.CultureInfo.CurrentCulture, format, args)); + } + /// + /// Raise an error + /// + public void Error(string message) + { + System.CodeDom.Compiler.CompilerError error = new global::System.CodeDom.Compiler.CompilerError(); + error.ErrorText = message; + this.Errors.Add(error); + } + /// + /// Raise a warning + /// + public void Warning(string message) + { + System.CodeDom.Compiler.CompilerError error = new global::System.CodeDom.Compiler.CompilerError(); + error.ErrorText = message; + error.IsWarning = true; + this.Errors.Add(error); + } + /// + /// Increase the indent + /// + public void PushIndent(string indent) + { + if ((indent == null)) + { + throw new global::System.ArgumentNullException("indent"); + } + this.currentIndentField = (this.currentIndentField + indent); + this.indentLengths.Add(indent.Length); + } + /// + /// Remove the last indent that was added with PushIndent + /// + public string PopIndent() + { + string returnValue = ""; + if ((this.indentLengths.Count > 0)) + { + int indentLength = this.indentLengths[(this.indentLengths.Count - 1)]; + this.indentLengths.RemoveAt((this.indentLengths.Count - 1)); + if ((indentLength > 0)) + { + returnValue = this.currentIndentField.Substring((this.currentIndentField.Length - indentLength)); + this.currentIndentField = this.currentIndentField.Remove((this.currentIndentField.Length - indentLength)); + } + } + return returnValue; + } + /// + /// Remove any indentation + /// + public void ClearIndent() + { + this.indentLengths.Clear(); + this.currentIndentField = ""; + } + #endregion + #region ToString Helpers + /// + /// Utility class to produce culture-oriented representation of an object as a string. + /// + public class ToStringInstanceHelper + { + private System.IFormatProvider formatProviderField = global::System.Globalization.CultureInfo.InvariantCulture; + /// + /// Gets or sets format provider to be used by ToStringWithCulture method. + /// + public System.IFormatProvider FormatProvider + { + get + { + return this.formatProviderField ; } - set { - if ((this.formatProvider == null)) { - throw new global::System.ArgumentNullException("formatProvider"); + set + { + if ((value != null)) + { + this.formatProviderField = value; } - this.formatProvider = value; } } - - public string ToStringWithCulture(object objectToConvert) { - if ((objectToConvert == null)) { + /// + /// This is called from the compile/run appdomain to convert objects within an expression block to a string + /// + public string ToStringWithCulture(object objectToConvert) + { + if ((objectToConvert == null)) + { throw new global::System.ArgumentNullException("objectToConvert"); } - global::System.Type type = objectToConvert.GetType(); - global::System.Type iConvertibleType = typeof(global::System.IConvertible); - if (iConvertibleType.IsAssignableFrom(type)) { - return ((global::System.IConvertible)(objectToConvert)).ToString(this.formatProvider); + System.Type t = objectToConvert.GetType(); + System.Reflection.MethodInfo method = t.GetMethod("ToString", new System.Type[] { + typeof(System.IFormatProvider)}); + if ((method == null)) + { + return objectToConvert.ToString(); } - global::System.Reflection.MethodInfo methInfo = type.GetMethod("ToString", new global::System.Type[] { - iConvertibleType}); - if ((methInfo != null)) { - return ((string)(methInfo.Invoke(objectToConvert, new object[] { - this.formatProvider}))); + else + { + return ((string)(method.Invoke(objectToConvert, new object[] { + this.formatProviderField }))); } - return objectToConvert.ToString(); } } + private ToStringInstanceHelper toStringHelperField = new ToStringInstanceHelper(); + /// + /// Helper to produce culture-oriented representation of an object as a string + /// + public ToStringInstanceHelper ToStringHelper + { + get + { + return this.toStringHelperField; + } + } + #endregion } + #endregion } diff --git a/src/AddIns/BackendBindings/AspNet.Mvc/Project/ItemTemplates/CSharp/CodeTemplates/AddView/AspxCSharp/Delete.cs b/src/AddIns/BackendBindings/AspNet.Mvc/Project/ItemTemplates/CSharp/CodeTemplates/AddView/AspxCSharp/Delete.cs index f6af581755e..04d03a1f4dc 100644 --- a/src/AddIns/BackendBindings/AspNet.Mvc/Project/ItemTemplates/CSharp/CodeTemplates/AddView/AspxCSharp/Delete.cs +++ b/src/AddIns/BackendBindings/AspNet.Mvc/Project/ItemTemplates/CSharp/CodeTemplates/AddView/AspxCSharp/Delete.cs @@ -1,186 +1,85 @@ -//------------------------------------------------------------------------------ +// ------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.239 -// +// Runtime Version: 15.0.0.0 +// // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. // -//------------------------------------------------------------------------------ - -namespace ICSharpCode.AspNet.Mvc.AspxCSharp { +// ------------------------------------------------------------------------------ +namespace ICSharpCode.AspNet.Mvc.AspxCSharp +{ using ICSharpCode.AspNet.Mvc; using System.Collections.Generic; using System.Reflection; using System; + /// + /// Class to produce the template output + /// - public partial class Delete : DeleteBase { - - private global::Microsoft.VisualStudio.TextTemplating.ITextTemplatingEngineHost hostValue; - - - #line 70 "D:\projects\dotnet\SharpDevelop.AspNetMvc\src\AddIns\BackendBindings\AspNet.Mvc\Project\ItemTemplates\CSharp\CodeTemplates\AddView\AspxCSharp\Delete.tt" - - MvcTextTemplateHost MvcHost { - get { return (MvcTextTemplateHost)Host; } - } - - public class ModelProperty - { - public string Name { get; set; } - public bool IsPrimaryKey { get; set; } - - public ModelProperty(PropertyInfo propertyInfo) - { - this.Name = propertyInfo.Name; - this.IsPrimaryKey = IsPrimaryKeyProperty(propertyInfo); - } - - bool IsPrimaryKeyProperty(PropertyInfo propertyInfo) - { - return - IsIdProperty(propertyInfo) || - IsIdPropertyPrefixedWithClassName(propertyInfo); - } - - bool IsIdProperty(PropertyInfo propertyInfo) - { - return IsMatchIgnoringCase(propertyInfo.Name, "id"); - } - - bool IsIdPropertyPrefixedWithClassName(PropertyInfo propertyInfo) - { - string prefixedIdPropertyName = propertyInfo.DeclaringType.Name + "id"; - return IsMatchIgnoringCase(propertyInfo.Name, prefixedIdPropertyName); - } - - static bool IsMatchIgnoringCase(string a, string b) - { - return String.Equals(a, b, StringComparison.OrdinalIgnoreCase); - } - } - - public string GetViewPageType() - { - string viewDataTypeName = MvcHost.ViewDataTypeName; - if (!String.IsNullOrEmpty(viewDataTypeName)) { - return String.Format("<{0}>", viewDataTypeName); - } - return String.Empty; - } - - public IEnumerable GetModelProperties() - { - var properties = new List(); - foreach (PropertyInfo propertyInfo in MvcHost.GetViewDataTypeProperties()) { - properties.Add(new ModelProperty(propertyInfo)); - } - return properties; - } - - #line default - #line hidden - - - public global::Microsoft.VisualStudio.TextTemplating.ITextTemplatingEngineHost Host { - get { - return this.hostValue; - } - set { - this.hostValue = value; - } - } - - public virtual string TransformText() { - this.GenerationEnvironment = null; - - #line 5 "D:\projects\dotnet\SharpDevelop.AspNetMvc\src\AddIns\BackendBindings\AspNet.Mvc\Project\ItemTemplates\CSharp\CodeTemplates\AddView\AspxCSharp\Delete.tt" + #line 1 "C:\Users\Stefan\Source\Repos\SharpDevelop\src\AddIns\BackendBindings\AspNet.Mvc\Project\ItemTemplates\CSharp\CodeTemplates\AddView\AspxCSharp\Delete.tt" + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "15.0.0.0")] + public partial class Delete : DeleteBase + { +#line hidden + /// + /// Create the template output + /// + public virtual string TransformText() + { + + #line 5 "C:\Users\Stefan\Source\Repos\SharpDevelop\src\AddIns\BackendBindings\AspNet.Mvc\Project\ItemTemplates\CSharp\CodeTemplates\AddView\AspxCSharp\Delete.tt" if (MvcHost.IsPartialView) { #line default #line hidden - - #line 6 "D:\projects\dotnet\SharpDevelop.AspNetMvc\src\AddIns\BackendBindings\AspNet.Mvc\Project\ItemTemplates\CSharp\CodeTemplates\AddView\AspxCSharp\Delete.tt" this.Write("<%@ Control Language=\"C#\" Inherits=\"System.Web.Mvc.ViewUserControl"); - #line default - #line hidden - - #line 6 "D:\projects\dotnet\SharpDevelop.AspNetMvc\src\AddIns\BackendBindings\AspNet.Mvc\Project\ItemTemplates\CSharp\CodeTemplates\AddView\AspxCSharp\Delete.tt" - this.Write(this.ToStringHelper.ToStringWithCulture( GetViewPageType() )); + #line 6 "C:\Users\Stefan\Source\Repos\SharpDevelop\src\AddIns\BackendBindings\AspNet.Mvc\Project\ItemTemplates\CSharp\CodeTemplates\AddView\AspxCSharp\Delete.tt" + this.Write(this.ToStringHelper.ToStringWithCulture(GetViewPageType())); #line default #line hidden - - #line 6 "D:\projects\dotnet\SharpDevelop.AspNetMvc\src\AddIns\BackendBindings\AspNet.Mvc\Project\ItemTemplates\CSharp\CodeTemplates\AddView\AspxCSharp\Delete.tt" this.Write("\" %>\r\n\r\n"); - #line default - #line hidden - - #line 8 "D:\projects\dotnet\SharpDevelop.AspNetMvc\src\AddIns\BackendBindings\AspNet.Mvc\Project\ItemTemplates\CSharp\CodeTemplates\AddView\AspxCSharp\Delete.tt" + #line 8 "C:\Users\Stefan\Source\Repos\SharpDevelop\src\AddIns\BackendBindings\AspNet.Mvc\Project\ItemTemplates\CSharp\CodeTemplates\AddView\AspxCSharp\Delete.tt" } else if (MvcHost.IsContentPage) { #line default #line hidden - - #line 9 "D:\projects\dotnet\SharpDevelop.AspNetMvc\src\AddIns\BackendBindings\AspNet.Mvc\Project\ItemTemplates\CSharp\CodeTemplates\AddView\AspxCSharp\Delete.tt" this.Write("<%@ Page Language=\"C#\" MasterPageFile=\""); - #line default - #line hidden - - #line 9 "D:\projects\dotnet\SharpDevelop.AspNetMvc\src\AddIns\BackendBindings\AspNet.Mvc\Project\ItemTemplates\CSharp\CodeTemplates\AddView\AspxCSharp\Delete.tt" - this.Write(this.ToStringHelper.ToStringWithCulture( MvcHost.MasterPageFile )); + #line 9 "C:\Users\Stefan\Source\Repos\SharpDevelop\src\AddIns\BackendBindings\AspNet.Mvc\Project\ItemTemplates\CSharp\CodeTemplates\AddView\AspxCSharp\Delete.tt" + this.Write(this.ToStringHelper.ToStringWithCulture(MvcHost.MasterPageFile)); #line default #line hidden - - #line 9 "D:\projects\dotnet\SharpDevelop.AspNetMvc\src\AddIns\BackendBindings\AspNet.Mvc\Project\ItemTemplates\CSharp\CodeTemplates\AddView\AspxCSharp\Delete.tt" this.Write("\" Inherits=\"System.Web.Mvc.ViewPage"); - #line default - #line hidden - - #line 9 "D:\projects\dotnet\SharpDevelop.AspNetMvc\src\AddIns\BackendBindings\AspNet.Mvc\Project\ItemTemplates\CSharp\CodeTemplates\AddView\AspxCSharp\Delete.tt" - this.Write(this.ToStringHelper.ToStringWithCulture( GetViewPageType() )); + #line 9 "C:\Users\Stefan\Source\Repos\SharpDevelop\src\AddIns\BackendBindings\AspNet.Mvc\Project\ItemTemplates\CSharp\CodeTemplates\AddView\AspxCSharp\Delete.tt" + this.Write(this.ToStringHelper.ToStringWithCulture(GetViewPageType())); #line default #line hidden - - #line 9 "D:\projects\dotnet\SharpDevelop.AspNetMvc\src\AddIns\BackendBindings\AspNet.Mvc\Project\ItemTemplates\CSharp\CodeTemplates\AddView\AspxCSharp\Delete.tt" this.Write("\" %>\r\n\r\n\r\n" + ""); - #line default - #line hidden - - #line 12 "D:\projects\dotnet\SharpDevelop.AspNetMvc\src\AddIns\BackendBindings\AspNet.Mvc\Project\ItemTemplates\CSharp\CodeTemplates\AddView\AspxCSharp\Delete.tt" - this.Write(this.ToStringHelper.ToStringWithCulture( MvcHost.ViewName )); + #line 12 "C:\Users\Stefan\Source\Repos\SharpDevelop\src\AddIns\BackendBindings\AspNet.Mvc\Project\ItemTemplates\CSharp\CodeTemplates\AddView\AspxCSharp\Delete.tt" + this.Write(this.ToStringHelper.ToStringWithCulture(MvcHost.ViewName)); #line default #line hidden - - #line 12 "D:\projects\dotnet\SharpDevelop.AspNetMvc\src\AddIns\BackendBindings\AspNet.Mvc\Project\ItemTemplates\CSharp\CodeTemplates\AddView\AspxCSharp\Delete.tt" this.Write("\r\n\r\n\r\n\r\n"); - #line default - #line hidden - - #line 63 "D:\projects\dotnet\SharpDevelop.AspNetMvc\src\AddIns\BackendBindings\AspNet.Mvc\Project\ItemTemplates\CSharp\CodeTemplates\AddView\AspxCSharp\Delete.tt" + #line 63 "C:\Users\Stefan\Source\Repos\SharpDevelop\src\AddIns\BackendBindings\AspNet.Mvc\Project\ItemTemplates\CSharp\CodeTemplates\AddView\AspxCSharp\Delete.tt" } else { PopIndent(); @@ -327,225 +176,367 @@ public virtual string TransformText() { #line default #line hidden - - #line 67 "D:\projects\dotnet\SharpDevelop.AspNetMvc\src\AddIns\BackendBindings\AspNet.Mvc\Project\ItemTemplates\CSharp\CodeTemplates\AddView\AspxCSharp\Delete.tt" this.Write("\t\r\n\r\n"); - #line default - #line hidden - - #line 69 "D:\projects\dotnet\SharpDevelop.AspNetMvc\src\AddIns\BackendBindings\AspNet.Mvc\Project\ItemTemplates\CSharp\CodeTemplates\AddView\AspxCSharp\Delete.tt" + #line 69 "C:\Users\Stefan\Source\Repos\SharpDevelop\src\AddIns\BackendBindings\AspNet.Mvc\Project\ItemTemplates\CSharp\CodeTemplates\AddView\AspxCSharp\Delete.tt" } #line default #line hidden return this.GenerationEnvironment.ToString(); } - - protected virtual void Initialize() { - } - } - - public class DeleteBase { - - private global::System.Text.StringBuilder builder; - - private global::System.Collections.Generic.IDictionary session; - - private global::System.CodeDom.Compiler.CompilerErrorCollection errors; - - private string currentIndent = string.Empty; - - private global::System.Collections.Generic.Stack indents; - - private bool endsWithNewline; - - private ToStringInstanceHelper _toStringHelper = new ToStringInstanceHelper(); - - public virtual global::System.Collections.Generic.IDictionary Session { - get { - return this.session; + private global::Microsoft.VisualStudio.TextTemplating.ITextTemplatingEngineHost hostValue; + /// + /// The current host for the text templating engine + /// + public virtual global::Microsoft.VisualStudio.TextTemplating.ITextTemplatingEngineHost Host + { + get + { + return this.hostValue; } - set { - this.session = value; + set + { + this.hostValue = value; } } - public global::System.Text.StringBuilder GenerationEnvironment { - get { - if ((this.builder == null)) { - this.builder = new global::System.Text.StringBuilder(); + #line 70 "C:\Users\Stefan\Source\Repos\SharpDevelop\src\AddIns\BackendBindings\AspNet.Mvc\Project\ItemTemplates\CSharp\CodeTemplates\AddView\AspxCSharp\Delete.tt" + + MvcTextTemplateHost MvcHost { + get { return (MvcTextTemplateHost)Host; } + } + + public class ModelProperty + { + public string Name { get; set; } + public bool IsPrimaryKey { get; set; } + + public ModelProperty(PropertyInfo propertyInfo) + { + this.Name = propertyInfo.Name; + this.IsPrimaryKey = IsPrimaryKeyProperty(propertyInfo); + } + + bool IsPrimaryKeyProperty(PropertyInfo propertyInfo) + { + return + IsIdProperty(propertyInfo) || + IsIdPropertyPrefixedWithClassName(propertyInfo); + } + + bool IsIdProperty(PropertyInfo propertyInfo) + { + return IsMatchIgnoringCase(propertyInfo.Name, "id"); + } + + bool IsIdPropertyPrefixedWithClassName(PropertyInfo propertyInfo) + { + string prefixedIdPropertyName = propertyInfo.DeclaringType.Name + "id"; + return IsMatchIgnoringCase(propertyInfo.Name, prefixedIdPropertyName); + } + + static bool IsMatchIgnoringCase(string a, string b) + { + return String.Equals(a, b, StringComparison.OrdinalIgnoreCase); + } + } + + public string GetViewPageType() + { + string viewDataTypeName = MvcHost.ViewDataTypeName; + if (!String.IsNullOrEmpty(viewDataTypeName)) { + return String.Format("<{0}>", viewDataTypeName); + } + return String.Empty; + } + + public IEnumerable GetModelProperties() + { + var properties = new List(); + foreach (PropertyInfo propertyInfo in MvcHost.GetViewDataTypeProperties()) { + properties.Add(new ModelProperty(propertyInfo)); + } + return properties; + } + + + #line default + #line hidden + } + + #line default + #line hidden + #region Base class + /// + /// Base class for this transformation + /// + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "15.0.0.0")] + public class DeleteBase + { + #region Fields + private global::System.Text.StringBuilder generationEnvironmentField; + private global::System.CodeDom.Compiler.CompilerErrorCollection errorsField; + private global::System.Collections.Generic.List indentLengthsField; + private string currentIndentField = ""; + private bool endsWithNewline; + private global::System.Collections.Generic.IDictionary sessionField; + #endregion + #region Properties + /// + /// The string builder that generation-time code is using to assemble generated output + /// + protected System.Text.StringBuilder GenerationEnvironment + { + get + { + if ((this.generationEnvironmentField == null)) + { + this.generationEnvironmentField = new global::System.Text.StringBuilder(); } - return this.builder; + return this.generationEnvironmentField; } - set { - this.builder = value; + set + { + this.generationEnvironmentField = value; } } - - protected global::System.CodeDom.Compiler.CompilerErrorCollection Errors { - get { - if ((this.errors == null)) { - this.errors = new global::System.CodeDom.Compiler.CompilerErrorCollection(); + /// + /// The error collection for the generation process + /// + public System.CodeDom.Compiler.CompilerErrorCollection Errors + { + get + { + if ((this.errorsField == null)) + { + this.errorsField = new global::System.CodeDom.Compiler.CompilerErrorCollection(); } - return this.errors; + return this.errorsField; } } - - public string CurrentIndent { - get { - return this.currentIndent; - } - } - - private global::System.Collections.Generic.Stack Indents { - get { - if ((this.indents == null)) { - this.indents = new global::System.Collections.Generic.Stack(); + /// + /// A list of the lengths of each indent that was added with PushIndent + /// + private System.Collections.Generic.List indentLengths + { + get + { + if ((this.indentLengthsField == null)) + { + this.indentLengthsField = new global::System.Collections.Generic.List(); } - return this.indents; + return this.indentLengthsField; } } - - public ToStringInstanceHelper ToStringHelper { - get { - return this._toStringHelper; + /// + /// Gets the current indent we use when adding lines to the output + /// + public string CurrentIndent + { + get + { + return this.currentIndentField; } } - - public void Error(string message) { - this.Errors.Add(new global::System.CodeDom.Compiler.CompilerError(null, -1, -1, null, message)); - } - - public void Warning(string message) { - global::System.CodeDom.Compiler.CompilerError val = new global::System.CodeDom.Compiler.CompilerError(null, -1, -1, null, message); - val.IsWarning = true; - this.Errors.Add(val); - } - - public string PopIndent() { - if ((this.Indents.Count == 0)) { - return string.Empty; + /// + /// Current transformation session + /// + public virtual global::System.Collections.Generic.IDictionary Session + { + get + { + return this.sessionField; + } + set + { + this.sessionField = value; } - int lastPos = (this.currentIndent.Length - this.Indents.Pop()); - string last = this.currentIndent.Substring(lastPos); - this.currentIndent = this.currentIndent.Substring(0, lastPos); - return last; - } - - public void PushIndent(string indent) { - this.Indents.Push(indent.Length); - this.currentIndent = (this.currentIndent + indent); - } - - public void ClearIndent() { - this.currentIndent = string.Empty; - this.Indents.Clear(); } - - public void Write(string textToAppend) { - if (string.IsNullOrEmpty(textToAppend)) { + #endregion + #region Transform-time helpers + /// + /// Write text directly into the generated output + /// + public void Write(string textToAppend) + { + if (string.IsNullOrEmpty(textToAppend)) + { return; } - if ((((this.GenerationEnvironment.Length == 0) - || this.endsWithNewline) - && (this.CurrentIndent.Length > 0))) { - this.GenerationEnvironment.Append(this.CurrentIndent); + // If we're starting off, or if the previous text ended with a newline, + // we have to append the current indent first. + if (((this.GenerationEnvironment.Length == 0) + || this.endsWithNewline)) + { + this.GenerationEnvironment.Append(this.currentIndentField); + this.endsWithNewline = false; } - this.endsWithNewline = false; - char last = textToAppend[(textToAppend.Length - 1)]; - if (((last == '\n') - || (last == '\r'))) { + // Check if the current text ends with a newline + if (textToAppend.EndsWith(global::System.Environment.NewLine, global::System.StringComparison.CurrentCulture)) + { this.endsWithNewline = true; } - if ((this.CurrentIndent.Length == 0)) { + // This is an optimization. If the current indent is "", then we don't have to do any + // of the more complex stuff further down. + if ((this.currentIndentField.Length == 0)) + { this.GenerationEnvironment.Append(textToAppend); return; } - int lastNewline = 0; - for (int i = 0; (i - < (textToAppend.Length - 1)); i = (i + 1)) { - char c = textToAppend[i]; - if ((c == '\r')) { - if ((textToAppend[(i + 1)] == '\n')) { - i = (i + 1); - if ((i - == (textToAppend.Length - 1))) { - goto breakLoop; - } - } - } - else { - if ((c != '\n')) { - goto continueLoop; - } - } - i = (i + 1); - int len = (i - lastNewline); - if ((len > 0)) { - this.GenerationEnvironment.Append(textToAppend, lastNewline, (i - lastNewline)); - } - this.GenerationEnvironment.Append(this.CurrentIndent); - lastNewline = i; - continueLoop: - ; + // Everywhere there is a newline in the text, add an indent after it + textToAppend = textToAppend.Replace(global::System.Environment.NewLine, (global::System.Environment.NewLine + this.currentIndentField)); + // If the text ends with a newline, then we should strip off the indent added at the very end + // because the appropriate indent will be added when the next time Write() is called + if (this.endsWithNewline) + { + this.GenerationEnvironment.Append(textToAppend, 0, (textToAppend.Length - this.currentIndentField.Length)); } - breakLoop: - if ((lastNewline > 0)) { - this.GenerationEnvironment.Append(textToAppend, lastNewline, (textToAppend.Length - lastNewline)); - } - else { + else + { this.GenerationEnvironment.Append(textToAppend); } } - - public void Write(string format, params object[] args) { - this.Write(string.Format(format, args)); - } - - public void WriteLine(string textToAppend) { + /// + /// Write text directly into the generated output + /// + public void WriteLine(string textToAppend) + { this.Write(textToAppend); this.GenerationEnvironment.AppendLine(); this.endsWithNewline = true; } - - public void WriteLine(string format, params object[] args) { - this.WriteLine(string.Format(format, args)); + /// + /// Write formatted text directly into the generated output + /// + public void Write(string format, params object[] args) + { + this.Write(string.Format(global::System.Globalization.CultureInfo.CurrentCulture, format, args)); } - - public class ToStringInstanceHelper { - - private global::System.IFormatProvider formatProvider = global::System.Globalization.CultureInfo.InvariantCulture; - - public global::System.IFormatProvider FormatProvider { - get { - return this.formatProvider; + /// + /// Write formatted text directly into the generated output + /// + public void WriteLine(string format, params object[] args) + { + this.WriteLine(string.Format(global::System.Globalization.CultureInfo.CurrentCulture, format, args)); + } + /// + /// Raise an error + /// + public void Error(string message) + { + System.CodeDom.Compiler.CompilerError error = new global::System.CodeDom.Compiler.CompilerError(); + error.ErrorText = message; + this.Errors.Add(error); + } + /// + /// Raise a warning + /// + public void Warning(string message) + { + System.CodeDom.Compiler.CompilerError error = new global::System.CodeDom.Compiler.CompilerError(); + error.ErrorText = message; + error.IsWarning = true; + this.Errors.Add(error); + } + /// + /// Increase the indent + /// + public void PushIndent(string indent) + { + if ((indent == null)) + { + throw new global::System.ArgumentNullException("indent"); + } + this.currentIndentField = (this.currentIndentField + indent); + this.indentLengths.Add(indent.Length); + } + /// + /// Remove the last indent that was added with PushIndent + /// + public string PopIndent() + { + string returnValue = ""; + if ((this.indentLengths.Count > 0)) + { + int indentLength = this.indentLengths[(this.indentLengths.Count - 1)]; + this.indentLengths.RemoveAt((this.indentLengths.Count - 1)); + if ((indentLength > 0)) + { + returnValue = this.currentIndentField.Substring((this.currentIndentField.Length - indentLength)); + this.currentIndentField = this.currentIndentField.Remove((this.currentIndentField.Length - indentLength)); + } + } + return returnValue; + } + /// + /// Remove any indentation + /// + public void ClearIndent() + { + this.indentLengths.Clear(); + this.currentIndentField = ""; + } + #endregion + #region ToString Helpers + /// + /// Utility class to produce culture-oriented representation of an object as a string. + /// + public class ToStringInstanceHelper + { + private System.IFormatProvider formatProviderField = global::System.Globalization.CultureInfo.InvariantCulture; + /// + /// Gets or sets format provider to be used by ToStringWithCulture method. + /// + public System.IFormatProvider FormatProvider + { + get + { + return this.formatProviderField ; } - set { - if ((this.formatProvider == null)) { - throw new global::System.ArgumentNullException("formatProvider"); + set + { + if ((value != null)) + { + this.formatProviderField = value; } - this.formatProvider = value; } } - - public string ToStringWithCulture(object objectToConvert) { - if ((objectToConvert == null)) { + /// + /// This is called from the compile/run appdomain to convert objects within an expression block to a string + /// + public string ToStringWithCulture(object objectToConvert) + { + if ((objectToConvert == null)) + { throw new global::System.ArgumentNullException("objectToConvert"); } - global::System.Type type = objectToConvert.GetType(); - global::System.Type iConvertibleType = typeof(global::System.IConvertible); - if (iConvertibleType.IsAssignableFrom(type)) { - return ((global::System.IConvertible)(objectToConvert)).ToString(this.formatProvider); + System.Type t = objectToConvert.GetType(); + System.Reflection.MethodInfo method = t.GetMethod("ToString", new System.Type[] { + typeof(System.IFormatProvider)}); + if ((method == null)) + { + return objectToConvert.ToString(); } - global::System.Reflection.MethodInfo methInfo = type.GetMethod("ToString", new global::System.Type[] { - iConvertibleType}); - if ((methInfo != null)) { - return ((string)(methInfo.Invoke(objectToConvert, new object[] { - this.formatProvider}))); + else + { + return ((string)(method.Invoke(objectToConvert, new object[] { + this.formatProviderField }))); } - return objectToConvert.ToString(); } } + private ToStringInstanceHelper toStringHelperField = new ToStringInstanceHelper(); + /// + /// Helper to produce culture-oriented representation of an object as a string + /// + public ToStringInstanceHelper ToStringHelper + { + get + { + return this.toStringHelperField; + } + } + #endregion } + #endregion } diff --git a/src/AddIns/BackendBindings/AspNet.Mvc/Project/ItemTemplates/CSharp/CodeTemplates/AddView/AspxCSharp/Details.cs b/src/AddIns/BackendBindings/AspNet.Mvc/Project/ItemTemplates/CSharp/CodeTemplates/AddView/AspxCSharp/Details.cs index 039a2b4b91c..33072ba48ef 100644 --- a/src/AddIns/BackendBindings/AspNet.Mvc/Project/ItemTemplates/CSharp/CodeTemplates/AddView/AspxCSharp/Details.cs +++ b/src/AddIns/BackendBindings/AspNet.Mvc/Project/ItemTemplates/CSharp/CodeTemplates/AddView/AspxCSharp/Details.cs @@ -1,222 +1,85 @@ -//------------------------------------------------------------------------------ +// ------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.239 -// +// Runtime Version: 15.0.0.0 +// // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. // -//------------------------------------------------------------------------------ - -namespace ICSharpCode.AspNet.Mvc.AspxCSharp { +// ------------------------------------------------------------------------------ +namespace ICSharpCode.AspNet.Mvc.AspxCSharp +{ using ICSharpCode.AspNet.Mvc; using System.Collections.Generic; using System.Reflection; using System; + /// + /// Class to produce the template output + /// - public partial class Details : DetailsBase { - - private global::Microsoft.VisualStudio.TextTemplating.ITextTemplatingEngineHost hostValue; - - - #line 72 "D:\projects\dotnet\SharpDevelop.AspNetMvc\src\AddIns\BackendBindings\AspNet.Mvc\Project\ItemTemplates\CSharp\CodeTemplates\AddView\AspxCSharp\Details.tt" - - MvcTextTemplateHost MvcHost { - get { return (MvcTextTemplateHost)Host; } - } - - public class ModelProperty - { - public string Name { get; set; } - public bool IsPrimaryKey { get; set; } - - public ModelProperty(PropertyInfo propertyInfo) - { - this.Name = propertyInfo.Name; - this.IsPrimaryKey = IsPrimaryKeyProperty(propertyInfo); - } - - bool IsPrimaryKeyProperty(PropertyInfo propertyInfo) - { - return - IsIdProperty(propertyInfo) || - IsIdPropertyPrefixedWithClassName(propertyInfo); - } - - bool IsIdProperty(PropertyInfo propertyInfo) - { - return IsMatchIgnoringCase(propertyInfo.Name, "id"); - } - - bool IsIdPropertyPrefixedWithClassName(PropertyInfo propertyInfo) - { - string prefixedIdPropertyName = propertyInfo.DeclaringType.Name + "id"; - return IsMatchIgnoringCase(propertyInfo.Name, prefixedIdPropertyName); - } - - static bool IsMatchIgnoringCase(string a, string b) - { - return String.Equals(a, b, StringComparison.OrdinalIgnoreCase); - } - } - - public string GetViewPageType() - { - string viewDataTypeName = MvcHost.ViewDataTypeName; - if (!String.IsNullOrEmpty(viewDataTypeName)) { - return String.Format("<{0}>", viewDataTypeName); - } - return String.Empty; - } - - List modelProperties; - - List ModelProperties { - get { - if (modelProperties == null) { - modelProperties = new List(GetModelProperties()); - } - return modelProperties; - } - } - - public IEnumerable GetModelProperties() - { - var properties = new List(); - foreach (PropertyInfo propertyInfo in MvcHost.GetViewDataTypeProperties()) { - properties.Add(new ModelProperty(propertyInfo)); - } - return properties; - } - - bool ModelHasPrimaryKey { - get { return ModelPrimaryKeyName.Length > 0; } - } - - string modelPrimaryKeyName; - - string ModelPrimaryKeyName { - get { - if (modelPrimaryKeyName == null) { - modelPrimaryKeyName = GetModelPrimaryKeyName(); - } - return modelPrimaryKeyName; - } - } - - public string GetModelPrimaryKeyName() - { - foreach (ModelProperty modelProperty in ModelProperties) { - if (modelProperty.IsPrimaryKey) { - return modelProperty.Name; - } - } - return ""; - } - - #line default - #line hidden - - - public global::Microsoft.VisualStudio.TextTemplating.ITextTemplatingEngineHost Host { - get { - return this.hostValue; - } - set { - this.hostValue = value; - } - } - - public virtual string TransformText() { - this.GenerationEnvironment = null; - - #line 5 "D:\projects\dotnet\SharpDevelop.AspNetMvc\src\AddIns\BackendBindings\AspNet.Mvc\Project\ItemTemplates\CSharp\CodeTemplates\AddView\AspxCSharp\Details.tt" + #line 1 "C:\Users\Stefan\Source\Repos\SharpDevelop\src\AddIns\BackendBindings\AspNet.Mvc\Project\ItemTemplates\CSharp\CodeTemplates\AddView\AspxCSharp\Details.tt" + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "15.0.0.0")] + public partial class Details : DetailsBase + { +#line hidden + /// + /// Create the template output + /// + public virtual string TransformText() + { + + #line 5 "C:\Users\Stefan\Source\Repos\SharpDevelop\src\AddIns\BackendBindings\AspNet.Mvc\Project\ItemTemplates\CSharp\CodeTemplates\AddView\AspxCSharp\Details.tt" if (MvcHost.IsPartialView) { #line default #line hidden - - #line 6 "D:\projects\dotnet\SharpDevelop.AspNetMvc\src\AddIns\BackendBindings\AspNet.Mvc\Project\ItemTemplates\CSharp\CodeTemplates\AddView\AspxCSharp\Details.tt" this.Write("<%@ Control Language=\"C#\" Inherits=\"System.Web.Mvc.ViewUserControl"); - #line default - #line hidden - - #line 6 "D:\projects\dotnet\SharpDevelop.AspNetMvc\src\AddIns\BackendBindings\AspNet.Mvc\Project\ItemTemplates\CSharp\CodeTemplates\AddView\AspxCSharp\Details.tt" - this.Write(this.ToStringHelper.ToStringWithCulture( GetViewPageType() )); + #line 6 "C:\Users\Stefan\Source\Repos\SharpDevelop\src\AddIns\BackendBindings\AspNet.Mvc\Project\ItemTemplates\CSharp\CodeTemplates\AddView\AspxCSharp\Details.tt" + this.Write(this.ToStringHelper.ToStringWithCulture(GetViewPageType())); #line default #line hidden - - #line 6 "D:\projects\dotnet\SharpDevelop.AspNetMvc\src\AddIns\BackendBindings\AspNet.Mvc\Project\ItemTemplates\CSharp\CodeTemplates\AddView\AspxCSharp\Details.tt" this.Write("\" %>\r\n\r\n"); - #line default - #line hidden - - #line 8 "D:\projects\dotnet\SharpDevelop.AspNetMvc\src\AddIns\BackendBindings\AspNet.Mvc\Project\ItemTemplates\CSharp\CodeTemplates\AddView\AspxCSharp\Details.tt" + #line 8 "C:\Users\Stefan\Source\Repos\SharpDevelop\src\AddIns\BackendBindings\AspNet.Mvc\Project\ItemTemplates\CSharp\CodeTemplates\AddView\AspxCSharp\Details.tt" } else if (MvcHost.IsContentPage) { #line default #line hidden - - #line 9 "D:\projects\dotnet\SharpDevelop.AspNetMvc\src\AddIns\BackendBindings\AspNet.Mvc\Project\ItemTemplates\CSharp\CodeTemplates\AddView\AspxCSharp\Details.tt" this.Write("<%@ Page Language=\"C#\" MasterPageFile=\""); - #line default - #line hidden - - #line 9 "D:\projects\dotnet\SharpDevelop.AspNetMvc\src\AddIns\BackendBindings\AspNet.Mvc\Project\ItemTemplates\CSharp\CodeTemplates\AddView\AspxCSharp\Details.tt" - this.Write(this.ToStringHelper.ToStringWithCulture( MvcHost.MasterPageFile )); + #line 9 "C:\Users\Stefan\Source\Repos\SharpDevelop\src\AddIns\BackendBindings\AspNet.Mvc\Project\ItemTemplates\CSharp\CodeTemplates\AddView\AspxCSharp\Details.tt" + this.Write(this.ToStringHelper.ToStringWithCulture(MvcHost.MasterPageFile)); #line default #line hidden - - #line 9 "D:\projects\dotnet\SharpDevelop.AspNetMvc\src\AddIns\BackendBindings\AspNet.Mvc\Project\ItemTemplates\CSharp\CodeTemplates\AddView\AspxCSharp\Details.tt" this.Write("\" Inherits=\"System.Web.Mvc.ViewPage"); - #line default - #line hidden - - #line 9 "D:\projects\dotnet\SharpDevelop.AspNetMvc\src\AddIns\BackendBindings\AspNet.Mvc\Project\ItemTemplates\CSharp\CodeTemplates\AddView\AspxCSharp\Details.tt" - this.Write(this.ToStringHelper.ToStringWithCulture( GetViewPageType() )); + #line 9 "C:\Users\Stefan\Source\Repos\SharpDevelop\src\AddIns\BackendBindings\AspNet.Mvc\Project\ItemTemplates\CSharp\CodeTemplates\AddView\AspxCSharp\Details.tt" + this.Write(this.ToStringHelper.ToStringWithCulture(GetViewPageType())); #line default #line hidden - - #line 9 "D:\projects\dotnet\SharpDevelop.AspNetMvc\src\AddIns\BackendBindings\AspNet.Mvc\Project\ItemTemplates\CSharp\CodeTemplates\AddView\AspxCSharp\Details.tt" this.Write("\" %>\r\n\r\n\r\n" + ""); - #line default - #line hidden - - #line 12 "D:\projects\dotnet\SharpDevelop.AspNetMvc\src\AddIns\BackendBindings\AspNet.Mvc\Project\ItemTemplates\CSharp\CodeTemplates\AddView\AspxCSharp\Details.tt" - this.Write(this.ToStringHelper.ToStringWithCulture( MvcHost.ViewName )); + #line 12 "C:\Users\Stefan\Source\Repos\SharpDevelop\src\AddIns\BackendBindings\AspNet.Mvc\Project\ItemTemplates\CSharp\CodeTemplates\AddView\AspxCSharp\Details.tt" + this.Write(this.ToStringHelper.ToStringWithCulture(MvcHost.ViewName)); #line default #line hidden - - #line 12 "D:\projects\dotnet\SharpDevelop.AspNetMvc\src\AddIns\BackendBindings\AspNet.Mvc\Project\ItemTemplates\CSharp\CodeTemplates\AddView\AspxCSharp\Details.tt" this.Write("\r\n\r\n\r\n\r\n"); - #line default - #line hidden - - #line 65 "D:\projects\dotnet\SharpDevelop.AspNetMvc\src\AddIns\BackendBindings\AspNet.Mvc\Project\ItemTemplates\CSharp\CodeTemplates\AddView\AspxCSharp\Details.tt" + #line 65 "C:\Users\Stefan\Source\Repos\SharpDevelop\src\AddIns\BackendBindings\AspNet.Mvc\Project\ItemTemplates\CSharp\CodeTemplates\AddView\AspxCSharp\Details.tt" } else { PopIndent(); @@ -410,225 +203,403 @@ public virtual string TransformText() { #line default #line hidden - - #line 69 "D:\projects\dotnet\SharpDevelop.AspNetMvc\src\AddIns\BackendBindings\AspNet.Mvc\Project\ItemTemplates\CSharp\CodeTemplates\AddView\AspxCSharp\Details.tt" this.Write("\t\r\n\r\n"); - #line default - #line hidden - - #line 71 "D:\projects\dotnet\SharpDevelop.AspNetMvc\src\AddIns\BackendBindings\AspNet.Mvc\Project\ItemTemplates\CSharp\CodeTemplates\AddView\AspxCSharp\Details.tt" + #line 71 "C:\Users\Stefan\Source\Repos\SharpDevelop\src\AddIns\BackendBindings\AspNet.Mvc\Project\ItemTemplates\CSharp\CodeTemplates\AddView\AspxCSharp\Details.tt" } #line default #line hidden return this.GenerationEnvironment.ToString(); } - - protected virtual void Initialize() { - } - } - - public class DetailsBase { - - private global::System.Text.StringBuilder builder; - - private global::System.Collections.Generic.IDictionary session; - - private global::System.CodeDom.Compiler.CompilerErrorCollection errors; - - private string currentIndent = string.Empty; - - private global::System.Collections.Generic.Stack indents; - - private bool endsWithNewline; - - private ToStringInstanceHelper _toStringHelper = new ToStringInstanceHelper(); - - public virtual global::System.Collections.Generic.IDictionary Session { - get { - return this.session; + private global::Microsoft.VisualStudio.TextTemplating.ITextTemplatingEngineHost hostValue; + /// + /// The current host for the text templating engine + /// + public virtual global::Microsoft.VisualStudio.TextTemplating.ITextTemplatingEngineHost Host + { + get + { + return this.hostValue; } - set { - this.session = value; + set + { + this.hostValue = value; } } - public global::System.Text.StringBuilder GenerationEnvironment { - get { - if ((this.builder == null)) { - this.builder = new global::System.Text.StringBuilder(); + #line 72 "C:\Users\Stefan\Source\Repos\SharpDevelop\src\AddIns\BackendBindings\AspNet.Mvc\Project\ItemTemplates\CSharp\CodeTemplates\AddView\AspxCSharp\Details.tt" + + MvcTextTemplateHost MvcHost { + get { return (MvcTextTemplateHost)Host; } + } + + public class ModelProperty + { + public string Name { get; set; } + public bool IsPrimaryKey { get; set; } + + public ModelProperty(PropertyInfo propertyInfo) + { + this.Name = propertyInfo.Name; + this.IsPrimaryKey = IsPrimaryKeyProperty(propertyInfo); + } + + bool IsPrimaryKeyProperty(PropertyInfo propertyInfo) + { + return + IsIdProperty(propertyInfo) || + IsIdPropertyPrefixedWithClassName(propertyInfo); + } + + bool IsIdProperty(PropertyInfo propertyInfo) + { + return IsMatchIgnoringCase(propertyInfo.Name, "id"); + } + + bool IsIdPropertyPrefixedWithClassName(PropertyInfo propertyInfo) + { + string prefixedIdPropertyName = propertyInfo.DeclaringType.Name + "id"; + return IsMatchIgnoringCase(propertyInfo.Name, prefixedIdPropertyName); + } + + static bool IsMatchIgnoringCase(string a, string b) + { + return String.Equals(a, b, StringComparison.OrdinalIgnoreCase); + } + } + + public string GetViewPageType() + { + string viewDataTypeName = MvcHost.ViewDataTypeName; + if (!String.IsNullOrEmpty(viewDataTypeName)) { + return String.Format("<{0}>", viewDataTypeName); + } + return String.Empty; + } + + List modelProperties; + + List ModelProperties { + get { + if (modelProperties == null) { + modelProperties = new List(GetModelProperties()); + } + return modelProperties; + } + } + + public IEnumerable GetModelProperties() + { + var properties = new List(); + foreach (PropertyInfo propertyInfo in MvcHost.GetViewDataTypeProperties()) { + properties.Add(new ModelProperty(propertyInfo)); + } + return properties; + } + + bool ModelHasPrimaryKey { + get { return ModelPrimaryKeyName.Length > 0; } + } + + string modelPrimaryKeyName; + + string ModelPrimaryKeyName { + get { + if (modelPrimaryKeyName == null) { + modelPrimaryKeyName = GetModelPrimaryKeyName(); + } + return modelPrimaryKeyName; + } + } + + public string GetModelPrimaryKeyName() + { + foreach (ModelProperty modelProperty in ModelProperties) { + if (modelProperty.IsPrimaryKey) { + return modelProperty.Name; + } + } + return ""; + } + + + #line default + #line hidden + } + + #line default + #line hidden + #region Base class + /// + /// Base class for this transformation + /// + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "15.0.0.0")] + public class DetailsBase + { + #region Fields + private global::System.Text.StringBuilder generationEnvironmentField; + private global::System.CodeDom.Compiler.CompilerErrorCollection errorsField; + private global::System.Collections.Generic.List indentLengthsField; + private string currentIndentField = ""; + private bool endsWithNewline; + private global::System.Collections.Generic.IDictionary sessionField; + #endregion + #region Properties + /// + /// The string builder that generation-time code is using to assemble generated output + /// + protected System.Text.StringBuilder GenerationEnvironment + { + get + { + if ((this.generationEnvironmentField == null)) + { + this.generationEnvironmentField = new global::System.Text.StringBuilder(); } - return this.builder; + return this.generationEnvironmentField; } - set { - this.builder = value; + set + { + this.generationEnvironmentField = value; } } - - protected global::System.CodeDom.Compiler.CompilerErrorCollection Errors { - get { - if ((this.errors == null)) { - this.errors = new global::System.CodeDom.Compiler.CompilerErrorCollection(); + /// + /// The error collection for the generation process + /// + public System.CodeDom.Compiler.CompilerErrorCollection Errors + { + get + { + if ((this.errorsField == null)) + { + this.errorsField = new global::System.CodeDom.Compiler.CompilerErrorCollection(); } - return this.errors; - } - } - - public string CurrentIndent { - get { - return this.currentIndent; + return this.errorsField; } } - - private global::System.Collections.Generic.Stack Indents { - get { - if ((this.indents == null)) { - this.indents = new global::System.Collections.Generic.Stack(); + /// + /// A list of the lengths of each indent that was added with PushIndent + /// + private System.Collections.Generic.List indentLengths + { + get + { + if ((this.indentLengthsField == null)) + { + this.indentLengthsField = new global::System.Collections.Generic.List(); } - return this.indents; + return this.indentLengthsField; } } - - public ToStringInstanceHelper ToStringHelper { - get { - return this._toStringHelper; + /// + /// Gets the current indent we use when adding lines to the output + /// + public string CurrentIndent + { + get + { + return this.currentIndentField; } } - - public void Error(string message) { - this.Errors.Add(new global::System.CodeDom.Compiler.CompilerError(null, -1, -1, null, message)); - } - - public void Warning(string message) { - global::System.CodeDom.Compiler.CompilerError val = new global::System.CodeDom.Compiler.CompilerError(null, -1, -1, null, message); - val.IsWarning = true; - this.Errors.Add(val); - } - - public string PopIndent() { - if ((this.Indents.Count == 0)) { - return string.Empty; + /// + /// Current transformation session + /// + public virtual global::System.Collections.Generic.IDictionary Session + { + get + { + return this.sessionField; + } + set + { + this.sessionField = value; } - int lastPos = (this.currentIndent.Length - this.Indents.Pop()); - string last = this.currentIndent.Substring(lastPos); - this.currentIndent = this.currentIndent.Substring(0, lastPos); - return last; - } - - public void PushIndent(string indent) { - this.Indents.Push(indent.Length); - this.currentIndent = (this.currentIndent + indent); - } - - public void ClearIndent() { - this.currentIndent = string.Empty; - this.Indents.Clear(); } - - public void Write(string textToAppend) { - if (string.IsNullOrEmpty(textToAppend)) { + #endregion + #region Transform-time helpers + /// + /// Write text directly into the generated output + /// + public void Write(string textToAppend) + { + if (string.IsNullOrEmpty(textToAppend)) + { return; } - if ((((this.GenerationEnvironment.Length == 0) - || this.endsWithNewline) - && (this.CurrentIndent.Length > 0))) { - this.GenerationEnvironment.Append(this.CurrentIndent); + // If we're starting off, or if the previous text ended with a newline, + // we have to append the current indent first. + if (((this.GenerationEnvironment.Length == 0) + || this.endsWithNewline)) + { + this.GenerationEnvironment.Append(this.currentIndentField); + this.endsWithNewline = false; } - this.endsWithNewline = false; - char last = textToAppend[(textToAppend.Length - 1)]; - if (((last == '\n') - || (last == '\r'))) { + // Check if the current text ends with a newline + if (textToAppend.EndsWith(global::System.Environment.NewLine, global::System.StringComparison.CurrentCulture)) + { this.endsWithNewline = true; } - if ((this.CurrentIndent.Length == 0)) { + // This is an optimization. If the current indent is "", then we don't have to do any + // of the more complex stuff further down. + if ((this.currentIndentField.Length == 0)) + { this.GenerationEnvironment.Append(textToAppend); return; } - int lastNewline = 0; - for (int i = 0; (i - < (textToAppend.Length - 1)); i = (i + 1)) { - char c = textToAppend[i]; - if ((c == '\r')) { - if ((textToAppend[(i + 1)] == '\n')) { - i = (i + 1); - if ((i - == (textToAppend.Length - 1))) { - goto breakLoop; - } - } - } - else { - if ((c != '\n')) { - goto continueLoop; - } - } - i = (i + 1); - int len = (i - lastNewline); - if ((len > 0)) { - this.GenerationEnvironment.Append(textToAppend, lastNewline, (i - lastNewline)); - } - this.GenerationEnvironment.Append(this.CurrentIndent); - lastNewline = i; - continueLoop: - ; - } - breakLoop: - if ((lastNewline > 0)) { - this.GenerationEnvironment.Append(textToAppend, lastNewline, (textToAppend.Length - lastNewline)); + // Everywhere there is a newline in the text, add an indent after it + textToAppend = textToAppend.Replace(global::System.Environment.NewLine, (global::System.Environment.NewLine + this.currentIndentField)); + // If the text ends with a newline, then we should strip off the indent added at the very end + // because the appropriate indent will be added when the next time Write() is called + if (this.endsWithNewline) + { + this.GenerationEnvironment.Append(textToAppend, 0, (textToAppend.Length - this.currentIndentField.Length)); } - else { + else + { this.GenerationEnvironment.Append(textToAppend); } } - - public void Write(string format, params object[] args) { - this.Write(string.Format(format, args)); - } - - public void WriteLine(string textToAppend) { + /// + /// Write text directly into the generated output + /// + public void WriteLine(string textToAppend) + { this.Write(textToAppend); this.GenerationEnvironment.AppendLine(); this.endsWithNewline = true; } - - public void WriteLine(string format, params object[] args) { - this.WriteLine(string.Format(format, args)); + /// + /// Write formatted text directly into the generated output + /// + public void Write(string format, params object[] args) + { + this.Write(string.Format(global::System.Globalization.CultureInfo.CurrentCulture, format, args)); } - - public class ToStringInstanceHelper { - - private global::System.IFormatProvider formatProvider = global::System.Globalization.CultureInfo.InvariantCulture; - - public global::System.IFormatProvider FormatProvider { - get { - return this.formatProvider; + /// + /// Write formatted text directly into the generated output + /// + public void WriteLine(string format, params object[] args) + { + this.WriteLine(string.Format(global::System.Globalization.CultureInfo.CurrentCulture, format, args)); + } + /// + /// Raise an error + /// + public void Error(string message) + { + System.CodeDom.Compiler.CompilerError error = new global::System.CodeDom.Compiler.CompilerError(); + error.ErrorText = message; + this.Errors.Add(error); + } + /// + /// Raise a warning + /// + public void Warning(string message) + { + System.CodeDom.Compiler.CompilerError error = new global::System.CodeDom.Compiler.CompilerError(); + error.ErrorText = message; + error.IsWarning = true; + this.Errors.Add(error); + } + /// + /// Increase the indent + /// + public void PushIndent(string indent) + { + if ((indent == null)) + { + throw new global::System.ArgumentNullException("indent"); + } + this.currentIndentField = (this.currentIndentField + indent); + this.indentLengths.Add(indent.Length); + } + /// + /// Remove the last indent that was added with PushIndent + /// + public string PopIndent() + { + string returnValue = ""; + if ((this.indentLengths.Count > 0)) + { + int indentLength = this.indentLengths[(this.indentLengths.Count - 1)]; + this.indentLengths.RemoveAt((this.indentLengths.Count - 1)); + if ((indentLength > 0)) + { + returnValue = this.currentIndentField.Substring((this.currentIndentField.Length - indentLength)); + this.currentIndentField = this.currentIndentField.Remove((this.currentIndentField.Length - indentLength)); } - set { - if ((this.formatProvider == null)) { - throw new global::System.ArgumentNullException("formatProvider"); + } + return returnValue; + } + /// + /// Remove any indentation + /// + public void ClearIndent() + { + this.indentLengths.Clear(); + this.currentIndentField = ""; + } + #endregion + #region ToString Helpers + /// + /// Utility class to produce culture-oriented representation of an object as a string. + /// + public class ToStringInstanceHelper + { + private System.IFormatProvider formatProviderField = global::System.Globalization.CultureInfo.InvariantCulture; + /// + /// Gets or sets format provider to be used by ToStringWithCulture method. + /// + public System.IFormatProvider FormatProvider + { + get + { + return this.formatProviderField ; + } + set + { + if ((value != null)) + { + this.formatProviderField = value; } - this.formatProvider = value; } } - - public string ToStringWithCulture(object objectToConvert) { - if ((objectToConvert == null)) { + /// + /// This is called from the compile/run appdomain to convert objects within an expression block to a string + /// + public string ToStringWithCulture(object objectToConvert) + { + if ((objectToConvert == null)) + { throw new global::System.ArgumentNullException("objectToConvert"); } - global::System.Type type = objectToConvert.GetType(); - global::System.Type iConvertibleType = typeof(global::System.IConvertible); - if (iConvertibleType.IsAssignableFrom(type)) { - return ((global::System.IConvertible)(objectToConvert)).ToString(this.formatProvider); + System.Type t = objectToConvert.GetType(); + System.Reflection.MethodInfo method = t.GetMethod("ToString", new System.Type[] { + typeof(System.IFormatProvider)}); + if ((method == null)) + { + return objectToConvert.ToString(); } - global::System.Reflection.MethodInfo methInfo = type.GetMethod("ToString", new global::System.Type[] { - iConvertibleType}); - if ((methInfo != null)) { - return ((string)(methInfo.Invoke(objectToConvert, new object[] { - this.formatProvider}))); + else + { + return ((string)(method.Invoke(objectToConvert, new object[] { + this.formatProviderField }))); } - return objectToConvert.ToString(); } } + private ToStringInstanceHelper toStringHelperField = new ToStringInstanceHelper(); + /// + /// Helper to produce culture-oriented representation of an object as a string + /// + public ToStringInstanceHelper ToStringHelper + { + get + { + return this.toStringHelperField; + } + } + #endregion } + #endregion } diff --git a/src/AddIns/BackendBindings/AspNet.Mvc/Project/ItemTemplates/CSharp/CodeTemplates/AddView/AspxCSharp/Edit.cs b/src/AddIns/BackendBindings/AspNet.Mvc/Project/ItemTemplates/CSharp/CodeTemplates/AddView/AspxCSharp/Edit.cs index a959723482a..a0240b46b59 100644 --- a/src/AddIns/BackendBindings/AspNet.Mvc/Project/ItemTemplates/CSharp/CodeTemplates/AddView/AspxCSharp/Edit.cs +++ b/src/AddIns/BackendBindings/AspNet.Mvc/Project/ItemTemplates/CSharp/CodeTemplates/AddView/AspxCSharp/Edit.cs @@ -1,222 +1,85 @@ -//------------------------------------------------------------------------------ +// ------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.239 -// +// Runtime Version: 15.0.0.0 +// // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. // -//------------------------------------------------------------------------------ - -namespace ICSharpCode.AspNet.Mvc.AspxCSharp { +// ------------------------------------------------------------------------------ +namespace ICSharpCode.AspNet.Mvc.AspxCSharp +{ using ICSharpCode.AspNet.Mvc; using System.Collections.Generic; using System.Reflection; using System; + /// + /// Class to produce the template output + /// - public partial class Edit : EditBase { - - private global::Microsoft.VisualStudio.TextTemplating.ITextTemplatingEngineHost hostValue; - - - #line 79 "D:\projects\dotnet\SharpDevelop.AspNetMvc\src\AddIns\BackendBindings\AspNet.Mvc\Project\ItemTemplates\CSharp\CodeTemplates\AddView\AspxCSharp\Edit.tt" - - MvcTextTemplateHost MvcHost { - get { return (MvcTextTemplateHost)Host; } - } - - public class ModelProperty - { - public string Name { get; set; } - public bool IsPrimaryKey { get; set; } - - public ModelProperty(PropertyInfo propertyInfo) - { - this.Name = propertyInfo.Name; - this.IsPrimaryKey = IsPrimaryKeyProperty(propertyInfo); - } - - bool IsPrimaryKeyProperty(PropertyInfo propertyInfo) - { - return - IsIdProperty(propertyInfo) || - IsIdPropertyPrefixedWithClassName(propertyInfo); - } - - bool IsIdProperty(PropertyInfo propertyInfo) - { - return IsMatchIgnoringCase(propertyInfo.Name, "id"); - } - - bool IsIdPropertyPrefixedWithClassName(PropertyInfo propertyInfo) - { - string prefixedIdPropertyName = propertyInfo.DeclaringType.Name + "id"; - return IsMatchIgnoringCase(propertyInfo.Name, prefixedIdPropertyName); - } - - static bool IsMatchIgnoringCase(string a, string b) - { - return String.Equals(a, b, StringComparison.OrdinalIgnoreCase); - } - } - - public string GetViewPageType() - { - string viewDataTypeName = MvcHost.ViewDataTypeName; - if (!String.IsNullOrEmpty(viewDataTypeName)) { - return String.Format("<{0}>", viewDataTypeName); - } - return String.Empty; - } - - List modelProperties; - - List ModelProperties { - get { - if (modelProperties == null) { - modelProperties = new List(GetModelProperties()); - } - return modelProperties; - } - } - - public IEnumerable GetModelProperties() - { - var properties = new List(); - foreach (PropertyInfo propertyInfo in MvcHost.GetViewDataTypeProperties()) { - properties.Add(new ModelProperty(propertyInfo)); - } - return properties; - } - - bool ModelHasPrimaryKey { - get { return ModelPrimaryKeyName.Length > 0; } - } - - string modelPrimaryKeyName; - - string ModelPrimaryKeyName { - get { - if (modelPrimaryKeyName == null) { - modelPrimaryKeyName = GetModelPrimaryKeyName(); - } - return modelPrimaryKeyName; - } - } - - public string GetModelPrimaryKeyName() - { - foreach (ModelProperty modelProperty in ModelProperties) { - if (modelProperty.IsPrimaryKey) { - return modelProperty.Name; - } - } - return ""; - } - - #line default - #line hidden - - - public global::Microsoft.VisualStudio.TextTemplating.ITextTemplatingEngineHost Host { - get { - return this.hostValue; - } - set { - this.hostValue = value; - } - } - - public virtual string TransformText() { - this.GenerationEnvironment = null; - - #line 5 "D:\projects\dotnet\SharpDevelop.AspNetMvc\src\AddIns\BackendBindings\AspNet.Mvc\Project\ItemTemplates\CSharp\CodeTemplates\AddView\AspxCSharp\Edit.tt" + #line 1 "C:\Users\Stefan\Source\Repos\SharpDevelop\src\AddIns\BackendBindings\AspNet.Mvc\Project\ItemTemplates\CSharp\CodeTemplates\AddView\AspxCSharp\Edit.tt" + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "15.0.0.0")] + public partial class Edit : EditBase + { +#line hidden + /// + /// Create the template output + /// + public virtual string TransformText() + { + + #line 5 "C:\Users\Stefan\Source\Repos\SharpDevelop\src\AddIns\BackendBindings\AspNet.Mvc\Project\ItemTemplates\CSharp\CodeTemplates\AddView\AspxCSharp\Edit.tt" if (MvcHost.IsPartialView) { #line default #line hidden - - #line 6 "D:\projects\dotnet\SharpDevelop.AspNetMvc\src\AddIns\BackendBindings\AspNet.Mvc\Project\ItemTemplates\CSharp\CodeTemplates\AddView\AspxCSharp\Edit.tt" this.Write("<%@ Control Language=\"C#\" Inherits=\"System.Web.Mvc.ViewUserControl"); - #line default - #line hidden - - #line 6 "D:\projects\dotnet\SharpDevelop.AspNetMvc\src\AddIns\BackendBindings\AspNet.Mvc\Project\ItemTemplates\CSharp\CodeTemplates\AddView\AspxCSharp\Edit.tt" - this.Write(this.ToStringHelper.ToStringWithCulture( GetViewPageType() )); + #line 6 "C:\Users\Stefan\Source\Repos\SharpDevelop\src\AddIns\BackendBindings\AspNet.Mvc\Project\ItemTemplates\CSharp\CodeTemplates\AddView\AspxCSharp\Edit.tt" + this.Write(this.ToStringHelper.ToStringWithCulture(GetViewPageType())); #line default #line hidden - - #line 6 "D:\projects\dotnet\SharpDevelop.AspNetMvc\src\AddIns\BackendBindings\AspNet.Mvc\Project\ItemTemplates\CSharp\CodeTemplates\AddView\AspxCSharp\Edit.tt" this.Write("\" %>\r\n\r\n"); - #line default - #line hidden - - #line 8 "D:\projects\dotnet\SharpDevelop.AspNetMvc\src\AddIns\BackendBindings\AspNet.Mvc\Project\ItemTemplates\CSharp\CodeTemplates\AddView\AspxCSharp\Edit.tt" + #line 8 "C:\Users\Stefan\Source\Repos\SharpDevelop\src\AddIns\BackendBindings\AspNet.Mvc\Project\ItemTemplates\CSharp\CodeTemplates\AddView\AspxCSharp\Edit.tt" } else if (MvcHost.IsContentPage) { #line default #line hidden - - #line 9 "D:\projects\dotnet\SharpDevelop.AspNetMvc\src\AddIns\BackendBindings\AspNet.Mvc\Project\ItemTemplates\CSharp\CodeTemplates\AddView\AspxCSharp\Edit.tt" this.Write("<%@ Page Language=\"C#\" MasterPageFile=\""); - #line default - #line hidden - - #line 9 "D:\projects\dotnet\SharpDevelop.AspNetMvc\src\AddIns\BackendBindings\AspNet.Mvc\Project\ItemTemplates\CSharp\CodeTemplates\AddView\AspxCSharp\Edit.tt" - this.Write(this.ToStringHelper.ToStringWithCulture( MvcHost.MasterPageFile )); + #line 9 "C:\Users\Stefan\Source\Repos\SharpDevelop\src\AddIns\BackendBindings\AspNet.Mvc\Project\ItemTemplates\CSharp\CodeTemplates\AddView\AspxCSharp\Edit.tt" + this.Write(this.ToStringHelper.ToStringWithCulture(MvcHost.MasterPageFile)); #line default #line hidden - - #line 9 "D:\projects\dotnet\SharpDevelop.AspNetMvc\src\AddIns\BackendBindings\AspNet.Mvc\Project\ItemTemplates\CSharp\CodeTemplates\AddView\AspxCSharp\Edit.tt" this.Write("\" Inherits=\"System.Web.Mvc.ViewPage"); - #line default - #line hidden - - #line 9 "D:\projects\dotnet\SharpDevelop.AspNetMvc\src\AddIns\BackendBindings\AspNet.Mvc\Project\ItemTemplates\CSharp\CodeTemplates\AddView\AspxCSharp\Edit.tt" - this.Write(this.ToStringHelper.ToStringWithCulture( GetViewPageType() )); + #line 9 "C:\Users\Stefan\Source\Repos\SharpDevelop\src\AddIns\BackendBindings\AspNet.Mvc\Project\ItemTemplates\CSharp\CodeTemplates\AddView\AspxCSharp\Edit.tt" + this.Write(this.ToStringHelper.ToStringWithCulture(GetViewPageType())); #line default #line hidden - - #line 9 "D:\projects\dotnet\SharpDevelop.AspNetMvc\src\AddIns\BackendBindings\AspNet.Mvc\Project\ItemTemplates\CSharp\CodeTemplates\AddView\AspxCSharp\Edit.tt" this.Write("\" %>\r\n\r\n\r\n" + ""); - #line default - #line hidden - - #line 12 "D:\projects\dotnet\SharpDevelop.AspNetMvc\src\AddIns\BackendBindings\AspNet.Mvc\Project\ItemTemplates\CSharp\CodeTemplates\AddView\AspxCSharp\Edit.tt" - this.Write(this.ToStringHelper.ToStringWithCulture( MvcHost.ViewName )); + #line 12 "C:\Users\Stefan\Source\Repos\SharpDevelop\src\AddIns\BackendBindings\AspNet.Mvc\Project\ItemTemplates\CSharp\CodeTemplates\AddView\AspxCSharp\Edit.tt" + this.Write(this.ToStringHelper.ToStringWithCulture(MvcHost.ViewName)); #line default #line hidden - - #line 12 "D:\projects\dotnet\SharpDevelop.AspNetMvc\src\AddIns\BackendBindings\AspNet.Mvc\Project\ItemTemplates\CSharp\CodeTemplates\AddView\AspxCSharp\Edit.tt" this.Write("\r\n\r\n\r\n\r\n"); - #line default - #line hidden - - #line 72 "D:\projects\dotnet\SharpDevelop.AspNetMvc\src\AddIns\BackendBindings\AspNet.Mvc\Project\ItemTemplates\CSharp\CodeTemplates\AddView\AspxCSharp\Edit.tt" + #line 72 "C:\Users\Stefan\Source\Repos\SharpDevelop\src\AddIns\BackendBindings\AspNet.Mvc\Project\ItemTemplates\CSharp\CodeTemplates\AddView\AspxCSharp\Edit.tt" } else { PopIndent(); @@ -394,225 +197,403 @@ public virtual string TransformText() { #line default #line hidden - - #line 76 "D:\projects\dotnet\SharpDevelop.AspNetMvc\src\AddIns\BackendBindings\AspNet.Mvc\Project\ItemTemplates\CSharp\CodeTemplates\AddView\AspxCSharp\Edit.tt" this.Write("\t\r\n\r\n"); - #line default - #line hidden - - #line 78 "D:\projects\dotnet\SharpDevelop.AspNetMvc\src\AddIns\BackendBindings\AspNet.Mvc\Project\ItemTemplates\CSharp\CodeTemplates\AddView\AspxCSharp\Edit.tt" + #line 78 "C:\Users\Stefan\Source\Repos\SharpDevelop\src\AddIns\BackendBindings\AspNet.Mvc\Project\ItemTemplates\CSharp\CodeTemplates\AddView\AspxCSharp\Edit.tt" } #line default #line hidden return this.GenerationEnvironment.ToString(); } - - protected virtual void Initialize() { - } - } - - public class EditBase { - - private global::System.Text.StringBuilder builder; - - private global::System.Collections.Generic.IDictionary session; - - private global::System.CodeDom.Compiler.CompilerErrorCollection errors; - - private string currentIndent = string.Empty; - - private global::System.Collections.Generic.Stack indents; - - private bool endsWithNewline; - - private ToStringInstanceHelper _toStringHelper = new ToStringInstanceHelper(); - - public virtual global::System.Collections.Generic.IDictionary Session { - get { - return this.session; + private global::Microsoft.VisualStudio.TextTemplating.ITextTemplatingEngineHost hostValue; + /// + /// The current host for the text templating engine + /// + public virtual global::Microsoft.VisualStudio.TextTemplating.ITextTemplatingEngineHost Host + { + get + { + return this.hostValue; } - set { - this.session = value; + set + { + this.hostValue = value; } } - public global::System.Text.StringBuilder GenerationEnvironment { - get { - if ((this.builder == null)) { - this.builder = new global::System.Text.StringBuilder(); + #line 79 "C:\Users\Stefan\Source\Repos\SharpDevelop\src\AddIns\BackendBindings\AspNet.Mvc\Project\ItemTemplates\CSharp\CodeTemplates\AddView\AspxCSharp\Edit.tt" + + MvcTextTemplateHost MvcHost { + get { return (MvcTextTemplateHost)Host; } + } + + public class ModelProperty + { + public string Name { get; set; } + public bool IsPrimaryKey { get; set; } + + public ModelProperty(PropertyInfo propertyInfo) + { + this.Name = propertyInfo.Name; + this.IsPrimaryKey = IsPrimaryKeyProperty(propertyInfo); + } + + bool IsPrimaryKeyProperty(PropertyInfo propertyInfo) + { + return + IsIdProperty(propertyInfo) || + IsIdPropertyPrefixedWithClassName(propertyInfo); + } + + bool IsIdProperty(PropertyInfo propertyInfo) + { + return IsMatchIgnoringCase(propertyInfo.Name, "id"); + } + + bool IsIdPropertyPrefixedWithClassName(PropertyInfo propertyInfo) + { + string prefixedIdPropertyName = propertyInfo.DeclaringType.Name + "id"; + return IsMatchIgnoringCase(propertyInfo.Name, prefixedIdPropertyName); + } + + static bool IsMatchIgnoringCase(string a, string b) + { + return String.Equals(a, b, StringComparison.OrdinalIgnoreCase); + } + } + + public string GetViewPageType() + { + string viewDataTypeName = MvcHost.ViewDataTypeName; + if (!String.IsNullOrEmpty(viewDataTypeName)) { + return String.Format("<{0}>", viewDataTypeName); + } + return String.Empty; + } + + List modelProperties; + + List ModelProperties { + get { + if (modelProperties == null) { + modelProperties = new List(GetModelProperties()); + } + return modelProperties; + } + } + + public IEnumerable GetModelProperties() + { + var properties = new List(); + foreach (PropertyInfo propertyInfo in MvcHost.GetViewDataTypeProperties()) { + properties.Add(new ModelProperty(propertyInfo)); + } + return properties; + } + + bool ModelHasPrimaryKey { + get { return ModelPrimaryKeyName.Length > 0; } + } + + string modelPrimaryKeyName; + + string ModelPrimaryKeyName { + get { + if (modelPrimaryKeyName == null) { + modelPrimaryKeyName = GetModelPrimaryKeyName(); + } + return modelPrimaryKeyName; + } + } + + public string GetModelPrimaryKeyName() + { + foreach (ModelProperty modelProperty in ModelProperties) { + if (modelProperty.IsPrimaryKey) { + return modelProperty.Name; + } + } + return ""; + } + + + #line default + #line hidden + } + + #line default + #line hidden + #region Base class + /// + /// Base class for this transformation + /// + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "15.0.0.0")] + public class EditBase + { + #region Fields + private global::System.Text.StringBuilder generationEnvironmentField; + private global::System.CodeDom.Compiler.CompilerErrorCollection errorsField; + private global::System.Collections.Generic.List indentLengthsField; + private string currentIndentField = ""; + private bool endsWithNewline; + private global::System.Collections.Generic.IDictionary sessionField; + #endregion + #region Properties + /// + /// The string builder that generation-time code is using to assemble generated output + /// + protected System.Text.StringBuilder GenerationEnvironment + { + get + { + if ((this.generationEnvironmentField == null)) + { + this.generationEnvironmentField = new global::System.Text.StringBuilder(); } - return this.builder; + return this.generationEnvironmentField; } - set { - this.builder = value; + set + { + this.generationEnvironmentField = value; } } - - protected global::System.CodeDom.Compiler.CompilerErrorCollection Errors { - get { - if ((this.errors == null)) { - this.errors = new global::System.CodeDom.Compiler.CompilerErrorCollection(); + /// + /// The error collection for the generation process + /// + public System.CodeDom.Compiler.CompilerErrorCollection Errors + { + get + { + if ((this.errorsField == null)) + { + this.errorsField = new global::System.CodeDom.Compiler.CompilerErrorCollection(); } - return this.errors; - } - } - - public string CurrentIndent { - get { - return this.currentIndent; + return this.errorsField; } } - - private global::System.Collections.Generic.Stack Indents { - get { - if ((this.indents == null)) { - this.indents = new global::System.Collections.Generic.Stack(); + /// + /// A list of the lengths of each indent that was added with PushIndent + /// + private System.Collections.Generic.List indentLengths + { + get + { + if ((this.indentLengthsField == null)) + { + this.indentLengthsField = new global::System.Collections.Generic.List(); } - return this.indents; + return this.indentLengthsField; } } - - public ToStringInstanceHelper ToStringHelper { - get { - return this._toStringHelper; + /// + /// Gets the current indent we use when adding lines to the output + /// + public string CurrentIndent + { + get + { + return this.currentIndentField; } } - - public void Error(string message) { - this.Errors.Add(new global::System.CodeDom.Compiler.CompilerError(null, -1, -1, null, message)); - } - - public void Warning(string message) { - global::System.CodeDom.Compiler.CompilerError val = new global::System.CodeDom.Compiler.CompilerError(null, -1, -1, null, message); - val.IsWarning = true; - this.Errors.Add(val); - } - - public string PopIndent() { - if ((this.Indents.Count == 0)) { - return string.Empty; + /// + /// Current transformation session + /// + public virtual global::System.Collections.Generic.IDictionary Session + { + get + { + return this.sessionField; + } + set + { + this.sessionField = value; } - int lastPos = (this.currentIndent.Length - this.Indents.Pop()); - string last = this.currentIndent.Substring(lastPos); - this.currentIndent = this.currentIndent.Substring(0, lastPos); - return last; - } - - public void PushIndent(string indent) { - this.Indents.Push(indent.Length); - this.currentIndent = (this.currentIndent + indent); - } - - public void ClearIndent() { - this.currentIndent = string.Empty; - this.Indents.Clear(); } - - public void Write(string textToAppend) { - if (string.IsNullOrEmpty(textToAppend)) { + #endregion + #region Transform-time helpers + /// + /// Write text directly into the generated output + /// + public void Write(string textToAppend) + { + if (string.IsNullOrEmpty(textToAppend)) + { return; } - if ((((this.GenerationEnvironment.Length == 0) - || this.endsWithNewline) - && (this.CurrentIndent.Length > 0))) { - this.GenerationEnvironment.Append(this.CurrentIndent); + // If we're starting off, or if the previous text ended with a newline, + // we have to append the current indent first. + if (((this.GenerationEnvironment.Length == 0) + || this.endsWithNewline)) + { + this.GenerationEnvironment.Append(this.currentIndentField); + this.endsWithNewline = false; } - this.endsWithNewline = false; - char last = textToAppend[(textToAppend.Length - 1)]; - if (((last == '\n') - || (last == '\r'))) { + // Check if the current text ends with a newline + if (textToAppend.EndsWith(global::System.Environment.NewLine, global::System.StringComparison.CurrentCulture)) + { this.endsWithNewline = true; } - if ((this.CurrentIndent.Length == 0)) { + // This is an optimization. If the current indent is "", then we don't have to do any + // of the more complex stuff further down. + if ((this.currentIndentField.Length == 0)) + { this.GenerationEnvironment.Append(textToAppend); return; } - int lastNewline = 0; - for (int i = 0; (i - < (textToAppend.Length - 1)); i = (i + 1)) { - char c = textToAppend[i]; - if ((c == '\r')) { - if ((textToAppend[(i + 1)] == '\n')) { - i = (i + 1); - if ((i - == (textToAppend.Length - 1))) { - goto breakLoop; - } - } - } - else { - if ((c != '\n')) { - goto continueLoop; - } - } - i = (i + 1); - int len = (i - lastNewline); - if ((len > 0)) { - this.GenerationEnvironment.Append(textToAppend, lastNewline, (i - lastNewline)); - } - this.GenerationEnvironment.Append(this.CurrentIndent); - lastNewline = i; - continueLoop: - ; - } - breakLoop: - if ((lastNewline > 0)) { - this.GenerationEnvironment.Append(textToAppend, lastNewline, (textToAppend.Length - lastNewline)); + // Everywhere there is a newline in the text, add an indent after it + textToAppend = textToAppend.Replace(global::System.Environment.NewLine, (global::System.Environment.NewLine + this.currentIndentField)); + // If the text ends with a newline, then we should strip off the indent added at the very end + // because the appropriate indent will be added when the next time Write() is called + if (this.endsWithNewline) + { + this.GenerationEnvironment.Append(textToAppend, 0, (textToAppend.Length - this.currentIndentField.Length)); } - else { + else + { this.GenerationEnvironment.Append(textToAppend); } } - - public void Write(string format, params object[] args) { - this.Write(string.Format(format, args)); - } - - public void WriteLine(string textToAppend) { + /// + /// Write text directly into the generated output + /// + public void WriteLine(string textToAppend) + { this.Write(textToAppend); this.GenerationEnvironment.AppendLine(); this.endsWithNewline = true; } - - public void WriteLine(string format, params object[] args) { - this.WriteLine(string.Format(format, args)); + /// + /// Write formatted text directly into the generated output + /// + public void Write(string format, params object[] args) + { + this.Write(string.Format(global::System.Globalization.CultureInfo.CurrentCulture, format, args)); } - - public class ToStringInstanceHelper { - - private global::System.IFormatProvider formatProvider = global::System.Globalization.CultureInfo.InvariantCulture; - - public global::System.IFormatProvider FormatProvider { - get { - return this.formatProvider; + /// + /// Write formatted text directly into the generated output + /// + public void WriteLine(string format, params object[] args) + { + this.WriteLine(string.Format(global::System.Globalization.CultureInfo.CurrentCulture, format, args)); + } + /// + /// Raise an error + /// + public void Error(string message) + { + System.CodeDom.Compiler.CompilerError error = new global::System.CodeDom.Compiler.CompilerError(); + error.ErrorText = message; + this.Errors.Add(error); + } + /// + /// Raise a warning + /// + public void Warning(string message) + { + System.CodeDom.Compiler.CompilerError error = new global::System.CodeDom.Compiler.CompilerError(); + error.ErrorText = message; + error.IsWarning = true; + this.Errors.Add(error); + } + /// + /// Increase the indent + /// + public void PushIndent(string indent) + { + if ((indent == null)) + { + throw new global::System.ArgumentNullException("indent"); + } + this.currentIndentField = (this.currentIndentField + indent); + this.indentLengths.Add(indent.Length); + } + /// + /// Remove the last indent that was added with PushIndent + /// + public string PopIndent() + { + string returnValue = ""; + if ((this.indentLengths.Count > 0)) + { + int indentLength = this.indentLengths[(this.indentLengths.Count - 1)]; + this.indentLengths.RemoveAt((this.indentLengths.Count - 1)); + if ((indentLength > 0)) + { + returnValue = this.currentIndentField.Substring((this.currentIndentField.Length - indentLength)); + this.currentIndentField = this.currentIndentField.Remove((this.currentIndentField.Length - indentLength)); + } + } + return returnValue; + } + /// + /// Remove any indentation + /// + public void ClearIndent() + { + this.indentLengths.Clear(); + this.currentIndentField = ""; + } + #endregion + #region ToString Helpers + /// + /// Utility class to produce culture-oriented representation of an object as a string. + /// + public class ToStringInstanceHelper + { + private System.IFormatProvider formatProviderField = global::System.Globalization.CultureInfo.InvariantCulture; + /// + /// Gets or sets format provider to be used by ToStringWithCulture method. + /// + public System.IFormatProvider FormatProvider + { + get + { + return this.formatProviderField ; } - set { - if ((this.formatProvider == null)) { - throw new global::System.ArgumentNullException("formatProvider"); + set + { + if ((value != null)) + { + this.formatProviderField = value; } - this.formatProvider = value; } } - - public string ToStringWithCulture(object objectToConvert) { - if ((objectToConvert == null)) { + /// + /// This is called from the compile/run appdomain to convert objects within an expression block to a string + /// + public string ToStringWithCulture(object objectToConvert) + { + if ((objectToConvert == null)) + { throw new global::System.ArgumentNullException("objectToConvert"); } - global::System.Type type = objectToConvert.GetType(); - global::System.Type iConvertibleType = typeof(global::System.IConvertible); - if (iConvertibleType.IsAssignableFrom(type)) { - return ((global::System.IConvertible)(objectToConvert)).ToString(this.formatProvider); + System.Type t = objectToConvert.GetType(); + System.Reflection.MethodInfo method = t.GetMethod("ToString", new System.Type[] { + typeof(System.IFormatProvider)}); + if ((method == null)) + { + return objectToConvert.ToString(); } - global::System.Reflection.MethodInfo methInfo = type.GetMethod("ToString", new global::System.Type[] { - iConvertibleType}); - if ((methInfo != null)) { - return ((string)(methInfo.Invoke(objectToConvert, new object[] { - this.formatProvider}))); + else + { + return ((string)(method.Invoke(objectToConvert, new object[] { + this.formatProviderField }))); } - return objectToConvert.ToString(); } } + private ToStringInstanceHelper toStringHelperField = new ToStringInstanceHelper(); + /// + /// Helper to produce culture-oriented representation of an object as a string + /// + public ToStringInstanceHelper ToStringHelper + { + get + { + return this.toStringHelperField; + } + } + #endregion } + #endregion } diff --git a/src/AddIns/BackendBindings/AspNet.Mvc/Project/ItemTemplates/CSharp/CodeTemplates/AddView/AspxCSharp/Empty.cs b/src/AddIns/BackendBindings/AspNet.Mvc/Project/ItemTemplates/CSharp/CodeTemplates/AddView/AspxCSharp/Empty.cs index f4555be48aa..c6af19048d8 100644 --- a/src/AddIns/BackendBindings/AspNet.Mvc/Project/ItemTemplates/CSharp/CodeTemplates/AddView/AspxCSharp/Empty.cs +++ b/src/AddIns/BackendBindings/AspNet.Mvc/Project/ItemTemplates/CSharp/CodeTemplates/AddView/AspxCSharp/Empty.cs @@ -1,387 +1,418 @@ -//------------------------------------------------------------------------------ +// ------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.239 -// +// Runtime Version: 15.0.0.0 +// // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. // -//------------------------------------------------------------------------------ - -namespace ICSharpCode.AspNet.Mvc.AspxCSharp { +// ------------------------------------------------------------------------------ +namespace ICSharpCode.AspNet.Mvc.AspxCSharp +{ using ICSharpCode.AspNet.Mvc; using System; + /// + /// Class to produce the template output + /// - public partial class Empty : EmptyBase { - - private global::Microsoft.VisualStudio.TextTemplating.ITextTemplatingEngineHost hostValue; - - - #line 31 "D:\projects\dotnet\SharpDevelop.AspNetMvc\src\AddIns\BackendBindings\AspNet.Mvc\Project\ItemTemplates\CSharp\CodeTemplates\AddView\AspxCSharp\Empty.tt" - - MvcTextTemplateHost MvcHost { - get { return (MvcTextTemplateHost)Host; } - } - - public string GetViewPageType() - { - string viewDataTypeName = MvcHost.ViewDataTypeName; - if (!String.IsNullOrEmpty(viewDataTypeName)) { - return String.Format("<{0}>", viewDataTypeName); - } - return String.Empty; - } - - #line default - #line hidden - - - public global::Microsoft.VisualStudio.TextTemplating.ITextTemplatingEngineHost Host { - get { - return this.hostValue; - } - set { - this.hostValue = value; - } - } - - public virtual string TransformText() { - this.GenerationEnvironment = null; - - #line 3 "D:\projects\dotnet\SharpDevelop.AspNetMvc\src\AddIns\BackendBindings\AspNet.Mvc\Project\ItemTemplates\CSharp\CodeTemplates\AddView\AspxCSharp\Empty.tt" + #line 1 "C:\Users\Stefan\Source\Repos\SharpDevelop\src\AddIns\BackendBindings\AspNet.Mvc\Project\ItemTemplates\CSharp\CodeTemplates\AddView\AspxCSharp\Empty.tt" + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "15.0.0.0")] + public partial class Empty : EmptyBase + { +#line hidden + /// + /// Create the template output + /// + public virtual string TransformText() + { + + #line 3 "C:\Users\Stefan\Source\Repos\SharpDevelop\src\AddIns\BackendBindings\AspNet.Mvc\Project\ItemTemplates\CSharp\CodeTemplates\AddView\AspxCSharp\Empty.tt" if (MvcHost.IsPartialView) { #line default #line hidden - - #line 4 "D:\projects\dotnet\SharpDevelop.AspNetMvc\src\AddIns\BackendBindings\AspNet.Mvc\Project\ItemTemplates\CSharp\CodeTemplates\AddView\AspxCSharp\Empty.tt" this.Write("<%@ Control Language=\"C#\" Inherits=\"System.Web.Mvc.ViewUserControl"); - #line default - #line hidden - - #line 4 "D:\projects\dotnet\SharpDevelop.AspNetMvc\src\AddIns\BackendBindings\AspNet.Mvc\Project\ItemTemplates\CSharp\CodeTemplates\AddView\AspxCSharp\Empty.tt" - this.Write(this.ToStringHelper.ToStringWithCulture( GetViewPageType() )); + #line 4 "C:\Users\Stefan\Source\Repos\SharpDevelop\src\AddIns\BackendBindings\AspNet.Mvc\Project\ItemTemplates\CSharp\CodeTemplates\AddView\AspxCSharp\Empty.tt" + this.Write(this.ToStringHelper.ToStringWithCulture(GetViewPageType())); #line default #line hidden - - #line 4 "D:\projects\dotnet\SharpDevelop.AspNetMvc\src\AddIns\BackendBindings\AspNet.Mvc\Project\ItemTemplates\CSharp\CodeTemplates\AddView\AspxCSharp\Empty.tt" this.Write("\" %>\r\n\r\n"); - #line default - #line hidden - - #line 6 "D:\projects\dotnet\SharpDevelop.AspNetMvc\src\AddIns\BackendBindings\AspNet.Mvc\Project\ItemTemplates\CSharp\CodeTemplates\AddView\AspxCSharp\Empty.tt" + #line 6 "C:\Users\Stefan\Source\Repos\SharpDevelop\src\AddIns\BackendBindings\AspNet.Mvc\Project\ItemTemplates\CSharp\CodeTemplates\AddView\AspxCSharp\Empty.tt" } else if(MvcHost.IsContentPage) { #line default #line hidden - - #line 7 "D:\projects\dotnet\SharpDevelop.AspNetMvc\src\AddIns\BackendBindings\AspNet.Mvc\Project\ItemTemplates\CSharp\CodeTemplates\AddView\AspxCSharp\Empty.tt" this.Write("<%@ Page Language=\"C#\" MasterPageFile=\""); - #line default - #line hidden - - #line 7 "D:\projects\dotnet\SharpDevelop.AspNetMvc\src\AddIns\BackendBindings\AspNet.Mvc\Project\ItemTemplates\CSharp\CodeTemplates\AddView\AspxCSharp\Empty.tt" - this.Write(this.ToStringHelper.ToStringWithCulture( MvcHost.MasterPageFile )); + #line 7 "C:\Users\Stefan\Source\Repos\SharpDevelop\src\AddIns\BackendBindings\AspNet.Mvc\Project\ItemTemplates\CSharp\CodeTemplates\AddView\AspxCSharp\Empty.tt" + this.Write(this.ToStringHelper.ToStringWithCulture(MvcHost.MasterPageFile)); #line default #line hidden - - #line 7 "D:\projects\dotnet\SharpDevelop.AspNetMvc\src\AddIns\BackendBindings\AspNet.Mvc\Project\ItemTemplates\CSharp\CodeTemplates\AddView\AspxCSharp\Empty.tt" this.Write("\" Inherits=\"System.Web.Mvc.ViewPage"); - #line default - #line hidden - - #line 7 "D:\projects\dotnet\SharpDevelop.AspNetMvc\src\AddIns\BackendBindings\AspNet.Mvc\Project\ItemTemplates\CSharp\CodeTemplates\AddView\AspxCSharp\Empty.tt" - this.Write(this.ToStringHelper.ToStringWithCulture( GetViewPageType() )); + #line 7 "C:\Users\Stefan\Source\Repos\SharpDevelop\src\AddIns\BackendBindings\AspNet.Mvc\Project\ItemTemplates\CSharp\CodeTemplates\AddView\AspxCSharp\Empty.tt" + this.Write(this.ToStringHelper.ToStringWithCulture(GetViewPageType())); #line default #line hidden - - #line 7 "D:\projects\dotnet\SharpDevelop.AspNetMvc\src\AddIns\BackendBindings\AspNet.Mvc\Project\ItemTemplates\CSharp\CodeTemplates\AddView\AspxCSharp\Empty.tt" this.Write("\" %>\r\n\r\n\r\n" + ""); - #line default - #line hidden - - #line 10 "D:\projects\dotnet\SharpDevelop.AspNetMvc\src\AddIns\BackendBindings\AspNet.Mvc\Project\ItemTemplates\CSharp\CodeTemplates\AddView\AspxCSharp\Empty.tt" - this.Write(this.ToStringHelper.ToStringWithCulture( MvcHost.ViewName )); + #line 10 "C:\Users\Stefan\Source\Repos\SharpDevelop\src\AddIns\BackendBindings\AspNet.Mvc\Project\ItemTemplates\CSharp\CodeTemplates\AddView\AspxCSharp\Empty.tt" + this.Write(this.ToStringHelper.ToStringWithCulture(MvcHost.ViewName)); #line default #line hidden - - #line 10 "D:\projects\dotnet\SharpDevelop.AspNetMvc\src\AddIns\BackendBindings\AspNet.Mvc\Project\ItemTemplates\CSharp\CodeTemplates\AddView\AspxCSharp\Empty.tt" this.Write("\r\n\r\n\r\n\r\n"); - #line default - #line hidden - - #line 16 "D:\projects\dotnet\SharpDevelop.AspNetMvc\src\AddIns\BackendBindings\AspNet.Mvc\Project\ItemTemplates\CSharp\CodeTemplates\AddView\AspxCSharp\Empty.tt" + #line 16 "C:\Users\Stefan\Source\Repos\SharpDevelop\src\AddIns\BackendBindings\AspNet.Mvc\Project\ItemTemplates\CSharp\CodeTemplates\AddView\AspxCSharp\Empty.tt" } else { #line default #line hidden - - #line 17 "D:\projects\dotnet\SharpDevelop.AspNetMvc\src\AddIns\BackendBindings\AspNet.Mvc\Project\ItemTemplates\CSharp\CodeTemplates\AddView\AspxCSharp\Empty.tt" this.Write("<%@ Page Language=\"C#\" Inherits=\"System.Web.Mvc.ViewPage"); - #line default - #line hidden - - #line 17 "D:\projects\dotnet\SharpDevelop.AspNetMvc\src\AddIns\BackendBindings\AspNet.Mvc\Project\ItemTemplates\CSharp\CodeTemplates\AddView\AspxCSharp\Empty.tt" - this.Write(this.ToStringHelper.ToStringWithCulture( GetViewPageType() )); + #line 17 "C:\Users\Stefan\Source\Repos\SharpDevelop\src\AddIns\BackendBindings\AspNet.Mvc\Project\ItemTemplates\CSharp\CodeTemplates\AddView\AspxCSharp\Empty.tt" + this.Write(this.ToStringHelper.ToStringWithCulture(GetViewPageType())); #line default #line hidden - - #line 17 "D:\projects\dotnet\SharpDevelop.AspNetMvc\src\AddIns\BackendBindings\AspNet.Mvc\Project\ItemTemplates\CSharp\CodeTemplates\AddView\AspxCSharp\Empty.tt" this.Write("\" %>\r\n\r\n\r\n\r\n\t\r\n\t\t"); - #line default - #line hidden - - #line 22 "D:\projects\dotnet\SharpDevelop.AspNetMvc\src\AddIns\BackendBindings\AspNet.Mvc\Project\ItemTemplates\CSharp\CodeTemplates\AddView\AspxCSharp\Empty.tt" - this.Write(this.ToStringHelper.ToStringWithCulture( MvcHost.ViewName )); + #line 22 "C:\Users\Stefan\Source\Repos\SharpDevelop\src\AddIns\BackendBindings\AspNet.Mvc\Project\ItemTemplates\CSharp\CodeTemplates\AddView\AspxCSharp\Empty.tt" + this.Write(this.ToStringHelper.ToStringWithCulture(MvcHost.ViewName)); #line default #line hidden - - #line 22 "D:\projects\dotnet\SharpDevelop.AspNetMvc\src\AddIns\BackendBindings\AspNet.Mvc\Project\ItemTemplates\CSharp\CodeTemplates\AddView\AspxCSharp\Empty.tt" this.Write("\r\n\t\r\n\t\r\n\t\t
\r\n\t\t\r\n\t\t
\r\n\t\r\n\r\n"); - #line default - #line hidden - - #line 30 "D:\projects\dotnet\SharpDevelop.AspNetMvc\src\AddIns\BackendBindings\AspNet.Mvc\Project\ItemTemplates\CSharp\CodeTemplates\AddView\AspxCSharp\Empty.tt" + #line 30 "C:\Users\Stefan\Source\Repos\SharpDevelop\src\AddIns\BackendBindings\AspNet.Mvc\Project\ItemTemplates\CSharp\CodeTemplates\AddView\AspxCSharp\Empty.tt" } #line default #line hidden return this.GenerationEnvironment.ToString(); } - - protected virtual void Initialize() { - } - } - - public class EmptyBase { - - private global::System.Text.StringBuilder builder; - - private global::System.Collections.Generic.IDictionary session; - - private global::System.CodeDom.Compiler.CompilerErrorCollection errors; - - private string currentIndent = string.Empty; - - private global::System.Collections.Generic.Stack indents; - - private bool endsWithNewline; - - private ToStringInstanceHelper _toStringHelper = new ToStringInstanceHelper(); - - public virtual global::System.Collections.Generic.IDictionary Session { - get { - return this.session; + private global::Microsoft.VisualStudio.TextTemplating.ITextTemplatingEngineHost hostValue; + /// + /// The current host for the text templating engine + /// + public virtual global::Microsoft.VisualStudio.TextTemplating.ITextTemplatingEngineHost Host + { + get + { + return this.hostValue; } - set { - this.session = value; + set + { + this.hostValue = value; } } - public global::System.Text.StringBuilder GenerationEnvironment { - get { - if ((this.builder == null)) { - this.builder = new global::System.Text.StringBuilder(); + #line 31 "C:\Users\Stefan\Source\Repos\SharpDevelop\src\AddIns\BackendBindings\AspNet.Mvc\Project\ItemTemplates\CSharp\CodeTemplates\AddView\AspxCSharp\Empty.tt" + + MvcTextTemplateHost MvcHost { + get { return (MvcTextTemplateHost)Host; } + } + + public string GetViewPageType() + { + string viewDataTypeName = MvcHost.ViewDataTypeName; + if (!String.IsNullOrEmpty(viewDataTypeName)) { + return String.Format("<{0}>", viewDataTypeName); + } + return String.Empty; + } + + + #line default + #line hidden + } + + #line default + #line hidden + #region Base class + /// + /// Base class for this transformation + /// + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "15.0.0.0")] + public class EmptyBase + { + #region Fields + private global::System.Text.StringBuilder generationEnvironmentField; + private global::System.CodeDom.Compiler.CompilerErrorCollection errorsField; + private global::System.Collections.Generic.List indentLengthsField; + private string currentIndentField = ""; + private bool endsWithNewline; + private global::System.Collections.Generic.IDictionary sessionField; + #endregion + #region Properties + /// + /// The string builder that generation-time code is using to assemble generated output + /// + protected System.Text.StringBuilder GenerationEnvironment + { + get + { + if ((this.generationEnvironmentField == null)) + { + this.generationEnvironmentField = new global::System.Text.StringBuilder(); } - return this.builder; + return this.generationEnvironmentField; } - set { - this.builder = value; + set + { + this.generationEnvironmentField = value; } } - - protected global::System.CodeDom.Compiler.CompilerErrorCollection Errors { - get { - if ((this.errors == null)) { - this.errors = new global::System.CodeDom.Compiler.CompilerErrorCollection(); + /// + /// The error collection for the generation process + /// + public System.CodeDom.Compiler.CompilerErrorCollection Errors + { + get + { + if ((this.errorsField == null)) + { + this.errorsField = new global::System.CodeDom.Compiler.CompilerErrorCollection(); } - return this.errors; + return this.errorsField; } } - - public string CurrentIndent { - get { - return this.currentIndent; - } - } - - private global::System.Collections.Generic.Stack Indents { - get { - if ((this.indents == null)) { - this.indents = new global::System.Collections.Generic.Stack(); + /// + /// A list of the lengths of each indent that was added with PushIndent + /// + private System.Collections.Generic.List indentLengths + { + get + { + if ((this.indentLengthsField == null)) + { + this.indentLengthsField = new global::System.Collections.Generic.List(); } - return this.indents; + return this.indentLengthsField; } } - - public ToStringInstanceHelper ToStringHelper { - get { - return this._toStringHelper; + /// + /// Gets the current indent we use when adding lines to the output + /// + public string CurrentIndent + { + get + { + return this.currentIndentField; } } - - public void Error(string message) { - this.Errors.Add(new global::System.CodeDom.Compiler.CompilerError(null, -1, -1, null, message)); - } - - public void Warning(string message) { - global::System.CodeDom.Compiler.CompilerError val = new global::System.CodeDom.Compiler.CompilerError(null, -1, -1, null, message); - val.IsWarning = true; - this.Errors.Add(val); - } - - public string PopIndent() { - if ((this.Indents.Count == 0)) { - return string.Empty; + /// + /// Current transformation session + /// + public virtual global::System.Collections.Generic.IDictionary Session + { + get + { + return this.sessionField; + } + set + { + this.sessionField = value; } - int lastPos = (this.currentIndent.Length - this.Indents.Pop()); - string last = this.currentIndent.Substring(lastPos); - this.currentIndent = this.currentIndent.Substring(0, lastPos); - return last; - } - - public void PushIndent(string indent) { - this.Indents.Push(indent.Length); - this.currentIndent = (this.currentIndent + indent); - } - - public void ClearIndent() { - this.currentIndent = string.Empty; - this.Indents.Clear(); } - - public void Write(string textToAppend) { - if (string.IsNullOrEmpty(textToAppend)) { + #endregion + #region Transform-time helpers + /// + /// Write text directly into the generated output + /// + public void Write(string textToAppend) + { + if (string.IsNullOrEmpty(textToAppend)) + { return; } - if ((((this.GenerationEnvironment.Length == 0) - || this.endsWithNewline) - && (this.CurrentIndent.Length > 0))) { - this.GenerationEnvironment.Append(this.CurrentIndent); + // If we're starting off, or if the previous text ended with a newline, + // we have to append the current indent first. + if (((this.GenerationEnvironment.Length == 0) + || this.endsWithNewline)) + { + this.GenerationEnvironment.Append(this.currentIndentField); + this.endsWithNewline = false; } - this.endsWithNewline = false; - char last = textToAppend[(textToAppend.Length - 1)]; - if (((last == '\n') - || (last == '\r'))) { + // Check if the current text ends with a newline + if (textToAppend.EndsWith(global::System.Environment.NewLine, global::System.StringComparison.CurrentCulture)) + { this.endsWithNewline = true; } - if ((this.CurrentIndent.Length == 0)) { + // This is an optimization. If the current indent is "", then we don't have to do any + // of the more complex stuff further down. + if ((this.currentIndentField.Length == 0)) + { this.GenerationEnvironment.Append(textToAppend); return; } - int lastNewline = 0; - for (int i = 0; (i - < (textToAppend.Length - 1)); i = (i + 1)) { - char c = textToAppend[i]; - if ((c == '\r')) { - if ((textToAppend[(i + 1)] == '\n')) { - i = (i + 1); - if ((i - == (textToAppend.Length - 1))) { - goto breakLoop; - } - } - } - else { - if ((c != '\n')) { - goto continueLoop; - } - } - i = (i + 1); - int len = (i - lastNewline); - if ((len > 0)) { - this.GenerationEnvironment.Append(textToAppend, lastNewline, (i - lastNewline)); - } - this.GenerationEnvironment.Append(this.CurrentIndent); - lastNewline = i; - continueLoop: - ; + // Everywhere there is a newline in the text, add an indent after it + textToAppend = textToAppend.Replace(global::System.Environment.NewLine, (global::System.Environment.NewLine + this.currentIndentField)); + // If the text ends with a newline, then we should strip off the indent added at the very end + // because the appropriate indent will be added when the next time Write() is called + if (this.endsWithNewline) + { + this.GenerationEnvironment.Append(textToAppend, 0, (textToAppend.Length - this.currentIndentField.Length)); } - breakLoop: - if ((lastNewline > 0)) { - this.GenerationEnvironment.Append(textToAppend, lastNewline, (textToAppend.Length - lastNewline)); - } - else { + else + { this.GenerationEnvironment.Append(textToAppend); } } - - public void Write(string format, params object[] args) { - this.Write(string.Format(format, args)); - } - - public void WriteLine(string textToAppend) { + /// + /// Write text directly into the generated output + /// + public void WriteLine(string textToAppend) + { this.Write(textToAppend); this.GenerationEnvironment.AppendLine(); this.endsWithNewline = true; } - - public void WriteLine(string format, params object[] args) { - this.WriteLine(string.Format(format, args)); + /// + /// Write formatted text directly into the generated output + /// + public void Write(string format, params object[] args) + { + this.Write(string.Format(global::System.Globalization.CultureInfo.CurrentCulture, format, args)); } - - public class ToStringInstanceHelper { - - private global::System.IFormatProvider formatProvider = global::System.Globalization.CultureInfo.InvariantCulture; - - public global::System.IFormatProvider FormatProvider { - get { - return this.formatProvider; + /// + /// Write formatted text directly into the generated output + /// + public void WriteLine(string format, params object[] args) + { + this.WriteLine(string.Format(global::System.Globalization.CultureInfo.CurrentCulture, format, args)); + } + /// + /// Raise an error + /// + public void Error(string message) + { + System.CodeDom.Compiler.CompilerError error = new global::System.CodeDom.Compiler.CompilerError(); + error.ErrorText = message; + this.Errors.Add(error); + } + /// + /// Raise a warning + /// + public void Warning(string message) + { + System.CodeDom.Compiler.CompilerError error = new global::System.CodeDom.Compiler.CompilerError(); + error.ErrorText = message; + error.IsWarning = true; + this.Errors.Add(error); + } + /// + /// Increase the indent + /// + public void PushIndent(string indent) + { + if ((indent == null)) + { + throw new global::System.ArgumentNullException("indent"); + } + this.currentIndentField = (this.currentIndentField + indent); + this.indentLengths.Add(indent.Length); + } + /// + /// Remove the last indent that was added with PushIndent + /// + public string PopIndent() + { + string returnValue = ""; + if ((this.indentLengths.Count > 0)) + { + int indentLength = this.indentLengths[(this.indentLengths.Count - 1)]; + this.indentLengths.RemoveAt((this.indentLengths.Count - 1)); + if ((indentLength > 0)) + { + returnValue = this.currentIndentField.Substring((this.currentIndentField.Length - indentLength)); + this.currentIndentField = this.currentIndentField.Remove((this.currentIndentField.Length - indentLength)); } - set { - if ((this.formatProvider == null)) { - throw new global::System.ArgumentNullException("formatProvider"); + } + return returnValue; + } + /// + /// Remove any indentation + /// + public void ClearIndent() + { + this.indentLengths.Clear(); + this.currentIndentField = ""; + } + #endregion + #region ToString Helpers + /// + /// Utility class to produce culture-oriented representation of an object as a string. + /// + public class ToStringInstanceHelper + { + private System.IFormatProvider formatProviderField = global::System.Globalization.CultureInfo.InvariantCulture; + /// + /// Gets or sets format provider to be used by ToStringWithCulture method. + /// + public System.IFormatProvider FormatProvider + { + get + { + return this.formatProviderField ; + } + set + { + if ((value != null)) + { + this.formatProviderField = value; } - this.formatProvider = value; } } - - public string ToStringWithCulture(object objectToConvert) { - if ((objectToConvert == null)) { + /// + /// This is called from the compile/run appdomain to convert objects within an expression block to a string + /// + public string ToStringWithCulture(object objectToConvert) + { + if ((objectToConvert == null)) + { throw new global::System.ArgumentNullException("objectToConvert"); } - global::System.Type type = objectToConvert.GetType(); - global::System.Type iConvertibleType = typeof(global::System.IConvertible); - if (iConvertibleType.IsAssignableFrom(type)) { - return ((global::System.IConvertible)(objectToConvert)).ToString(this.formatProvider); + System.Type t = objectToConvert.GetType(); + System.Reflection.MethodInfo method = t.GetMethod("ToString", new System.Type[] { + typeof(System.IFormatProvider)}); + if ((method == null)) + { + return objectToConvert.ToString(); } - global::System.Reflection.MethodInfo methInfo = type.GetMethod("ToString", new global::System.Type[] { - iConvertibleType}); - if ((methInfo != null)) { - return ((string)(methInfo.Invoke(objectToConvert, new object[] { - this.formatProvider}))); + else + { + return ((string)(method.Invoke(objectToConvert, new object[] { + this.formatProviderField }))); } - return objectToConvert.ToString(); } } + private ToStringInstanceHelper toStringHelperField = new ToStringInstanceHelper(); + /// + /// Helper to produce culture-oriented representation of an object as a string + /// + public ToStringInstanceHelper ToStringHelper + { + get + { + return this.toStringHelperField; + } + } + #endregion } + #endregion } diff --git a/src/AddIns/BackendBindings/AspNet.Mvc/Project/ItemTemplates/CSharp/CodeTemplates/AddView/AspxCSharp/List.cs b/src/AddIns/BackendBindings/AspNet.Mvc/Project/ItemTemplates/CSharp/CodeTemplates/AddView/AspxCSharp/List.cs index 6c5542fe53e..b35badbcadd 100644 --- a/src/AddIns/BackendBindings/AspNet.Mvc/Project/ItemTemplates/CSharp/CodeTemplates/AddView/AspxCSharp/List.cs +++ b/src/AddIns/BackendBindings/AspNet.Mvc/Project/ItemTemplates/CSharp/CodeTemplates/AddView/AspxCSharp/List.cs @@ -1,226 +1,85 @@ -//------------------------------------------------------------------------------ +// ------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.239 -// +// Runtime Version: 15.0.0.0 +// // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. // -//------------------------------------------------------------------------------ - -namespace ICSharpCode.AspNet.Mvc.AspxCSharp { +// ------------------------------------------------------------------------------ +namespace ICSharpCode.AspNet.Mvc.AspxCSharp +{ using ICSharpCode.AspNet.Mvc; using System.Collections.Generic; using System.Reflection; using System; + /// + /// Class to produce the template output + /// - public partial class List : ListBase { - - private global::Microsoft.VisualStudio.TextTemplating.ITextTemplatingEngineHost hostValue; - - - #line 100 "D:\projects\dotnet\SharpDevelop.AspNetMvc\src\AddIns\BackendBindings\AspNet.Mvc\Project\ItemTemplates\CSharp\CodeTemplates\AddView\AspxCSharp\List.tt" - - MvcTextTemplateHost MvcHost { - get { return (MvcTextTemplateHost)Host; } - } - - public class ModelProperty - { - public string Name { get; set; } - public bool IsPrimaryKey { get; set; } - - public ModelProperty(PropertyInfo propertyInfo) - { - this.Name = propertyInfo.Name; - this.IsPrimaryKey = IsPrimaryKeyProperty(propertyInfo); - } - - bool IsPrimaryKeyProperty(PropertyInfo propertyInfo) - { - return - IsIdProperty(propertyInfo) || - IsIdPropertyPrefixedWithClassName(propertyInfo); - } - - bool IsIdProperty(PropertyInfo propertyInfo) - { - return IsMatchIgnoringCase(propertyInfo.Name, "id"); - } - - bool IsIdPropertyPrefixedWithClassName(PropertyInfo propertyInfo) - { - string prefixedIdPropertyName = propertyInfo.DeclaringType.Name + "id"; - return IsMatchIgnoringCase(propertyInfo.Name, prefixedIdPropertyName); - } - - static bool IsMatchIgnoringCase(string a, string b) - { - return String.Equals(a, b, StringComparison.OrdinalIgnoreCase); - } - } - - public string GetViewPageType() - { - string viewDataTypeName = MvcHost.ViewDataTypeName; - if (!String.IsNullOrEmpty(viewDataTypeName)) { - return String.Format("<{0}>", viewDataTypeName); - } - return String.Empty; - } - - List modelProperties; - - List ModelProperties { - get { - if (modelProperties == null) { - modelProperties = new List(GetModelProperties()); - } - return modelProperties; - } - } - - public IEnumerable GetModelProperties() - { - var properties = new List(); - foreach (PropertyInfo propertyInfo in MvcHost.GetViewDataTypeProperties()) { - properties.Add(new ModelProperty(propertyInfo)); - } - return properties; - } - - bool ModelHasProperties { - get { return ModelProperties.Count > 0; } - } - - bool ModelHasPrimaryKey { - get { return ModelPrimaryKeyName.Length > 0; } - } - - string modelPrimaryKeyName; - - string ModelPrimaryKeyName { - get { - if (modelPrimaryKeyName == null) { - modelPrimaryKeyName = GetModelPrimaryKeyName(); - } - return modelPrimaryKeyName; - } - } - - public string GetModelPrimaryKeyName() - { - foreach (ModelProperty modelProperty in ModelProperties) { - if (modelProperty.IsPrimaryKey) { - return modelProperty.Name; - } - } - return ""; - } - - #line default - #line hidden - - - public global::Microsoft.VisualStudio.TextTemplating.ITextTemplatingEngineHost Host { - get { - return this.hostValue; - } - set { - this.hostValue = value; - } - } - - public virtual string TransformText() { - this.GenerationEnvironment = null; - - #line 5 "D:\projects\dotnet\SharpDevelop.AspNetMvc\src\AddIns\BackendBindings\AspNet.Mvc\Project\ItemTemplates\CSharp\CodeTemplates\AddView\AspxCSharp\List.tt" + #line 1 "C:\Users\Stefan\Source\Repos\SharpDevelop\src\AddIns\BackendBindings\AspNet.Mvc\Project\ItemTemplates\CSharp\CodeTemplates\AddView\AspxCSharp\List.tt" + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "15.0.0.0")] + public partial class List : ListBase + { +#line hidden + /// + /// Create the template output + /// + public virtual string TransformText() + { + + #line 5 "C:\Users\Stefan\Source\Repos\SharpDevelop\src\AddIns\BackendBindings\AspNet.Mvc\Project\ItemTemplates\CSharp\CodeTemplates\AddView\AspxCSharp\List.tt" if (MvcHost.IsPartialView) { #line default #line hidden - - #line 6 "D:\projects\dotnet\SharpDevelop.AspNetMvc\src\AddIns\BackendBindings\AspNet.Mvc\Project\ItemTemplates\CSharp\CodeTemplates\AddView\AspxCSharp\List.tt" this.Write("<%@ Control Language=\"C#\" Inherits=\"System.Web.Mvc.ViewUserControl - - - + \ No newline at end of file diff --git a/src/AddIns/BackendBindings/CppBinding/CppBinding/CppBinding.csproj b/src/AddIns/BackendBindings/CppBinding/CppBinding/CppBinding.csproj index ecc333f3155..5b85e859c12 100644 --- a/src/AddIns/BackendBindings/CppBinding/CppBinding/CppBinding.csproj +++ b/src/AddIns/BackendBindings/CppBinding/CppBinding/CppBinding.csproj @@ -1,12 +1,12 @@  - + {70966F84-74C9-4067-A379-0C674A929233} Debug AnyCPU Library CppBinding - v4.5 + v4.7.2 C:\Users\trecio\AppData\Roaming\ICSharpCode/SharpDevelop3.0\Settings.SourceAnalysis diff --git a/src/AddIns/BackendBindings/FSharpBinding/FSharpBinding.csproj b/src/AddIns/BackendBindings/FSharpBinding/FSharpBinding.csproj index 4ea73552eb7..ca15ac5a117 100644 --- a/src/AddIns/BackendBindings/FSharpBinding/FSharpBinding.csproj +++ b/src/AddIns/BackendBindings/FSharpBinding/FSharpBinding.csproj @@ -1,5 +1,5 @@  - + {E954F3CB-A446-492F-A664-2B376EBC86E8} Debug @@ -7,7 +7,7 @@ Library FSharpBinding FSharpBinding - v4.5 + v4.7.2 Properties C:\Users\Daniel\AppData\Roaming\ICSharpCode/SharpDevelop3.0\Settings.SourceAnalysis False diff --git a/src/AddIns/BackendBindings/Scripting/Project/ICSharpCode.Scripting.csproj b/src/AddIns/BackendBindings/Scripting/Project/ICSharpCode.Scripting.csproj index 2691f0ce363..f4a350bab6c 100644 --- a/src/AddIns/BackendBindings/Scripting/Project/ICSharpCode.Scripting.csproj +++ b/src/AddIns/BackendBindings/Scripting/Project/ICSharpCode.Scripting.csproj @@ -1,5 +1,5 @@  - + {7048AE18-EB93-4A84-82D0-DD60EB58ADBD} Debug @@ -7,7 +7,7 @@ Library ICSharpCode.Scripting ICSharpCode.Scripting - v4.5 + v4.7.2 False False 4 @@ -58,10 +58,7 @@ 3.0 - - - - + Configuration\GlobalAssemblyInfo.cs diff --git a/src/AddIns/BackendBindings/TypeScript/Project/TypeScriptBinding.csproj b/src/AddIns/BackendBindings/TypeScript/Project/TypeScriptBinding.csproj index 9d4b7a9de6b..9cf479f148b 100644 --- a/src/AddIns/BackendBindings/TypeScript/Project/TypeScriptBinding.csproj +++ b/src/AddIns/BackendBindings/TypeScript/Project/TypeScriptBinding.csproj @@ -1,5 +1,5 @@  - + {94BBCA55-A20E-4782-93B0-3566D185F7C1} Debug @@ -7,7 +7,7 @@ Library ICSharpCode.TypeScriptBinding TypeScriptBinding - v4.5 + v4.7.2 Properties False False @@ -261,8 +261,6 @@ False - - - + \ No newline at end of file diff --git a/src/AddIns/BackendBindings/VBBinding/Project/VBBinding.vbproj b/src/AddIns/BackendBindings/VBBinding/Project/VBBinding.vbproj index 83c4875c0c6..37380a1d49e 100644 --- a/src/AddIns/BackendBindings/VBBinding/Project/VBBinding.vbproj +++ b/src/AddIns/BackendBindings/VBBinding/Project/VBBinding.vbproj @@ -1,5 +1,5 @@  - + Debug AnyCPU @@ -11,7 +11,7 @@ 4 False False - v4.5 + v4.7.2 OnSuccessfulBuild Library File @@ -116,7 +116,7 @@ - + diff --git a/src/AddIns/BackendBindings/WixBinding/Project/WixBinding.csproj b/src/AddIns/BackendBindings/WixBinding/Project/WixBinding.csproj index b06fa68c2ef..4727040c36e 100644 --- a/src/AddIns/BackendBindings/WixBinding/Project/WixBinding.csproj +++ b/src/AddIns/BackendBindings/WixBinding/Project/WixBinding.csproj @@ -1,5 +1,5 @@  - + Debug AnyCPU @@ -11,7 +11,7 @@ Library 4 False - v4.5 + v4.7.2 False OnSuccessfulBuild False @@ -90,16 +90,24 @@ - + + UserControl + Configuration\GlobalAssemblyInfo.cs - + + UserControl + - - + + UserControl + + + UserControl + @@ -152,7 +160,9 @@ - + + UserControl + @@ -164,8 +174,12 @@ - - + + Component + + + Component + @@ -177,14 +191,18 @@ - + + Component + - + + UserControl + diff --git a/src/AddIns/BackendBindings/XamlBinding/XamlBinding/XamlBinding.csproj b/src/AddIns/BackendBindings/XamlBinding/XamlBinding/XamlBinding.csproj index b42dc3f77d3..3c6ab6c7055 100644 --- a/src/AddIns/BackendBindings/XamlBinding/XamlBinding/XamlBinding.csproj +++ b/src/AddIns/BackendBindings/XamlBinding/XamlBinding/XamlBinding.csproj @@ -1,5 +1,5 @@  - + {7C96B65D-28A5-4F28-A35B-8D83CE831EE8} Debug @@ -13,7 +13,7 @@ 4 false C:\Users\Daniel\AppData\Roaming\ICSharpCode/SharpDevelop3.0\Settings.SourceAnalysis - v4.5 + v4.7.2 @@ -171,9 +171,7 @@ False - - - + diff --git a/src/AddIns/Debugger/Debugger.AddIn/Debugger.AddIn.csproj b/src/AddIns/Debugger/Debugger.AddIn/Debugger.AddIn.csproj index 1815ee4e710..f1373f6ab7d 100644 --- a/src/AddIns/Debugger/Debugger.AddIn/Debugger.AddIn.csproj +++ b/src/AddIns/Debugger/Debugger.AddIn/Debugger.AddIn.csproj @@ -1,5 +1,5 @@  - + Debug AnyCPU @@ -20,7 +20,7 @@ 4096 false Always - v4.5 + v4.7.2 "C:\Program Files\SharpDevelop\3.0\bin\..\AddIns\AddIns\Misc\SourceAnalysis\Settings.SourceAnalysis" C:\Dokumente und Einstellungen\HP\Anwendungsdaten\ICSharpCode/SharpDevelop3.0\Settings.SourceAnalysis http://localhost/Debugger.AddIn/ @@ -127,15 +127,11 @@ - - UserControl - + - - Component - + Form @@ -302,26 +298,6 @@ - - - - - - - - - - - - - - - - - - - - @@ -342,7 +318,6 @@ ICSharpCode.Core.WinForms False - diff --git a/src/AddIns/Debugger/Debugger.Core/Debugger.Core.csproj b/src/AddIns/Debugger/Debugger.Core/Debugger.Core.csproj index 82e5a671a85..445779eafc1 100644 --- a/src/AddIns/Debugger/Debugger.Core/Debugger.Core.csproj +++ b/src/AddIns/Debugger/Debugger.Core/Debugger.Core.csproj @@ -1,5 +1,5 @@  - + Debug AnyCPU @@ -36,7 +36,7 @@ true false true - v4.5 + v4.7.2 @@ -122,9 +122,7 @@ false - - - + {D68133BD-1E63-496E-9EDE-4FBDBF77B486} diff --git a/src/AddIns/DisplayBindings/AvalonEdit.AddIn/AvalonEdit.AddIn.csproj b/src/AddIns/DisplayBindings/AvalonEdit.AddIn/AvalonEdit.AddIn.csproj index 4fa4a0c07ee..b53e9e55fd3 100644 --- a/src/AddIns/DisplayBindings/AvalonEdit.AddIn/AvalonEdit.AddIn.csproj +++ b/src/AddIns/DisplayBindings/AvalonEdit.AddIn/AvalonEdit.AddIn.csproj @@ -1,5 +1,5 @@  - + {0162E499-42D0-409B-AA25-EED21F75336B} Debug @@ -7,7 +7,7 @@ Library ICSharpCode.AvalonEdit.AddIn ICSharpCode.AvalonEdit.AddIn - v4.5 + v4.7.2 C:\Users\Daniel\AppData\Roaming\ICSharpCode/SharpDevelop3.0\Settings.SourceAnalysis ..\..\..\..\AddIns\DisplayBindings\AvalonEdit\ False @@ -16,6 +16,7 @@ false False -Microsoft.Design#CA1014;-Microsoft.Design#CA2210 + true @@ -270,10 +271,5 @@ False - - - - - - + \ No newline at end of file diff --git a/src/AddIns/DisplayBindings/Data/ICSharpCode.Data.Addin/ICSharpCode.Data.Addin.csproj b/src/AddIns/DisplayBindings/Data/ICSharpCode.Data.Addin/ICSharpCode.Data.Addin.csproj index 44a746eac04..7d1c112b94c 100644 --- a/src/AddIns/DisplayBindings/Data/ICSharpCode.Data.Addin/ICSharpCode.Data.Addin.csproj +++ b/src/AddIns/DisplayBindings/Data/ICSharpCode.Data.Addin/ICSharpCode.Data.Addin.csproj @@ -1,5 +1,5 @@  - + {A9F12710-24E4-46D4-832C-6ECB395B9EAD} Debug @@ -7,7 +7,7 @@ Library ICSharpCode.Data.Addin ICSharpCode.Data.Addin - v4.5 + v4.7.2 C:\Users\Phil\AppData\Roaming\ICSharpCode/SharpDevelop3.0\Settings.SourceAnalysis @@ -110,9 +110,7 @@ AnyCPU 4096 - - - + False diff --git a/src/AddIns/DisplayBindings/Data/ICSharpCode.Data.Core.UI/ICSharpCode.Data.Core.UI.csproj b/src/AddIns/DisplayBindings/Data/ICSharpCode.Data.Core.UI/ICSharpCode.Data.Core.UI.csproj index cbee9526c5e..a64a3cc75ec 100644 --- a/src/AddIns/DisplayBindings/Data/ICSharpCode.Data.Core.UI/ICSharpCode.Data.Core.UI.csproj +++ b/src/AddIns/DisplayBindings/Data/ICSharpCode.Data.Core.UI/ICSharpCode.Data.Core.UI.csproj @@ -1,5 +1,5 @@  - + Debug AnyCPU @@ -10,7 +10,7 @@ Properties ICSharpCode.Data.Core.UI ICSharpCode.Data.Core.UI - v4.5 + v4.7.2 512 {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} 4 diff --git a/src/AddIns/DisplayBindings/Data/ICSharpCode.Data.Core.UI/Properties/Resources.Designer.cs b/src/AddIns/DisplayBindings/Data/ICSharpCode.Data.Core.UI/Properties/Resources.Designer.cs index a89c1673df9..42c13195104 100644 --- a/src/AddIns/DisplayBindings/Data/ICSharpCode.Data.Core.UI/Properties/Resources.Designer.cs +++ b/src/AddIns/DisplayBindings/Data/ICSharpCode.Data.Core.UI/Properties/Resources.Designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.20506.1 +// Runtime Version:4.0.30319.42000 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -19,7 +19,7 @@ namespace ICSharpCode.Data.Core.UI.Properties { // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Resources { diff --git a/src/AddIns/DisplayBindings/Data/ICSharpCode.Data.Core.UI/Properties/Settings.Designer.cs b/src/AddIns/DisplayBindings/Data/ICSharpCode.Data.Core.UI/Properties/Settings.Designer.cs index 60f9d209c95..dd0e639e5c3 100644 --- a/src/AddIns/DisplayBindings/Data/ICSharpCode.Data.Core.UI/Properties/Settings.Designer.cs +++ b/src/AddIns/DisplayBindings/Data/ICSharpCode.Data.Core.UI/Properties/Settings.Designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.20506.1 +// Runtime Version:4.0.30319.42000 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -12,7 +12,7 @@ namespace ICSharpCode.Data.Core.UI.Properties { [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "10.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.8.0.0")] internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); diff --git a/src/AddIns/DisplayBindings/Data/ICSharpCode.Data.Core/ICSharpCode.Data.Core.csproj b/src/AddIns/DisplayBindings/Data/ICSharpCode.Data.Core/ICSharpCode.Data.Core.csproj index 05371f1a2bc..1e95f1ee50f 100644 --- a/src/AddIns/DisplayBindings/Data/ICSharpCode.Data.Core/ICSharpCode.Data.Core.csproj +++ b/src/AddIns/DisplayBindings/Data/ICSharpCode.Data.Core/ICSharpCode.Data.Core.csproj @@ -1,5 +1,5 @@  - + Debug AnyCPU @@ -10,7 +10,7 @@ Properties ICSharpCode.Data.Core ICSharpCode.Data.Core - v4.5 + v4.7.2 512 {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} 4 diff --git a/src/AddIns/DisplayBindings/Data/ICSharpCode.Data.Core/Properties/Resources.Designer.cs b/src/AddIns/DisplayBindings/Data/ICSharpCode.Data.Core/Properties/Resources.Designer.cs index 36e280cdd0b..3cd9a74ca84 100644 --- a/src/AddIns/DisplayBindings/Data/ICSharpCode.Data.Core/Properties/Resources.Designer.cs +++ b/src/AddIns/DisplayBindings/Data/ICSharpCode.Data.Core/Properties/Resources.Designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.20506.1 +// Runtime Version:4.0.30319.42000 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -19,7 +19,7 @@ namespace ICSharpCode.Data.Core.Properties { // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Resources { diff --git a/src/AddIns/DisplayBindings/Data/ICSharpCode.Data.Core/Properties/Settings.Designer.cs b/src/AddIns/DisplayBindings/Data/ICSharpCode.Data.Core/Properties/Settings.Designer.cs index edf9f798f74..e843fc785ad 100644 --- a/src/AddIns/DisplayBindings/Data/ICSharpCode.Data.Core/Properties/Settings.Designer.cs +++ b/src/AddIns/DisplayBindings/Data/ICSharpCode.Data.Core/Properties/Settings.Designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.20506.1 +// Runtime Version:4.0.30319.42000 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -12,7 +12,7 @@ namespace ICSharpCode.Data.Core.Properties { [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "10.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.8.0.0")] internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); diff --git a/src/AddIns/DisplayBindings/Data/ICSharpCode.Data.EDMDesigner.Core.UI/ICSharpCode.Data.EDMDesigner.Core.UI.csproj b/src/AddIns/DisplayBindings/Data/ICSharpCode.Data.EDMDesigner.Core.UI/ICSharpCode.Data.EDMDesigner.Core.UI.csproj index bb132fcbef1..8721b3780aa 100644 --- a/src/AddIns/DisplayBindings/Data/ICSharpCode.Data.EDMDesigner.Core.UI/ICSharpCode.Data.EDMDesigner.Core.UI.csproj +++ b/src/AddIns/DisplayBindings/Data/ICSharpCode.Data.EDMDesigner.Core.UI/ICSharpCode.Data.EDMDesigner.Core.UI.csproj @@ -1,5 +1,5 @@  - + Debug AnyCPU @@ -10,7 +10,7 @@ Properties ICSharpCode.Data.EDMDesigner.Core.UI ICSharpCode.Data.EDMDesigner.Core.UI - v4.5 + v4.7.2 512 {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} 4 diff --git a/src/AddIns/DisplayBindings/Data/ICSharpCode.Data.EDMDesigner.Core.UI/Properties/Resources.Designer.cs b/src/AddIns/DisplayBindings/Data/ICSharpCode.Data.EDMDesigner.Core.UI/Properties/Resources.Designer.cs index 44a6fe09f14..1dea21396b2 100644 --- a/src/AddIns/DisplayBindings/Data/ICSharpCode.Data.EDMDesigner.Core.UI/Properties/Resources.Designer.cs +++ b/src/AddIns/DisplayBindings/Data/ICSharpCode.Data.EDMDesigner.Core.UI/Properties/Resources.Designer.cs @@ -1,17 +1,17 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.20506.1 +// Runtime Version:4.0.30319.42000 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. // //------------------------------------------------------------------------------ -namespace ICSharpCode.Data.EDMDesigner.Core.UI.Properties -{ - - +namespace ICSharpCode.Data.EDMDesigner.Core.UI.Properties { + using System; + + /// /// A strongly-typed resource class, for looking up localized strings, etc. /// @@ -19,51 +19,43 @@ namespace ICSharpCode.Data.EDMDesigner.Core.UI.Properties // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - internal class Resources - { - + internal class Resources { + private static global::System.Resources.ResourceManager resourceMan; - + private static global::System.Globalization.CultureInfo resourceCulture; - + [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] - internal Resources() - { + internal Resources() { } - + /// /// Returns the cached ResourceManager instance used by this class. /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Resources.ResourceManager ResourceManager - { - get - { - if ((resourceMan == null)) - { + internal static global::System.Resources.ResourceManager ResourceManager { + get { + if (object.ReferenceEquals(resourceMan, null)) { global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("ICSharpCode.Data.EDMDesigner.Core.UI.Properties.Resources", typeof(Resources).Assembly); resourceMan = temp; } return resourceMan; } } - + /// /// Overrides the current thread's CurrentUICulture property for all /// resource lookups using this strongly typed resource class. /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Globalization.CultureInfo Culture - { - get - { + internal static global::System.Globalization.CultureInfo Culture { + get { return resourceCulture; } - set - { + set { resourceCulture = value; } } diff --git a/src/AddIns/DisplayBindings/Data/ICSharpCode.Data.EDMDesigner.Core.UI/Properties/Settings.Designer.cs b/src/AddIns/DisplayBindings/Data/ICSharpCode.Data.EDMDesigner.Core.UI/Properties/Settings.Designer.cs index 8088af29f2b..365cd68120f 100644 --- a/src/AddIns/DisplayBindings/Data/ICSharpCode.Data.EDMDesigner.Core.UI/Properties/Settings.Designer.cs +++ b/src/AddIns/DisplayBindings/Data/ICSharpCode.Data.EDMDesigner.Core.UI/Properties/Settings.Designer.cs @@ -1,28 +1,24 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.20506.1 +// Runtime Version:4.0.30319.42000 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. // //------------------------------------------------------------------------------ -namespace ICSharpCode.Data.EDMDesigner.Core.UI.Properties -{ - - +namespace ICSharpCode.Data.EDMDesigner.Core.UI.Properties { + + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "10.0.0.0")] - internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase - { - + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.8.0.0")] + internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { + private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); - - public static Settings Default - { - get - { + + public static Settings Default { + get { return defaultInstance; } } diff --git a/src/AddIns/DisplayBindings/Data/ICSharpCode.Data.EDMDesigner.Core/ICSharpCode.Data.EDMDesigner.Core.csproj b/src/AddIns/DisplayBindings/Data/ICSharpCode.Data.EDMDesigner.Core/ICSharpCode.Data.EDMDesigner.Core.csproj index 5c05a289eee..b21db4014dc 100644 --- a/src/AddIns/DisplayBindings/Data/ICSharpCode.Data.EDMDesigner.Core/ICSharpCode.Data.EDMDesigner.Core.csproj +++ b/src/AddIns/DisplayBindings/Data/ICSharpCode.Data.EDMDesigner.Core/ICSharpCode.Data.EDMDesigner.Core.csproj @@ -1,5 +1,5 @@  - + Debug AnyCPU @@ -10,7 +10,7 @@ Properties ICSharpCode.Data.EDMDesigner.Core ICSharpCode.Data.EDMDesigner.Core - v4.5 + v4.7.2 512 AnyCPU False diff --git a/src/AddIns/DisplayBindings/Data/ICSharpCode.Data.SQLServer/ICSharpCode.Data.SQLServer.csproj b/src/AddIns/DisplayBindings/Data/ICSharpCode.Data.SQLServer/ICSharpCode.Data.SQLServer.csproj index b4acc20975f..ecdef7e8cb1 100644 --- a/src/AddIns/DisplayBindings/Data/ICSharpCode.Data.SQLServer/ICSharpCode.Data.SQLServer.csproj +++ b/src/AddIns/DisplayBindings/Data/ICSharpCode.Data.SQLServer/ICSharpCode.Data.SQLServer.csproj @@ -1,5 +1,5 @@  - + Debug AnyCPU @@ -10,7 +10,7 @@ Properties ICSharpCode.Data.SQLServer ICSharpCode.Data.SQLServer - v4.5 + v4.7.2 512 diff --git a/src/AddIns/DisplayBindings/FormsDesigner/Project/FormsDesigner.csproj b/src/AddIns/DisplayBindings/FormsDesigner/Project/FormsDesigner.csproj index 366aa3a811e..bac18b572ec 100644 --- a/src/AddIns/DisplayBindings/FormsDesigner/Project/FormsDesigner.csproj +++ b/src/AddIns/DisplayBindings/FormsDesigner/Project/FormsDesigner.csproj @@ -1,5 +1,5 @@  - + Debug AnyCPU @@ -22,7 +22,7 @@ ..\..\..\..\..\AddIns\DisplayBindings\FormsDesigner\ 108003328 4096 - v4.5 + v4.7.2 True ..\..\..\..\Main\ICSharpCode.SharpDevelop.snk False @@ -82,7 +82,9 @@ - + + Form + ImageResourceEditorDialog.cs diff --git a/src/AddIns/DisplayBindings/HexEditor/Project/HexEditor.csproj b/src/AddIns/DisplayBindings/HexEditor/Project/HexEditor.csproj index 725f4393f34..801faa7f7f5 100644 --- a/src/AddIns/DisplayBindings/HexEditor/Project/HexEditor.csproj +++ b/src/AddIns/DisplayBindings/HexEditor/Project/HexEditor.csproj @@ -1,5 +1,5 @@  - + {E618A9CD-A39F-4925-A538-E8A3FEF24E54} Debug @@ -15,7 +15,7 @@ False OnBuildSuccess False - v4.5 + v4.7.2 @@ -146,9 +146,7 @@ False - - - + diff --git a/src/AddIns/DisplayBindings/ILSpyAddIn/ILSpyAddIn.csproj b/src/AddIns/DisplayBindings/ILSpyAddIn/ILSpyAddIn.csproj index 807d57d5be4..c9577444d97 100644 --- a/src/AddIns/DisplayBindings/ILSpyAddIn/ILSpyAddIn.csproj +++ b/src/AddIns/DisplayBindings/ILSpyAddIn/ILSpyAddIn.csproj @@ -1,5 +1,5 @@  - + {8AA421C8-D7AF-4957-9F43-5135328ACB24} Debug @@ -7,7 +7,7 @@ Library ICSharpCode.ILSpyAddIn ILSpyAddIn - v4.5 + v4.7.2 Properties ..\..\..\..\AddIns\DisplayBindings\Decompiler\ False diff --git a/src/AddIns/DisplayBindings/IconEditor/IconEditor.csproj b/src/AddIns/DisplayBindings/IconEditor/IconEditor.csproj index 7bd11dabd39..04379ea9264 100644 --- a/src/AddIns/DisplayBindings/IconEditor/IconEditor.csproj +++ b/src/AddIns/DisplayBindings/IconEditor/IconEditor.csproj @@ -1,5 +1,5 @@  - + Library ICSharpCode.IconEditor @@ -17,7 +17,7 @@ 4096 4 false - v4.5 + v4.7.2 @@ -55,7 +55,9 @@ UserControl - + + Form + PickFormatDialog.cs diff --git a/src/AddIns/DisplayBindings/ResourceEditor/Project/ResourceEditor.csproj b/src/AddIns/DisplayBindings/ResourceEditor/Project/ResourceEditor.csproj index 109b223a1da..6aa13cb7558 100644 --- a/src/AddIns/DisplayBindings/ResourceEditor/Project/ResourceEditor.csproj +++ b/src/AddIns/DisplayBindings/ResourceEditor/Project/ResourceEditor.csproj @@ -1,5 +1,5 @@  - + Debug AnyCPU @@ -21,7 +21,7 @@ 4096 4 false - v4.5 + v4.7.2 @@ -138,10 +138,7 @@ False - - - - + diff --git a/src/AddIns/DisplayBindings/SettingsEditor/Project/SettingsEditor.csproj b/src/AddIns/DisplayBindings/SettingsEditor/Project/SettingsEditor.csproj index 0c29c2b9465..ea70927d7c0 100644 --- a/src/AddIns/DisplayBindings/SettingsEditor/Project/SettingsEditor.csproj +++ b/src/AddIns/DisplayBindings/SettingsEditor/Project/SettingsEditor.csproj @@ -1,5 +1,5 @@  - + Library ICSharpCode.SettingsEditor @@ -13,7 +13,7 @@ 4 false C:\Users\Daniel\AppData\Roaming\ICSharpCode/SharpDevelop3.0\Settings.SourceAnalysis - v4.5 + v4.7.2 diff --git a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.AddIn/WpfDesign.AddIn.csproj b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.AddIn/WpfDesign.AddIn.csproj index cd4254b1d3b..9cd80ca9f3a 100644 --- a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.AddIn/WpfDesign.AddIn.csproj +++ b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.AddIn/WpfDesign.AddIn.csproj @@ -1,5 +1,5 @@  - + {9A9D6FD4-6A2E-455D-ACC3-DDA775FE9865} Debug @@ -12,7 +12,7 @@ False 4 false - v4.5 + v4.7.2 @@ -150,7 +150,5 @@ - - - + \ No newline at end of file diff --git a/src/AddIns/DisplayBindings/XmlEditor/Project/XmlEditor.csproj b/src/AddIns/DisplayBindings/XmlEditor/Project/XmlEditor.csproj index 106b822804f..35865d97c75 100644 --- a/src/AddIns/DisplayBindings/XmlEditor/Project/XmlEditor.csproj +++ b/src/AddIns/DisplayBindings/XmlEditor/Project/XmlEditor.csproj @@ -1,5 +1,5 @@  - + {DCA2703D-250A-463E-A68A-07ED105AE6BD} Debug @@ -7,7 +7,7 @@ Library ICSharpCode.XmlEditor XmlEditor - v4.5 + v4.7.2 False False 4 diff --git a/src/AddIns/Misc/AddInManager2/Project/AddInManager2.csproj b/src/AddIns/Misc/AddInManager2/Project/AddInManager2.csproj index 5713fea16b3..6001226e3ee 100644 --- a/src/AddIns/Misc/AddInManager2/Project/AddInManager2.csproj +++ b/src/AddIns/Misc/AddInManager2/Project/AddInManager2.csproj @@ -1,5 +1,5 @@  - + {60480C2F-F228-4D86-B98F-AF75A7DCEC34} Debug @@ -7,7 +7,7 @@ Library ICSharpCode.AddInManager2 ICSharpCode.AddInManager2 - v4.5 + v4.7.2 False False OnBuildSuccess @@ -183,14 +183,7 @@ False - - - - - - - - + diff --git a/src/AddIns/Misc/AddinScout/Project/AddinScout.csproj b/src/AddIns/Misc/AddinScout/Project/AddinScout.csproj index 89ad1c20c4a..2ff2eea6acb 100644 --- a/src/AddIns/Misc/AddinScout/Project/AddinScout.csproj +++ b/src/AddIns/Misc/AddinScout/Project/AddinScout.csproj @@ -1,5 +1,5 @@  - + Debug AnyCPU @@ -22,7 +22,7 @@ AnyCPU 4096 false - v4.5 + v4.7.2 diff --git a/src/AddIns/Misc/FiletypeRegisterer/Project/FiletypeRegisterer.csproj b/src/AddIns/Misc/FiletypeRegisterer/Project/FiletypeRegisterer.csproj index 5c44cb08f45..89f634305ad 100644 --- a/src/AddIns/Misc/FiletypeRegisterer/Project/FiletypeRegisterer.csproj +++ b/src/AddIns/Misc/FiletypeRegisterer/Project/FiletypeRegisterer.csproj @@ -1,5 +1,5 @@  - + Debug AnyCPU @@ -22,7 +22,7 @@ AnyCPU 4096 false - v4.5 + v4.7.2 diff --git a/src/AddIns/Misc/HelpViewer/HelpViewer.csproj b/src/AddIns/Misc/HelpViewer/HelpViewer.csproj index 44836d03760..d82848f7894 100644 --- a/src/AddIns/Misc/HelpViewer/HelpViewer.csproj +++ b/src/AddIns/Misc/HelpViewer/HelpViewer.csproj @@ -1,5 +1,5 @@  - + {80F76D10-0B44-4D55-B4BD-DAEB5464090C} Debug @@ -7,7 +7,7 @@ Library MSHelpSystem HelpViewer - v4.5 + v4.7.2 False False 4 @@ -67,7 +67,9 @@ - + + Form + SearchPadControl.xaml @@ -95,12 +97,7 @@ - - - - - - + diff --git a/src/AddIns/Misc/PackageManagement/Cmdlets/Project/PackageManagement.Cmdlets.csproj b/src/AddIns/Misc/PackageManagement/Cmdlets/Project/PackageManagement.Cmdlets.csproj index 5898e1a48fa..7e6b56f9dde 100644 --- a/src/AddIns/Misc/PackageManagement/Cmdlets/Project/PackageManagement.Cmdlets.csproj +++ b/src/AddIns/Misc/PackageManagement/Cmdlets/Project/PackageManagement.Cmdlets.csproj @@ -1,5 +1,5 @@  - + {E0A5E80A-003B-4335-A9DC-A76E2E46D38D} Debug @@ -7,7 +7,7 @@ Library ICSharpCode.PackageManagement.Cmdlets PackageManagement.Cmdlets - v4.5 + v4.7.2 ..\..\..\..\..\..\AddIns\Misc\PackageManagement\ False @@ -92,8 +92,6 @@ False - - - + \ No newline at end of file diff --git a/src/AddIns/Misc/PackageManagement/PowerShell/Project/PackageManagement.PowerShell.csproj b/src/AddIns/Misc/PackageManagement/PowerShell/Project/PackageManagement.PowerShell.csproj index 11774c79781..a92fbeaec9b 100644 --- a/src/AddIns/Misc/PackageManagement/PowerShell/Project/PackageManagement.PowerShell.csproj +++ b/src/AddIns/Misc/PackageManagement/PowerShell/Project/PackageManagement.PowerShell.csproj @@ -1,5 +1,5 @@  - + {A406803B-C584-43A3-BCEE-A0BB3132CB5F} Debug @@ -7,7 +7,7 @@ Library ICSharpCode.PackageManagement.PowerShell PackageManagement.PowerShell - v4.5 + v4.7.2 ..\..\..\..\..\..\AddIns\Misc\PackageManagement\ False @@ -59,9 +59,7 @@ - - - + {7048AE18-EB93-4A84-82D0-DD60EB58ADBD} diff --git a/src/AddIns/Misc/PackageManagement/Project/PackageManagement.csproj b/src/AddIns/Misc/PackageManagement/Project/PackageManagement.csproj index 3a9259c3fbe..6430e82e7e1 100644 --- a/src/AddIns/Misc/PackageManagement/Project/PackageManagement.csproj +++ b/src/AddIns/Misc/PackageManagement/Project/PackageManagement.csproj @@ -1,5 +1,5 @@  - + {AE4AB0FA-6087-4480-AF37-0FA1452B3DA1} Debug @@ -7,7 +7,7 @@ Library ICSharpCode.PackageManagement PackageManagement - v4.5 + v4.7.2 False False 4 @@ -66,16 +66,7 @@ - - - - - - - - - - + Configuration\GlobalAssemblyInfo.cs diff --git a/src/AddIns/Misc/PackageManagement/Project/PackageManagement_s4hdl3ob_wpftmp.csproj b/src/AddIns/Misc/PackageManagement/Project/PackageManagement_s4hdl3ob_wpftmp.csproj new file mode 100644 index 00000000000..d626b78aaf3 --- /dev/null +++ b/src/AddIns/Misc/PackageManagement/Project/PackageManagement_s4hdl3ob_wpftmp.csproj @@ -0,0 +1,597 @@ + + + + {AE4AB0FA-6087-4480-AF37-0FA1452B3DA1} + Debug + x86 + Library + ICSharpCode.PackageManagement + PackageManagement + v4.7.2 + False + False + 4 + False + ..\..\..\..\..\AddIns\Misc\PackageManagement\ + + False + obj\$(Configuration)\ + OnBuildSuccess + + + x86 + False + Auto + 4194304 + 4096 + + + true + Full + False + True + DEBUG;TRACE + obj\ + + + false + None + True + False + TRACE + + + + + + + Configuration\GlobalAssemblyInfo.cs + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + FileConflictView.xaml + Code + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ManagePackagesView.xaml + Code + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PackageManagementOptionsView.xaml + Code + + + + + + + + + + + + + + + + + + + + + LicenseAcceptanceView.xaml + Code + + + + + + + + + + RegisteredPackageSourcesUserControl.xaml + Code + + + RegisteredPackageSourcesView.xaml + Code + + + + + + + + + + + + + + + + + + + + + + + + + SelectProjectsView.xaml + Code + + + + + + + + PackagesView.xaml + Code + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PagedResultsView.xaml + Code + + + + + + + + + + + + + + + + PackageManagementConsoleView.xaml + Code + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {6C55B776-26D4-4DB3-A6AB-87E783B2F3D1} + ICSharpCode.AvalonEdit + False + + + {53DCA265-3C3C-42F9-B647-F72BA678122B} + ICSharpCode.NRefactory.CSharp + False + + + {3B2A5653-EC97-4001-BB9B-D90F1AF2C371} + ICSharpCode.NRefactory + False + + + {2748AD25-9C63-4E12-877B-4DCE96FBED54} + ICSharpCode.SharpDevelop + False + + + {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} + ICSharpCode.Core + False + + + {7E4A7172-7FF5-48D0-B719-7CD959DD1AC9} + ICSharpCode.Core.Presentation + False + + + {7048AE18-EB93-4A84-82D0-DD60EB58ADBD} + ICSharpCode.Scripting + False + + + {0162E499-42D0-409B-AA25-EED21F75336B} + AvalonEdit.AddIn + False + + + {A406803B-C584-43A3-BCEE-A0BB3132CB5F} + PackageManagement.PowerShell + + + {1b753d7f-7c77-4d5e-b928-02982690879c} + SharpDevelop.EnvDTE + False + + + + + about_NuGet.Cmdlets.help.txt + Always + + + NuGet-LICENSE.txt + Always + + + PackageManagement.Cmdlets.dll-Help.xml + Always + + + Always + + + Always + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/SharpDevelop.EnvDTE.vbproj b/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/SharpDevelop.EnvDTE.vbproj index cd33019d033..affa7806d0b 100644 --- a/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/SharpDevelop.EnvDTE.vbproj +++ b/src/AddIns/Misc/PackageManagement/SharpDevelop.EnvDTE/SharpDevelop.EnvDTE.vbproj @@ -1,5 +1,5 @@  - + {1B753D7F-7C77-4D5E-B928-02982690879C} Debug @@ -7,8 +7,9 @@ Library Empty SharpDevelop.EnvDTE - v4.0 - Client + v4.7.2 + + Properties On False @@ -37,6 +38,12 @@ True TRACE=1 + + false + + + false + @@ -121,7 +128,9 @@ - + + + diff --git a/src/AddIns/Misc/RegExpTk/Project/RegExpTk.csproj b/src/AddIns/Misc/RegExpTk/Project/RegExpTk.csproj index 574f865debd..be2222eeaa1 100644 --- a/src/AddIns/Misc/RegExpTk/Project/RegExpTk.csproj +++ b/src/AddIns/Misc/RegExpTk/Project/RegExpTk.csproj @@ -1,5 +1,5 @@  - + Debug AnyCPU @@ -18,7 +18,7 @@ 122683392 AnyCPU 4096 - v4.5 + v4.7.2 diff --git a/src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/ICSharpCode.Reporting.Addin.csproj b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/ICSharpCode.Reporting.Addin.csproj index 11850c2aa05..c08b346aa87 100644 --- a/src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/ICSharpCode.Reporting.Addin.csproj +++ b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/ICSharpCode.Reporting.Addin.csproj @@ -1,5 +1,5 @@  - + {0502FCF7-72F4-4587-936B-D0238CD0E072} {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} @@ -15,7 +15,7 @@ False obj\$(Configuration)\ 4 - v4.5 + v4.7.2 ..\..\..\..\..\AddIns\Misc\SharpDevelopReporting\ @@ -77,26 +77,7 @@ ..\..\..\..\Libraries\WPFExtendedToolkit\Xceed.Wpf.Toolkit.dll - - - - - - - - - - - - - - - - - - - - + Configuration\GlobalAssemblyInfo.cs @@ -105,17 +86,39 @@ - - - - - - - - - - - + + Component + + + Component + + + Component + + + Component + + + Component + + + Component + + + Component + + + Component + + + Component + + + Component + + + Component + @@ -132,12 +135,16 @@ - + + UserControl + - + + Form + EditorDialog.cs diff --git a/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/ICSharpCode.Reporting.csproj b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/ICSharpCode.Reporting.csproj index e50afe19fc6..8ac9a56c919 100644 --- a/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/ICSharpCode.Reporting.csproj +++ b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/ICSharpCode.Reporting.csproj @@ -1,5 +1,5 @@  - + {40CA84D4-ACFC-4646-9CDD-B87262D34093} Debug @@ -7,7 +7,7 @@ Library ICSharpCode.Reporting ICSharpCode.Reporting - v4.5 + v4.7.2 Properties @@ -157,7 +157,9 @@ - + + Component + @@ -194,38 +196,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/src/AddIns/Misc/SearchAndReplace/Project/SearchAndReplace.csproj b/src/AddIns/Misc/SearchAndReplace/Project/SearchAndReplace.csproj index 88cde529662..924ddb84979 100644 --- a/src/AddIns/Misc/SearchAndReplace/Project/SearchAndReplace.csproj +++ b/src/AddIns/Misc/SearchAndReplace/Project/SearchAndReplace.csproj @@ -1,5 +1,5 @@  - + {9196DD8A-B4D4-4780-8742-C5762E547FC2} Debug @@ -12,7 +12,7 @@ False 4 false - v4.5 + v4.7.2 diff --git a/src/AddIns/Misc/StartPage/Project/StartPage.csproj b/src/AddIns/Misc/StartPage/Project/StartPage.csproj index 2cad04f9584..d5b0b5e5f64 100644 --- a/src/AddIns/Misc/StartPage/Project/StartPage.csproj +++ b/src/AddIns/Misc/StartPage/Project/StartPage.csproj @@ -1,5 +1,5 @@  - + Debug AnyCPU @@ -19,7 +19,7 @@ 126877696 AnyCPU 4096 - v4.5 + v4.7.2 false @@ -95,7 +95,6 @@ ICSharpCode.Core.Presentation False - diff --git a/src/AddIns/Misc/TextTemplating/Project/TextTemplating.csproj b/src/AddIns/Misc/TextTemplating/Project/TextTemplating.csproj index f66ca935e76..c91b8b63992 100644 --- a/src/AddIns/Misc/TextTemplating/Project/TextTemplating.csproj +++ b/src/AddIns/Misc/TextTemplating/Project/TextTemplating.csproj @@ -1,5 +1,5 @@  - + {B5D8C3E6-42EC-4D4B-AD05-3644B32563EF} Debug @@ -7,7 +7,7 @@ Library ICSharpCode.TextTemplating TextTemplating - v4.5 + v4.7.2 False False 4 @@ -135,9 +135,6 @@ False - - - - + \ No newline at end of file diff --git a/src/AddIns/Misc/UsageDataCollector/UsageDataCollector.AddIn/UsageDataCollector.AddIn.csproj b/src/AddIns/Misc/UsageDataCollector/UsageDataCollector.AddIn/UsageDataCollector.AddIn.csproj index a59d75d483e..7a97f2a2bd7 100644 --- a/src/AddIns/Misc/UsageDataCollector/UsageDataCollector.AddIn/UsageDataCollector.AddIn.csproj +++ b/src/AddIns/Misc/UsageDataCollector/UsageDataCollector.AddIn/UsageDataCollector.AddIn.csproj @@ -1,5 +1,5 @@  - + {0008FCE9-9EB4-4E2E-979B-553278E5BBA6} Debug @@ -7,7 +7,7 @@ Library ICSharpCode.UsageDataCollector UsageDataCollector.AddIn - v4.5 + v4.7.2 ..\..\..\..\..\AddIns\Misc\UsageDataCollector\ False False diff --git a/src/AddIns/Misc/UsageDataCollector/UsageDataCollector/UsageDataCollector.csproj b/src/AddIns/Misc/UsageDataCollector/UsageDataCollector/UsageDataCollector.csproj index fe51184743e..1ff46dac41c 100644 --- a/src/AddIns/Misc/UsageDataCollector/UsageDataCollector/UsageDataCollector.csproj +++ b/src/AddIns/Misc/UsageDataCollector/UsageDataCollector/UsageDataCollector.csproj @@ -1,5 +1,5 @@  - + {6B1CFE35-DA17-4DEB-9C6E-227E5E251DA0} Debug @@ -7,7 +7,7 @@ Library ICSharpCode.UsageDataCollector UsageDataCollector - v4.0 + v4.7.2 ..\..\..\..\..\AddIns\Misc\UsageDataCollector\ False False @@ -15,7 +15,8 @@ false ..\..\..\..\..\AddIns\Misc\UsageDataCollector\UsageDataCollector.xml 1591 - Client + + x86 @@ -38,6 +39,12 @@ False TRACE + + false + + + false + @@ -64,9 +71,7 @@ - - - + {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} diff --git a/src/AddIns/VersionControl/GitAddIn/GitAddIn.csproj b/src/AddIns/VersionControl/GitAddIn/GitAddIn.csproj index 99780dcefd6..1e79169ddc6 100644 --- a/src/AddIns/VersionControl/GitAddIn/GitAddIn.csproj +++ b/src/AddIns/VersionControl/GitAddIn/GitAddIn.csproj @@ -1,5 +1,5 @@  - + {83F15BA7-8478-4664-81BB-A82F146D88B3} Debug @@ -12,7 +12,7 @@ False 4 false - v4.5 + v4.7.2 @@ -84,9 +84,7 @@ Always - - - + {2748AD25-9C63-4E12-877B-4DCE96FBED54} diff --git a/src/AddIns/VersionControl/SubversionAddIn/SubversionAddIn.csproj b/src/AddIns/VersionControl/SubversionAddIn/SubversionAddIn.csproj index 1a1c4e26cbd..e46320ff42f 100644 --- a/src/AddIns/VersionControl/SubversionAddIn/SubversionAddIn.csproj +++ b/src/AddIns/VersionControl/SubversionAddIn/SubversionAddIn.csproj @@ -1,5 +1,5 @@  - + Library ICSharpCode.Svn @@ -10,7 +10,7 @@ 8.0.50215 2.0 Always - v4.5 + v4.7.2 False False 4 @@ -92,7 +92,9 @@ - + + Form + diff --git a/src/Libraries/AvalonDock/AvalonDock/AvalonDock.csproj b/src/Libraries/AvalonDock/AvalonDock/AvalonDock.csproj index 057e53f5c96..891c847c0db 100644 --- a/src/Libraries/AvalonDock/AvalonDock/AvalonDock.csproj +++ b/src/Libraries/AvalonDock/AvalonDock/AvalonDock.csproj @@ -1,5 +1,5 @@  - + Debug AnyCPU @@ -10,8 +10,9 @@ Properties AvalonDock AvalonDock - v4.0 - Client + v4.7.2 + + 512 {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} False @@ -30,6 +31,7 @@ false TRACE;DEBUG;NET4 prompt + false pdbonly @@ -37,6 +39,7 @@ TRACE;NET4 prompt $(OutputPath)\AvalonDock.XML + false true diff --git a/src/Libraries/AvalonDock/AvalonDock/Properties/Resources.Designer.cs b/src/Libraries/AvalonDock/AvalonDock/Properties/Resources.Designer.cs index 474b94b1bf3..87bfcbed241 100644 --- a/src/Libraries/AvalonDock/AvalonDock/Properties/Resources.Designer.cs +++ b/src/Libraries/AvalonDock/AvalonDock/Properties/Resources.Designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.1 +// Runtime Version:4.0.30319.42000 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -19,7 +19,7 @@ namespace AvalonDock.Properties { // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] public class Resources { diff --git a/src/Libraries/AvalonDock/AvalonDock/Properties/Settings.Designer.cs b/src/Libraries/AvalonDock/AvalonDock/Properties/Settings.Designer.cs index 3ef14c16cf2..2704a37a1b1 100644 --- a/src/Libraries/AvalonDock/AvalonDock/Properties/Settings.Designer.cs +++ b/src/Libraries/AvalonDock/AvalonDock/Properties/Settings.Designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.1 +// Runtime Version:4.0.30319.42000 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -12,7 +12,7 @@ namespace AvalonDock.Properties { [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "10.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.8.0.0")] internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); diff --git a/src/Libraries/AvalonEdit b/src/Libraries/AvalonEdit index 697ff0d38c9..a76b518be92 160000 --- a/src/Libraries/AvalonEdit +++ b/src/Libraries/AvalonEdit @@ -1 +1 @@ -Subproject commit 697ff0d38c95c9e5a536fbc05ae2307ec9ef2a63 +Subproject commit a76b518be92a7667ec39b50562759890e9629581 diff --git a/src/Libraries/ICSharpCode.Build.Tasks/Project/ICSharpCode.Build.Tasks.csproj b/src/Libraries/ICSharpCode.Build.Tasks/Project/ICSharpCode.Build.Tasks.csproj index cd8a66a58ac..50d80c47530 100644 --- a/src/Libraries/ICSharpCode.Build.Tasks/Project/ICSharpCode.Build.Tasks.csproj +++ b/src/Libraries/ICSharpCode.Build.Tasks/Project/ICSharpCode.Build.Tasks.csproj @@ -1,5 +1,5 @@  - + Library ICSharpCode.Build.Tasks @@ -19,7 +19,7 @@ false False C:\Users\Daniel\AppData\Roaming\ICSharpCode/SharpDevelop3.0\Settings.SourceAnalysis - v4.5 + v4.7.2 diff --git a/src/Libraries/ICSharpCode.Decompiler/ICSharpCode.Decompiler.csproj b/src/Libraries/ICSharpCode.Decompiler/ICSharpCode.Decompiler.csproj index 7c9a046b0d2..8b4e6a2227e 100644 --- a/src/Libraries/ICSharpCode.Decompiler/ICSharpCode.Decompiler.csproj +++ b/src/Libraries/ICSharpCode.Decompiler/ICSharpCode.Decompiler.csproj @@ -1,5 +1,5 @@  - + {984CC812-9470-4A13-AFF9-CC44068D666C} Debug @@ -7,7 +7,7 @@ Library ICSharpCode.Decompiler ICSharpCode.Decompiler - v4.5 + v4.7.2 Properties diff --git a/src/Libraries/NRefactory b/src/Libraries/NRefactory index a2b55de351b..e121f5580a8 160000 --- a/src/Libraries/NRefactory +++ b/src/Libraries/NRefactory @@ -1 +1 @@ -Subproject commit a2b55de351be2119b6f0c3a17c36b5b9adbd7c59 +Subproject commit e121f5580a8577bda4ef09209527d8092c3a8c29 diff --git a/src/Libraries/SharpTreeView/ICSharpCode.TreeView/ICSharpCode.TreeView.csproj b/src/Libraries/SharpTreeView/ICSharpCode.TreeView/ICSharpCode.TreeView.csproj index 24ab75610df..4aa557fcdbb 100644 --- a/src/Libraries/SharpTreeView/ICSharpCode.TreeView/ICSharpCode.TreeView.csproj +++ b/src/Libraries/SharpTreeView/ICSharpCode.TreeView/ICSharpCode.TreeView.csproj @@ -1,5 +1,5 @@  - + Debug AnyCPU @@ -10,11 +10,12 @@ Properties ICSharpCode.TreeView ICSharpCode.TreeView - v4.0 + v4.7.2 512 {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} 4 - Client + + ..\..\..\..\bin\ False False @@ -31,6 +32,7 @@ DEBUG;TRACE prompt 4 + false pdbonly @@ -38,6 +40,7 @@ TRACE prompt 4 + false False diff --git a/src/Libraries/cecil b/src/Libraries/cecil index b527eb93d00..96c3e2a1a95 160000 --- a/src/Libraries/cecil +++ b/src/Libraries/cecil @@ -1 +1 @@ -Subproject commit b527eb93d00e2420cf8b0a696208570b3051fd2b +Subproject commit 96c3e2a1a956c88870df6cdbae73971c5d4669bd diff --git a/src/Main/Base/Project/Editor/Bookmarks/BookmarkPadContent.xaml b/src/Main/Base/Project/Editor/Bookmarks/BookmarkPadContent.xaml index d1d91cb993f..03bf05ab3c5 100644 --- a/src/Main/Base/Project/Editor/Bookmarks/BookmarkPadContent.xaml +++ b/src/Main/Base/Project/Editor/Bookmarks/BookmarkPadContent.xaml @@ -1,9 +1,9 @@ - - @@ -15,7 +15,7 @@ x:FieldModifier="public"> - + diff --git a/src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj b/src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj index 5d66a4ac4ec..a14f53b45a3 100644 --- a/src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj +++ b/src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj @@ -1,5 +1,5 @@  - + Debug AnyCPU @@ -25,7 +25,7 @@ 0809 1591 4 ..\..\..\..\bin\ - v4.5 + v4.7.2 ICSharpCode.SharpDevelop @@ -275,7 +275,9 @@ Code - + + UserControl + StringListEditorDialog.xaml @@ -284,11 +286,15 @@ Code - + + Form + AsynchronousWaitDialog.cs - + + Form + AbstractAttachToProcessForm.cs @@ -422,10 +428,10 @@ ExtractInterfaceDialog.cs - + + Form - NewProjectDialog.cs @@ -548,11 +554,15 @@ - + + Form + ToolNotFoundDialog.cs - + + UserControl + TabbedOptionsDialog.xaml Code @@ -662,18 +672,12 @@ - - UserControl - - - UserControl - + + - - UserControl - + - Form + UserControl Form @@ -681,9 +685,7 @@ UserControl - - Form - + Form @@ -694,19 +696,17 @@ Component - Component + UserControl - Component + UserControl SelectReferenceDialog.cs Form - - Component - + @@ -819,13 +819,10 @@ - UserControl BuildEvents.xaml - - Component - + @@ -843,12 +840,18 @@ - + + Component + - - + + Form + + + UserControl + @@ -856,8 +859,12 @@ - - + + Form + + + Component + @@ -873,7 +880,9 @@ - + + Component + @@ -890,16 +899,6 @@ - - - - - - - - - - @@ -974,27 +973,6 @@ ICSharpCode.Core False - - - - - - - - - - - - - - - - - - - - - {7E4A7172-7FF5-48D0-B719-7CD959DD1AC9} ICSharpCode.Core.Presentation diff --git a/src/Main/Core/Project/ICSharpCode.Core.csproj b/src/Main/Core/Project/ICSharpCode.Core.csproj index c5b859b321c..fe6b5b434ac 100644 --- a/src/Main/Core/Project/ICSharpCode.Core.csproj +++ b/src/Main/Core/Project/ICSharpCode.Core.csproj @@ -1,5 +1,5 @@  - + Debug AnyCPU @@ -18,7 +18,7 @@ Always False File - v4.5 + v4.7.2 False false C:\Users\daniel\AppData\Roaming\ICSharpCode/SharpDevelop3.0\Settings.SourceAnalysis @@ -142,8 +142,6 @@ - - Src\AddInTree\AddIn\AddIn.xsd diff --git a/src/Main/ICSharpCode.Core.Presentation/ICSharpCode.Core.Presentation.csproj b/src/Main/ICSharpCode.Core.Presentation/ICSharpCode.Core.Presentation.csproj index 86e767f4f73..38e65c3b51c 100644 --- a/src/Main/ICSharpCode.Core.Presentation/ICSharpCode.Core.Presentation.csproj +++ b/src/Main/ICSharpCode.Core.Presentation/ICSharpCode.Core.Presentation.csproj @@ -1,5 +1,5 @@  - + {7E4A7172-7FF5-48D0-B719-7CD959DD1AC9} Debug @@ -7,7 +7,7 @@ Library ICSharpCode.Core.Presentation ICSharpCode.Core.Presentation - v4.5 + v4.7.2 Properties "C:\Program Files\SharpDevelop\3.0\bin\..\AddIns\AddIns\Misc\SourceAnalysis\Settings.SourceAnalysis" ..\..\..\bin\ diff --git a/src/Main/ICSharpCode.Core.WinForms/ICSharpCode.Core.WinForms.csproj b/src/Main/ICSharpCode.Core.WinForms/ICSharpCode.Core.WinForms.csproj index d6aabfe10f4..ffa7b190f3d 100644 --- a/src/Main/ICSharpCode.Core.WinForms/ICSharpCode.Core.WinForms.csproj +++ b/src/Main/ICSharpCode.Core.WinForms/ICSharpCode.Core.WinForms.csproj @@ -1,5 +1,5 @@  - + {857CA1A3-FC88-4BE0-AB6A-D1EE772AB288} Debug @@ -7,7 +7,7 @@ Library ICSharpCode.Core.WinForms ICSharpCode.Core.WinForms - v4.5 + v4.7.2 Properties ..\..\..\bin\ False @@ -63,19 +63,29 @@ Properties\GlobalAssemblyInfo.cs - + + Component + Component - - + + Component + + + Component + Form - - + + Form + + + Form + Form @@ -84,11 +94,15 @@ Component - + + Component + Component - + + Component + Component diff --git a/src/Main/ICSharpCode.SharpDevelop.BuildWorker/ICSharpCode.SharpDevelop.BuildWorker.csproj b/src/Main/ICSharpCode.SharpDevelop.BuildWorker/ICSharpCode.SharpDevelop.BuildWorker.csproj index 424ff79e3dd..e3e614fc895 100644 --- a/src/Main/ICSharpCode.SharpDevelop.BuildWorker/ICSharpCode.SharpDevelop.BuildWorker.csproj +++ b/src/Main/ICSharpCode.SharpDevelop.BuildWorker/ICSharpCode.SharpDevelop.BuildWorker.csproj @@ -1,5 +1,5 @@  - + {C3CBC8E3-81D8-4C5B-9941-DCCD12D50B1F} Debug @@ -7,7 +7,7 @@ Exe ICSharpCode.SharpDevelop.BuildWorker ICSharpCode.SharpDevelop.BuildWorker40 - v4.5 + v4.7.2 False False 4 diff --git a/src/Main/ICSharpCode.SharpDevelop.BuildWorker/app.config b/src/Main/ICSharpCode.SharpDevelop.BuildWorker/app.config index 5691c95e4cf..bdb77c8390b 100644 --- a/src/Main/ICSharpCode.SharpDevelop.BuildWorker/app.config +++ b/src/Main/ICSharpCode.SharpDevelop.BuildWorker/app.config @@ -1,26 +1,26 @@ - + -
+
- + - - + + - - + + - - + + diff --git a/src/Main/ICSharpCode.SharpDevelop.BuildWorker120/ICSharpCode.SharpDevelop.BuildWorker120.csproj b/src/Main/ICSharpCode.SharpDevelop.BuildWorker120/ICSharpCode.SharpDevelop.BuildWorker120.csproj index 9bc7e6672d7..66fa54600f2 100644 --- a/src/Main/ICSharpCode.SharpDevelop.BuildWorker120/ICSharpCode.SharpDevelop.BuildWorker120.csproj +++ b/src/Main/ICSharpCode.SharpDevelop.BuildWorker120/ICSharpCode.SharpDevelop.BuildWorker120.csproj @@ -7,7 +7,7 @@ Exe ICSharpCode.SharpDevelop.BuildWorker ICSharpCode.SharpDevelop.BuildWorker120 - v4.5.1 + v4.7.2 False False 4 @@ -92,9 +92,7 @@ false - - - + diff --git a/src/Main/ICSharpCode.SharpDevelop.BuildWorker120/app.config b/src/Main/ICSharpCode.SharpDevelop.BuildWorker120/app.config index 0e9d54308b6..8a471d463da 100644 --- a/src/Main/ICSharpCode.SharpDevelop.BuildWorker120/app.config +++ b/src/Main/ICSharpCode.SharpDevelop.BuildWorker120/app.config @@ -1,14 +1,14 @@ - + -
+
- + - + diff --git a/src/Main/ICSharpCode.SharpDevelop.BuildWorker140/ICSharpCode.SharpDevelop.BuildWorker140.csproj b/src/Main/ICSharpCode.SharpDevelop.BuildWorker140/ICSharpCode.SharpDevelop.BuildWorker140.csproj index 25d5ca2be7f..01a5d1f714b 100644 --- a/src/Main/ICSharpCode.SharpDevelop.BuildWorker140/ICSharpCode.SharpDevelop.BuildWorker140.csproj +++ b/src/Main/ICSharpCode.SharpDevelop.BuildWorker140/ICSharpCode.SharpDevelop.BuildWorker140.csproj @@ -7,7 +7,7 @@ Exe ICSharpCode.SharpDevelop.BuildWorker ICSharpCode.SharpDevelop.BuildWorker140 - v4.5.1 + v4.7.2 False False 4 @@ -90,9 +90,7 @@ false - - - + diff --git a/src/Main/ICSharpCode.SharpDevelop.BuildWorker140/app.config b/src/Main/ICSharpCode.SharpDevelop.BuildWorker140/app.config index 155efda1cf0..346c30963d4 100644 --- a/src/Main/ICSharpCode.SharpDevelop.BuildWorker140/app.config +++ b/src/Main/ICSharpCode.SharpDevelop.BuildWorker140/app.config @@ -1,14 +1,14 @@ - + -
+
- + - + diff --git a/src/Main/ICSharpCode.SharpDevelop.BuildWorker35/ICSharpCode.SharpDevelop.BuildWorker35.csproj b/src/Main/ICSharpCode.SharpDevelop.BuildWorker35/ICSharpCode.SharpDevelop.BuildWorker35.csproj index 3dcd0e8da64..53826927b1d 100644 --- a/src/Main/ICSharpCode.SharpDevelop.BuildWorker35/ICSharpCode.SharpDevelop.BuildWorker35.csproj +++ b/src/Main/ICSharpCode.SharpDevelop.BuildWorker35/ICSharpCode.SharpDevelop.BuildWorker35.csproj @@ -1,5 +1,5 @@  - + {B5F54272-49F0-40DB-845A-8D837875D3BA} Debug @@ -7,7 +7,7 @@ Exe ICSharpCode.SharpDevelop.BuildWorker35 ICSharpCode.SharpDevelop.BuildWorker35 - v3.5 + v4.7.2 Properties ..\..\..\bin\ False @@ -16,6 +16,7 @@ False False obj\$(Configuration)\ + x86 @@ -39,6 +40,12 @@ False TRACE;MSBUILD35 + + false + + + false + diff --git a/src/Main/ICSharpCode.SharpDevelop.BuildWorker35/app.config b/src/Main/ICSharpCode.SharpDevelop.BuildWorker35/app.config index aa701ee4ae4..0579dac9720 100644 --- a/src/Main/ICSharpCode.SharpDevelop.BuildWorker35/app.config +++ b/src/Main/ICSharpCode.SharpDevelop.BuildWorker35/app.config @@ -12,4 +12,4 @@ - + diff --git a/src/Main/ICSharpCode.SharpDevelop.Widgets/Project/ICSharpCode.SharpDevelop.Widgets.csproj b/src/Main/ICSharpCode.SharpDevelop.Widgets/Project/ICSharpCode.SharpDevelop.Widgets.csproj index 23429a1a62d..4b07b59d71f 100644 --- a/src/Main/ICSharpCode.SharpDevelop.Widgets/Project/ICSharpCode.SharpDevelop.Widgets.csproj +++ b/src/Main/ICSharpCode.SharpDevelop.Widgets/Project/ICSharpCode.SharpDevelop.Widgets.csproj @@ -1,5 +1,5 @@  - + Library ICSharpCode.SharpDevelop.Widgets @@ -16,7 +16,7 @@ ..\..\ICSharpCode.SharpDevelop.snk False File - v4.5 + v4.7.2 @@ -93,9 +93,7 @@ - - UserControl - + @@ -123,11 +121,7 @@ - - - - - + diff --git a/src/Main/SharpDevelop/SharpDevelop.csproj b/src/Main/SharpDevelop/SharpDevelop.csproj index 02db097b4fe..83e8484a275 100644 --- a/src/Main/SharpDevelop/SharpDevelop.csproj +++ b/src/Main/SharpDevelop/SharpDevelop.csproj @@ -1,5 +1,5 @@  - + Debug AnyCPU @@ -23,7 +23,7 @@ False False File - v4.5 + v4.7.2 app.manifest @@ -149,15 +149,21 @@ - + + Form + AddNewConfigurationDialog.cs - + + Form + EditAvailableConfigurationsDialog.cs - + + Form + SolutionConfigurationEditor.cs @@ -175,7 +181,9 @@ - + + Form + @@ -196,14 +204,18 @@ - + + Form + AddOpenWithEntryDialog.cs - + + Form + OpenWithDialog.cs @@ -221,7 +233,9 @@ - + + Form + @@ -329,29 +343,7 @@ False - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/src/Tools/Properties/AssemblyInfo.cs b/src/Tools/Properties/AssemblyInfo.cs new file mode 100644 index 00000000000..749fd213949 --- /dev/null +++ b/src/Tools/Properties/AssemblyInfo.cs @@ -0,0 +1,36 @@ +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +// General Information about an assembly is controlled through the following +// set of attributes. Change these attribute values to modify the information +// associated with an assembly. +[assembly: AssemblyTitle("Tools")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("Tools")] +[assembly: AssemblyCopyright("Copyright © 2018")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from +// COM, set the ComVisible attribute to true on that type. +[assembly: ComVisible(false)] + +// The following GUID is for the ID of the typelib if this project is exposed to COM +[assembly: Guid("c2777d59-5cb7-42f4-bf92-166df88e8acd")] + +// Version information for an assembly consists of the following four values: +// +// Major Version +// Minor Version +// Build Number +// Revision +// +// You can specify all the values or you can default the Build and Revision Numbers +// by using the '*' as shown below: +// [assembly: AssemblyVersion("1.0.*")] +[assembly: AssemblyVersion("1.0.0.0")] +[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/src/Tools/Tools.build b/src/Tools/Tools.build deleted file mode 100644 index dcb972458b9..00000000000 --- a/src/Tools/Tools.build +++ /dev/null @@ -1,84 +0,0 @@ - - - ..\..\data\resources\ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/Tools/Tools.csproj b/src/Tools/Tools.csproj new file mode 100644 index 00000000000..c3f7e18ba4f --- /dev/null +++ b/src/Tools/Tools.csproj @@ -0,0 +1,77 @@ + + + + + Debug + AnyCPU + {C2777D59-5CB7-42F4-BF92-166DF88E8ACD} + Library + Properties + Tools + Tools + v4.7.2 + 512 + true + + + + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + C:\Users\Stefan\AppData\Local\Temp\vsBD99.tmp\Debug\ + + + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + C:\Users\Stefan\AppData\Local\Temp\vsBD99.tmp\Release\ + + + + + + + + + + + + + + + + + ..\..\data\resources\ + (robocopy $(ProjectDir)\NUnit "$(ProjectDir)\..\..\bin\Tools\NUnit" *.dll *.exe *.config /MIR )^& IF %25ERRORLEVEL%25 GEQ 8 exit 1 +(robocopy $(ProjectDir)\OpenCover "$(ProjectDir)\..\..\bin\Tools\OpenCover" /MIR )^& IF %25ERRORLEVEL%25 GEQ 8 exit 1 +(robocopy $(ProjectDir)\..\Libraries\GraphSharp "$(ProjectDir)\..\..\bin" /MIR )^& IF %25ERRORLEVEL%25 GEQ 8 exit 1 +exit 0 + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file