Browse Source

Fixed exception when renaming project while project options are opened.

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@1040 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
shortcuts
Daniel Grunwald 20 years ago
parent
commit
8cad70aec9
  1. 2
      data/templates/project/VBNet/ConsoleProject.xpt
  2. 2
      data/templates/project/VBNet/Direct3DProject.xpt
  3. 2
      data/templates/project/VBNet/Service.xpt
  4. 4
      src/AddIns/Misc/SharpReport/SharpReportCore/SharpReportCore.csproj
  5. 7
      src/Libraries/ICSharpCode.TextEditor/Project/Configuration/AssemblyInfo.cs
  6. 9
      src/Libraries/ICSharpCode.TextEditor/Project/ICSharpCode.TextEditor.csproj
  7. 9
      src/Libraries/NRefactory/Project/Configuration/AssemblyInfo.cs
  8. 2
      src/Libraries/NRefactory/Project/NRefactory.csproj
  9. 4
      src/Main/Base/Project/Configuration/AssemblyInfo.cs
  10. 2
      src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj
  11. 4
      src/Main/Base/Project/Src/Gui/Dialogs/ProjectOptionsView.cs
  12. 4
      src/Main/Core/Project/Configuration/AssemblyInfo.cs
  13. 3
      src/Main/Core/Project/ICSharpCode.Core.csproj
  14. 1
      src/Main/StartUp/Project/Configuration/AssemblyInfo.template

2
data/templates/project/VBNet/ConsoleProject.xpt

@ -26,7 +26,7 @@
</Options> </Options>
<Project name = "${ProjectName}" directory = "."> <Project name = "${ProjectName}" directory = ".">
<Options /> <Options OutputType = "Exe" />
<ProjectItems> <ProjectItems>
<Reference Include="System" /> <Reference Include="System" />

2
data/templates/project/VBNet/Direct3DProject.xpt

@ -25,7 +25,7 @@
</Options> </Options>
<Project name = "${ProjectName}" directory = "."> <Project name = "${ProjectName}" directory = ".">
<Options/> <Options OutputType = "WinExe" />
<ProjectItems> <ProjectItems>
<Reference Include="System" /> <Reference Include="System" />

2
data/templates/project/VBNet/Service.xpt

@ -23,7 +23,7 @@
<StartupProject>${ProjectName}</StartupProject> <StartupProject>${ProjectName}</StartupProject>
</Options> </Options>
<Project name = "${ProjectName}" directory = "."> <Project name = "${ProjectName}" directory = ".">
<Options /> <Options OutputType = "Exe" />
<ProjectItems> <ProjectItems>
<Reference Include="System" /> <Reference Include="System" />

4
src/AddIns/Misc/SharpReport/SharpReportCore/SharpReportCore.csproj

@ -36,8 +36,8 @@
<Reference Include="System.Xml" /> <Reference Include="System.Xml" />
<Reference Include="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" /> <Reference Include="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<Reference Include="System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> <Reference Include="System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<Reference Include="System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> <Reference Include="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<Reference Include="System.ServiceProcess, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" /> <Reference Include="System.ServiceProcess, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Compile Include="BaseItems\BaseTextItem.cs" /> <Compile Include="BaseItems\BaseTextItem.cs" />

7
src/Libraries/ICSharpCode.TextEditor/Project/Configuration/AssemblyInfo.cs

@ -5,9 +5,13 @@
// <version>$Revision$</version> // <version>$Revision$</version>
// </file> // </file>
using System;
using System.Reflection; using System.Reflection;
using System.Runtime.CompilerServices; using System.Runtime.CompilerServices;
[assembly: CLSCompliant(false)]
[assembly: StringFreezing()]
[assembly: AssemblyTitle("ICSharpCode.TextEditor")] [assembly: AssemblyTitle("ICSharpCode.TextEditor")]
[assembly: AssemblyDescription("A .NET text editor control")] [assembly: AssemblyDescription("A .NET text editor control")]
[assembly: AssemblyConfiguration("")] [assembly: AssemblyConfiguration("")]
@ -19,6 +23,3 @@ using System.Runtime.CompilerServices;
[assembly: AssemblyVersion("2.0.0.1")] [assembly: AssemblyVersion("2.0.0.1")]
[assembly: AssemblyDelaySign(false)]
//[assembly: AssemblyKeyFile("ICSharpCode.TextEditor.key")]
//[assembly: AssemblyKeyName("")]

9
src/Libraries/ICSharpCode.TextEditor/Project/ICSharpCode.TextEditor.csproj

@ -15,14 +15,21 @@
<SignAssembly>true</SignAssembly> <SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>Resources\ICSharpCode.TextEditor.snk</AssemblyOriginatorKeyFile> <AssemblyOriginatorKeyFile>Resources\ICSharpCode.TextEditor.snk</AssemblyOriginatorKeyFile>
<RootNamespace>ICSharpCode.TextEditor</RootNamespace> <RootNamespace>ICSharpCode.TextEditor</RootNamespace>
<DebugType>None</DebugType>
<RegisterForComInterop>False</RegisterForComInterop>
<GenerateSerializationAssemblies>Auto</GenerateSerializationAssemblies>
<BaseAddress>134217728</BaseAddress>
<PlatformTarget>AnyCPU</PlatformTarget>
<FileAlignment>4096</FileAlignment>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>True</DebugSymbols> <DebugSymbols>false</DebugSymbols>
<Optimize>False</Optimize> <Optimize>False</Optimize>
<AllowUnsafeBlocks>False</AllowUnsafeBlocks> <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
<CheckForOverflowUnderflow>True</CheckForOverflowUnderflow> <CheckForOverflowUnderflow>True</CheckForOverflowUnderflow>
<OutputPath>..\..\..\..\bin\</OutputPath> <OutputPath>..\..\..\..\bin\</OutputPath>
<DefineConstants>DEBUG</DefineConstants> <DefineConstants>DEBUG</DefineConstants>
<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugSymbols>False</DebugSymbols> <DebugSymbols>False</DebugSymbols>

9
src/Libraries/NRefactory/Project/Configuration/AssemblyInfo.cs

@ -5,9 +5,13 @@
// <version>$Revision$</version> // <version>$Revision$</version>
// </file> // </file>
using System;
using System.Reflection; using System.Reflection;
using System.Runtime.CompilerServices; using System.Runtime.CompilerServices;
[assembly: CLSCompliant(false)]
[assembly: StringFreezing()]
// Information about this assembly is defined by the following // Information about this assembly is defined by the following
// attributes. // attributes.
// //
@ -32,8 +36,3 @@ using System.Runtime.CompilerServices;
[assembly: AssemblyVersion("2.0.0.1")] [assembly: AssemblyVersion("2.0.0.1")]
// The following attributes specify the key for the sign of your assembly. See the
// .NET Framework documentation for more information about signing.
// This is not required, if you don't want signing let these attributes like they're.
[assembly: AssemblyDelaySign(false)]
//[assembly: AssemblyKeyFile("ICSharpCode.NRefactory.key")]

2
src/Libraries/NRefactory/Project/NRefactory.csproj

@ -18,7 +18,7 @@
<AllowUnsafeBlocks>False</AllowUnsafeBlocks> <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
<RegisterForComInterop>False</RegisterForComInterop> <RegisterForComInterop>False</RegisterForComInterop>
<GenerateSerializationAssemblies>Auto</GenerateSerializationAssemblies> <GenerateSerializationAssemblies>Auto</GenerateSerializationAssemblies>
<BaseAddress>4194304</BaseAddress> <BaseAddress>100663296</BaseAddress>
<PlatformTarget>AnyCPU</PlatformTarget> <PlatformTarget>AnyCPU</PlatformTarget>
<FileAlignment>4096</FileAlignment> <FileAlignment>4096</FileAlignment>
</PropertyGroup> </PropertyGroup>

4
src/Main/Base/Project/Configuration/AssemblyInfo.cs

@ -10,6 +10,9 @@ using System;
using System.Reflection; using System.Reflection;
using System.Runtime.CompilerServices; using System.Runtime.CompilerServices;
[assembly: CLSCompliant(false)]
[assembly: StringFreezing()]
[assembly: AssemblyTitle("SharpDevelopBase")] [assembly: AssemblyTitle("SharpDevelopBase")]
[assembly: AssemblyDescription("The base add-in of SharpDevelop")] [assembly: AssemblyDescription("The base add-in of SharpDevelop")]
[assembly: AssemblyConfiguration("")] [assembly: AssemblyConfiguration("")]
@ -21,4 +24,3 @@ using System.Runtime.CompilerServices;
[assembly: AssemblyVersion("2.0.0.1")] [assembly: AssemblyVersion("2.0.0.1")]
[assembly: AssemblyDelaySign(false)]

2
src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj

@ -16,7 +16,7 @@
<AllowUnsafeBlocks>False</AllowUnsafeBlocks> <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
<RegisterForComInterop>False</RegisterForComInterop> <RegisterForComInterop>False</RegisterForComInterop>
<GenerateSerializationAssemblies>Auto</GenerateSerializationAssemblies> <GenerateSerializationAssemblies>Auto</GenerateSerializationAssemblies>
<BaseAddress>4194304</BaseAddress> <BaseAddress>33554432</BaseAddress>
<PlatformTarget>AnyCPU</PlatformTarget> <PlatformTarget>AnyCPU</PlatformTarget>
<FileAlignment>4096</FileAlignment> <FileAlignment>4096</FileAlignment>
<TreatWarningsAsErrors>false</TreatWarningsAsErrors> <TreatWarningsAsErrors>false</TreatWarningsAsErrors>

4
src/Main/Base/Project/Src/Gui/Dialogs/ProjectOptionsView.cs

@ -41,7 +41,9 @@ namespace ICSharpCode.SharpDevelop.Project.Dialogs
return project.FileName; return project.FileName;
} }
set { set {
throw new NotSupportedException(); // possible when project is renamed by the user, project.FileName will be changed by the
// renaming code
OnTitleNameChanged(EventArgs.Empty);
} }
} }

4
src/Main/Core/Project/Configuration/AssemblyInfo.cs

@ -9,7 +9,8 @@ using System;
using System.Reflection; using System.Reflection;
using System.Runtime.CompilerServices; using System.Runtime.CompilerServices;
[assembly:CLSCompliant(false)] [assembly: CLSCompliant(true)]
[assembly: StringFreezing()]
[assembly: AssemblyTitle("ICSharpCode.Core")] [assembly: AssemblyTitle("ICSharpCode.Core")]
[assembly: AssemblyDescription("The ICSharpCode Core containing the AddInTree and service Subsystem")] [assembly: AssemblyDescription("The ICSharpCode Core containing the AddInTree and service Subsystem")]
@ -22,4 +23,3 @@ using System.Runtime.CompilerServices;
[assembly: AssemblyVersion("2.0.0.1")] [assembly: AssemblyVersion("2.0.0.1")]
[assembly: AssemblyDelaySign(false)]

3
src/Main/Core/Project/ICSharpCode.Core.csproj

@ -13,9 +13,10 @@
<OutputType>Library</OutputType> <OutputType>Library</OutputType>
<SignAssembly>true</SignAssembly> <SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>Resources\ICSharpCode.Core.snk</AssemblyOriginatorKeyFile> <AssemblyOriginatorKeyFile>Resources\ICSharpCode.Core.snk</AssemblyOriginatorKeyFile>
<BaseAddress>83886080</BaseAddress>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>True</DebugSymbols> <DebugSymbols>true</DebugSymbols>
<Optimize>False</Optimize> <Optimize>False</Optimize>
<DebugType>Full</DebugType> <DebugType>Full</DebugType>
<DocumentationFile>..\..\..\..\bin\ICSharpCode.Core.xml</DocumentationFile> <DocumentationFile>..\..\..\..\bin\ICSharpCode.Core.xml</DocumentationFile>

1
src/Main/StartUp/Project/Configuration/AssemblyInfo.template

@ -10,6 +10,7 @@ using System.Reflection;
using System.Runtime.CompilerServices; using System.Runtime.CompilerServices;
[assembly: CLSCompliant(true)] [assembly: CLSCompliant(true)]
[assembly: StringFreezing()]
// DO NOT EDIT AssemblyInfo.cs, it is recreated using AssemblyInfo.template whenever // DO NOT EDIT AssemblyInfo.cs, it is recreated using AssemblyInfo.template whenever
// StartUp is compiled. // StartUp is compiled.

Loading…
Cancel
Save