Browse Source

Mark trunk as SD 3.0

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@2182 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
shortcuts
Daniel Grunwald 19 years ago
parent
commit
ab9847def4
  1. 2
      src/Automated.proj
  2. 4
      src/Main/GlobalAssemblyInfo.template
  3. 2
      src/Main/StartUp/Project/Dialogs/SplashScreen.cs
  4. 2
      src/Main/StartUp/Project/SharpDevelopMain.cs
  5. 12
      src/Main/StartUp/Project/app.template.config

2
src/Automated.proj

@ -11,7 +11,7 @@ @@ -11,7 +11,7 @@
<SharpDevelopSrc>$(ProjectDir)\src</SharpDevelopSrc>
<SharpDevelopBin>$(ProjectDir)\bin</SharpDevelopBin>
<MSBuildCommunityTasksPath>$(MSBuildProjectDirectory)\Tools\MSBuildCommunityTasks</MSBuildCommunityTasksPath>
<ArtefactPrefix>SharpDevelop_2.1.0.</ArtefactPrefix>
<ArtefactPrefix>SharpDevelop_3.0.0.</ArtefactPrefix>
<NUnitToolPath>$(MSBuildProjectDirectory)\Tools\NUnit</NUnitToolPath>
<!-- we cannot use <MSBuild> to build a solution because -->

4
src/Main/GlobalAssemblyInfo.template

@ -24,8 +24,8 @@ using System.Reflection; @@ -24,8 +24,8 @@ using System.Reflection;
internal static class RevisionClass
{
public const string Major = "2";
public const string Minor = "1";
public const string Major = "3";
public const string Minor = "0";
public const string Build = "0";
public const string Revision = "-INSERTREVISION-";

2
src/Main/StartUp/Project/Dialogs/SplashScreen.cs

@ -14,7 +14,7 @@ namespace ICSharpCode.SharpDevelop @@ -14,7 +14,7 @@ namespace ICSharpCode.SharpDevelop
{
public class SplashScreenForm : Form
{
public const string VersionText = "SharpDevelop " + RevisionClass.FullVersion;
public const string VersionText = "Montferrer (3.0) build " + RevisionClass.Revision;
static SplashScreenForm splashScreen;
static List<string> requestedFileList = new List<string>();

2
src/Main/StartUp/Project/SharpDevelopMain.cs

@ -114,7 +114,7 @@ namespace ICSharpCode.SharpDevelop @@ -114,7 +114,7 @@ namespace ICSharpCode.SharpDevelop
startup.ApplicationRootPath = Path.Combine(Path.GetDirectoryName(exe.Location), "..");
startup.AllowUserAddIns = true;
startup.ConfigDirectory = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData),
"ICSharpCode/SharpDevelop2.1");
"ICSharpCode/SharpDevelop3.0");
startup.AddAddInsFromDirectory(Path.Combine(startup.ApplicationRootPath, "AddIns"));

12
src/Main/StartUp/Project/app.template.config

@ -14,27 +14,27 @@ @@ -14,27 +14,27 @@
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="ICSharpCode.Core" publicKeyToken="f829da5c02be14ee" culture="neutral"/>
<bindingRedirect oldVersion="2.1.0.1976-$INSERTVERSION$" newVersion="$INSERTVERSION$"/>
<bindingRedirect oldVersion="3.0.0.0-$INSERTVERSION$" newVersion="$INSERTVERSION$"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="ICSharpCode.SharpDevelop" publicKeyToken="f829da5c02be14ee" culture="neutral"/>
<bindingRedirect oldVersion="2.1.0.1976-$INSERTVERSION$" newVersion="$INSERTVERSION$"/>
<bindingRedirect oldVersion="3.0.0.0-$INSERTVERSION$" newVersion="$INSERTVERSION$"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="ICSharpCode.SharpDevelop.Dom" publicKeyToken="f829da5c02be14ee" culture="neutral"/>
<bindingRedirect oldVersion="2.1.0.1976-$INSERTVERSION$" newVersion="$INSERTVERSION$"/>
<bindingRedirect oldVersion="3.0.0.0-$INSERTVERSION$" newVersion="$INSERTVERSION$"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="ICSharpCode.SharpDevelop.Widgets" publicKeyToken="f829da5c02be14ee" culture="neutral"/>
<bindingRedirect oldVersion="2.1.0.1976-$INSERTVERSION$" newVersion="$INSERTVERSION$"/>
<bindingRedirect oldVersion="3.0.0.0-$INSERTVERSION$" newVersion="$INSERTVERSION$"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="ICSharpCode.TextEditor" publicKeyToken="4d61825e8dd49f1a" culture="neutral"/>
<bindingRedirect oldVersion="2.1.0.1976-$INSERTVERSION$" newVersion="$INSERTVERSION$"/>
<bindingRedirect oldVersion="3.0.0.0-$INSERTVERSION$" newVersion="$INSERTVERSION$"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="ICSharpCode.NRefactory" publicKeyToken="efe927acf176eea2" culture="neutral"/>
<bindingRedirect oldVersion="2.1.0.1976-$INSERTVERSION$" newVersion="$INSERTVERSION$"/>
<bindingRedirect oldVersion="3.0.0.0-$INSERTVERSION$" newVersion="$INSERTVERSION$"/>
</dependentAssembly>
<probing privatePath="Tools\NUnit"/>
</assemblyBinding>

Loading…
Cancel
Save