pimhwang
/
SharpDevelop
mirror of https://github.com/icsharpcode/SharpDevelop.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Fix build...

pull/823/head
Thomas Prioul 6 years ago
parent
b64ca7dcf2
commit
1b9db71843
6 changed files with 44 additions and 17 deletions
Split View
  1. 2
      .gitignore
  2. 26
      src/Libraries/SharpTreeView/Backup/SharpTreeView.sln
  3. 3
      src/Libraries/SharpTreeView/ICSharpCode.TreeView.Demo/ICSharpCode.TreeView.Demo.csproj
  4. 8
      src/Libraries/SharpTreeView/ICSharpCode.TreeView.Demo/Window1.xaml.cs
  5. 3
      src/Libraries/SharpTreeView/ICSharpCode.TreeView/ICSharpCode.TreeView.csproj
  6. 9
      src/Libraries/SharpTreeView/SharpTreeView.sln

2
.gitignore vendored
Unescape View File

@ -30,3 +30,5 @@ bin/ @@ -30,3 +30,5 @@ bin/
*.DotSettings.user
*.suo
.DS_Store
.vs/
UpgradeLog.htm

26
src/Libraries/SharpTreeView/Backup/SharpTreeView.sln
Unescape View File

@ -0,0 +1,26 @@ @@ -0,0 +1,26 @@

Microsoft Visual Studio Solution File, Format Version 10.00
# Visual Studio 2008
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.TreeView", "ICSharpCode.TreeView\ICSharpCode.TreeView.csproj", "{DDE2A481-8271-4EAC-A330-8FA6A38D13D1}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.TreeView.Demo", "ICSharpCode.TreeView.Demo\ICSharpCode.TreeView.Demo.csproj", "{B521D667-3613-429C-AB58-26A5B5A82004}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{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}.Release|Any CPU.ActiveCfg = Release|Any CPU
{DDE2A481-8271-4EAC-A330-8FA6A38D13D1}.Release|Any CPU.Build.0 = Release|Any CPU
{B521D667-3613-429C-AB58-26A5B5A82004}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B521D667-3613-429C-AB58-26A5B5A82004}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B521D667-3613-429C-AB58-26A5B5A82004}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B521D667-3613-429C-AB58-26A5B5A82004}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
EndGlobal

3
src/Libraries/SharpTreeView/ICSharpCode.TreeView.Demo/ICSharpCode.TreeView.Demo.csproj
Unescape View File

@ -86,9 +86,6 @@ @@ -86,9 +86,6 @@
</Compile>
</ItemGroup>
<ItemGroup>
<Compile Include="..\..\..\Main\GlobalAssemblyInfo.cs">
<Link>Properties\GlobalAssemblyInfo.cs</Link>
</Compile>
<Compile Include="FileNode.cs" />
<Compile Include="FileSystemNode.cs" />
<Compile Include="FolderNode.cs" />

8
src/Libraries/SharpTreeView/ICSharpCode.TreeView.Demo/Window1.xaml.cs
Unescape View File

@ -58,12 +58,12 @@ namespace ICSharpCode.TreeView.Demo @@ -58,12 +58,12 @@ namespace ICSharpCode.TreeView.Demo
// Debug.WriteLine(sb.ToString());
//}
public static Image LoadIcon(string name)
public static ImageSource LoadIcon(string name)
{
var frame = BitmapFrame.Create(new Uri("pack://application:,,,/Images/" + name, UriKind.Absolute));
Image result = new Image();
result.Source = frame;
return result;
//Image result = new Image();
//result.Source = frame;
return frame;
}
}
}

3
src/Libraries/SharpTreeView/ICSharpCode.TreeView/ICSharpCode.TreeView.csproj
Unescape View File

@ -73,9 +73,6 @@ @@ -73,9 +73,6 @@
</Page>
</ItemGroup>
<ItemGroup>
<Compile Include="..\..\..\Main\GlobalAssemblyInfo.cs">
<Link>Properties\GlobalAssemblyInfo.cs</Link>
</Compile>
<Compile Include="Converters.cs" />
<Compile Include="EditTextBox.cs" />
<Compile Include="ExtensionMethods.cs" />

9
src/Libraries/SharpTreeView/SharpTreeView.sln
Unescape View File

@ -1,6 +1,8 @@ @@ -1,6 +1,8 @@

Microsoft Visual Studio Solution File, Format Version 10.00
# Visual Studio 2008
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
VisualStudioVersion = 16.0.28705.295
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.TreeView", "ICSharpCode.TreeView\ICSharpCode.TreeView.csproj", "{DDE2A481-8271-4EAC-A330-8FA6A38D13D1}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.TreeView.Demo", "ICSharpCode.TreeView.Demo\ICSharpCode.TreeView.Demo.csproj", "{B521D667-3613-429C-AB58-26A5B5A82004}"
@ -23,4 +25,7 @@ Global @@ -23,4 +25,7 @@ Global
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {B06C6A7C-CCFD-4811-B7FD-D79E8748818A}
EndGlobalSection
EndGlobal

Write Preview
Loading…
Cancel
Save