Skip to content
This repository was archived by the owner on Oct 16, 2020. It is now read-only.

Commit 16d9108

Browse files
author
gumme
committed
Merge remote-tracking branch 'upstream/master'
2 parents bd82815 + 3c64d4f commit 16d9108

39 files changed

Lines changed: 529 additions & 37 deletions

‎samples/Mono/Mono.AddIn.sln‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 11.00
33
# Visual Studio 2010
4-
# SharpDevelop 4.0.0.5571
4+
# SharpDevelop 4.3
55
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.AddIn", "Mono.AddIn\Mono.AddIn.csproj", "{082DCD64-EE32-4151-A50F-E139CF754CC0}"
66
EndProject
77
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.Build.Tasks", "Mono.Build.Tasks\Mono.Build.Tasks.csproj", "{BF6F814C-B89F-475E-ADC4-AEE81D10CB94}"

‎samples/Mono/Mono.AddIn/Configuration/AssemblyInfo.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,4 +29,4 @@
2929
// You can specify all values by your own or you can build default build and revision
3030
// numbers with the '*' character (the default):
3131

32-
[assembly: AssemblyVersion("1.0.*")]
32+
[assembly: AssemblyVersion("2.0.*")]

‎samples/Mono/Mono.AddIn/Mono.addin‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@
5252
<Or>
5353
<Condition name="CompareProjectProperty" property="MonoTargetFrameworkVersion" equals="v1.1"/>
5454
<Condition name="CompareProjectProperty" property="MonoTargetFrameworkVersion" equals="v2.0"/>
55+
<Condition name="CompareProjectProperty" property="MonoTargetFrameworkVersion" equals="v4.0"/>
5556
</Or>
5657
<Or>
5758
<Condition name="ProjectActive" activeproject="C#"/>

‎samples/Mono/Mono.AddIn/Templates/CSharp.Console.Project.xpt‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0"?>
2-
<Template originator="Mike Krueger">
2+
<Template originator = "Mike Krueger"
3+
lastModified = "28/06/2013">
34

45
<!-- Template Header -->
56
<TemplateConfiguration>
@@ -19,13 +20,15 @@
1920
<Project language = "C#">
2021
<PropertyGroup>
2122
<OutputType>Exe</OutputType>
22-
<MonoTargetFrameworkVersion>v2.0</MonoTargetFrameworkVersion>
23+
<MonoTargetFrameworkVersion>v4.0</MonoTargetFrameworkVersion>
2324
</PropertyGroup>
25+
2426
<ProjectItems>
2527
<Reference Include="System" />
2628
<Reference Include="System.Data" />
2729
<Reference Include="System.Xml" />
2830
</ProjectItems>
31+
2932
<Imports clear="True">
3033
<Import Project="$(MonoBuildTasksPath)\Mono.Build.CSharp.targets" />
3134
</Imports>

‎samples/Mono/Mono.AddIn/Templates/CSharpGladeProject.xpt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0"?>
22
<Template originator = "Matt Ward"
33
created = "01/10/2001"
4-
lastModified = "14/01/2006">
4+
lastModified = "28/06/2013">
55

66
<!-- Template Header -->
77
<TemplateConfiguration>
@@ -20,7 +20,7 @@
2020
<Project language = "C#">
2121
<PropertyGroup>
2222
<OutputType>WinExe</OutputType>
23-
<MonoTargetFrameworkVersion>v2.0</MonoTargetFrameworkVersion>
23+
<MonoTargetFrameworkVersion>v4.0</MonoTargetFrameworkVersion>
2424
</PropertyGroup>
2525

2626
<Imports clear="True">

‎samples/Mono/Mono.AddIn/Templates/CSharpGtkProject.xpt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0"?>
22
<Template originator = "Matt Ward"
33
created = "01/01/2006"
4-
lastModified = "14/06/2006">
4+
lastModified = "28/06/2013">
55

66
<!-- Template Header -->
77
<TemplateConfiguration>
@@ -20,7 +20,7 @@
2020
<Project language = "C#">
2121
<PropertyGroup>
2222
<OutputType>WinExe</OutputType>
23-
<MonoTargetFrameworkVersion>v2.0</MonoTargetFrameworkVersion>
23+
<MonoTargetFrameworkVersion>v4.0</MonoTargetFrameworkVersion>
2424
</PropertyGroup>
2525

2626
<Imports clear="True">

‎samples/Mono/Mono.AddIn/Templates/DefaultApp.config‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
44
<dependentAssembly>
55
<assemblyIdentity name="System" publicKeyToken="b77a5c561934e089" culture="neutral"/>
6-
<bindingRedirect oldVersion="1.0.5000.0" newVersion="2.0.0.0" />
76
</dependentAssembly>
87
</assemblyBinding>
98
</runtime>

‎samples/Mono/Mono.AddIn/Templates/VBNet.Console.Project.xpt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<?xml version="1.0"?>
22
<Template originator = "Shinsaku Nakagawa"
33
created = "11/28/2002"
4-
lastModified = "07/20/2005">
4+
lastModified = "28/06/2013">
55

66
<!-- Template Header -->
77
<TemplateConfiguration>
88
<Name>Console Application</Name>
9-
<Category>VBNet</Category>
9+
<Category>VB</Category>
1010
<Subcategory>Mono</Subcategory>
1111
<Icon>VBNet.Project.DOSProject</Icon>
1212
<Description>Console project for Mono.</Description>
@@ -21,7 +21,7 @@
2121
<Project language = "VBNet">
2222
<PropertyGroup>
2323
<OutputType>Exe</OutputType>
24-
<MonoTargetFrameworkVersion>v2.0</MonoTargetFrameworkVersion>
24+
<MonoTargetFrameworkVersion>v4.0</MonoTargetFrameworkVersion>
2525
</PropertyGroup>
2626

2727
<ProjectItems>

‎samples/Mono/Mono.AddIn/Templates/VBNetGtkProject.xpt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<?xml version="1.0"?>
22
<Template originator = "Matt Ward"
33
created = "15/02/2006"
4-
lastModified = "15/02/2006">
4+
lastModified = "28/06/2013">
55

66
<!-- Template Header -->
77
<TemplateConfiguration>
88
<Name>Gtk# Application</Name>
9-
<Category>VBNet</Category>
9+
<Category>VB</Category>
1010
<Subcategory>Mono</Subcategory>
1111
<Icon>VBNet.Project.Form</Icon>
1212
<Description>A project that creates a Gtk# application.</Description>
@@ -20,7 +20,7 @@
2020
<Project language="VBNet">
2121
<PropertyGroup>
2222
<OutputType>WinExe</OutputType>
23-
<MonoTargetFrameworkVersion>v2.0</MonoTargetFrameworkVersion>
23+
<MonoTargetFrameworkVersion>v4.0</MonoTargetFrameworkVersion>
2424
<StartupObject>${StandardNamespace}.MainWindow</StartupObject>
2525
</PropertyGroup>
2626

‎samples/Mono/Mono.Build.Tasks.Tests/Mono.Build.Tasks.Tests.csproj‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
2+
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
33
<PropertyGroup>
44
<OutputType>Library</OutputType>
55
<RootNamespace>ICSharpCode.Build.Tasks.Tests</RootNamespace>
@@ -17,7 +17,8 @@
1717
<WarningLevel>4</WarningLevel>
1818
<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
1919
<OutputPath>bin\UnitTests</OutputPath>
20-
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
20+
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
21+
<TargetFrameworkProfile />
2122
</PropertyGroup>
2223
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
2324
<Optimize>False</Optimize>

0 commit comments

Comments
 (0)