[prev in list] [next in list] [prev in thread] [next in thread]
List: mapguide-commits
Subject: [mapguide-commits] r6514 - in trunk/Tools/Maestro: ExtendedModels/LayerDefinition-2.4.0
From: svn_mapguide () osgeo ! org
Date: 2012-02-15 15:06:46
Message-ID: 20120215150646.8D37439015B () trac ! osgeo ! org
[Download RAW message or body]
Author: jng
Date: 2012-02-15 07:06:46 -0800 (Wed, 15 Feb 2012)
New Revision: 6514
Modified:
trunk/Tools/Maestro/ExtendedModels/LayerDefinition-2.4.0/OSGeo.MapGuide.ObjectModels.LayerDefinition-2.4.0.csproj
trunk/Tools/Maestro/ExtendedModels/MapDefinition-2.4.0/OSGeo.MapGuide.ObjectModels.MapDefinition-2.4.0.csproj
trunk/Tools/Maestro/ExtendedModels/WatermarkDefinition-2.4.0/OSGeo.MapGuide.ObjectModels.WatermarkDefinition-2.4.0.csproj
trunk/Tools/Maestro/Maestro.AddIn.Local/Maestro.AddIn.Local.csproj
trunk/Tools/Maestro/OSGeo.MapGuide.ExtendedObjectModels/OSGeo.MapGuide.ExtendedObjectModels.csproj
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ConnectionProviderRegistry.cs
trunk/Tools/Maestro/Properties/GlobalAssemblyInfo.cs
Log:
This submission includes the following changes:
- Bump major version number
- Fix unexplained project breakage
Modified: trunk/Tools/Maestro/ExtendedModels/LayerDefinition-2.4.0/OSGeo.MapGuide.ObjectModels.LayerDefinition-2.4.0.csproj
===================================================================
--- trunk/Tools/Maestro/ExtendedModels/LayerDefinition-2.4.0/OSGeo.MapGuide.ObjectModels.LayerDefinition-2.4.0.csproj 2012-02-15 \
12:52:47 UTC (rev 6513)
+++ trunk/Tools/Maestro/ExtendedModels/LayerDefinition-2.4.0/OSGeo.MapGuide.ObjectModels.LayerDefinition-2.4.0.csproj 2012-02-15 \
15:06:46 UTC (rev 6514) @@ -55,8 +55,6 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
- <Reference Include="OSGeo.MapGuide.ObjectModels.SymbolDefinition-2.4.0, \
Version=4.0.0.6359, Culture=neutral, PublicKeyToken=f526c48929fda856, \
processorArchitecture=MSIL" />
- <Reference Include="OSGeo.MapGuide.ObjectModels.WatermarkDefinition-2.4.0, \
Version=4.0.0.6359, Culture=neutral, PublicKeyToken=f526c48929fda856, \
processorArchitecture=MSIL" /> <Reference Include="System" />
<Reference Include="System.Data" />
<Reference Include="System.Drawing" />
@@ -94,6 +92,14 @@
<Project>{80FA3158-8B5F-48D1-A393-0378AFE48A7E}</Project>
<Name>OSGeo.MapGuide.MaestroAPI</Name>
</ProjectReference>
+ <ProjectReference \
Include="..\SymbolDefinition-2.4.0\OSGeo.MapGuide.ObjectModels.SymbolDefinition-2.4.0.csproj">
+ <Project>{222CB020-5336-47D7-9BB9-A22D18953C80}</Project>
+ <Name>OSGeo.MapGuide.ObjectModels.SymbolDefinition-2.4.0</Name>
+ </ProjectReference>
+ <ProjectReference \
Include="..\WatermarkDefinition-2.4.0\OSGeo.MapGuide.ObjectModels.WatermarkDefinition-2.4.0.csproj">
+ <Project>{E367FE8E-E46F-4DA0-86CE-E6F37E78DEE0}</Project>
+ <Name>OSGeo.MapGuide.ObjectModels.WatermarkDefinition-2.4.0</Name>
+ </ProjectReference>
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Properties\Resources.resx">
Modified: trunk/Tools/Maestro/ExtendedModels/MapDefinition-2.4.0/OSGeo.MapGuide.ObjectModels.MapDefinition-2.4.0.csproj
===================================================================
--- trunk/Tools/Maestro/ExtendedModels/MapDefinition-2.4.0/OSGeo.MapGuide.ObjectModels.MapDefinition-2.4.0.csproj 2012-02-15 \
12:52:47 UTC (rev 6513)
+++ trunk/Tools/Maestro/ExtendedModels/MapDefinition-2.4.0/OSGeo.MapGuide.ObjectModels.MapDefinition-2.4.0.csproj 2012-02-15 \
15:06:46 UTC (rev 6514) @@ -55,7 +55,6 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
- <Reference Include="OSGeo.MapGuide.ObjectModels.WatermarkDefinition-2.4.0, \
Version=4.0.0.6359, Culture=neutral, PublicKeyToken=f526c48929fda856, \
processorArchitecture=MSIL" /> <Reference Include="System" />
<Reference Include="System.Data" />
<Reference Include="System.Drawing" />
@@ -87,6 +86,10 @@
<Project>{80FA3158-8B5F-48D1-A393-0378AFE48A7E}</Project>
<Name>OSGeo.MapGuide.MaestroAPI</Name>
</ProjectReference>
+ <ProjectReference \
Include="..\WatermarkDefinition-2.4.0\OSGeo.MapGuide.ObjectModels.WatermarkDefinition-2.4.0.csproj">
+ <Project>{E367FE8E-E46F-4DA0-86CE-E6F37E78DEE0}</Project>
+ <Name>OSGeo.MapGuide.ObjectModels.WatermarkDefinition-2.4.0</Name>
+ </ProjectReference>
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Properties\Resources.resx">
Modified: trunk/Tools/Maestro/ExtendedModels/WatermarkDefinition-2.4.0/OSGeo.MapGuide.ObjectModels.WatermarkDefinition-2.4.0.csproj
===================================================================
--- trunk/Tools/Maestro/ExtendedModels/WatermarkDefinition-2.4.0/OSGeo.MapGuide.ObjectModels.WatermarkDefinition-2.4.0.csproj 2012-02-15 \
12:52:47 UTC (rev 6513)
+++ trunk/Tools/Maestro/ExtendedModels/WatermarkDefinition-2.4.0/OSGeo.MapGuide.ObjectModels.WatermarkDefinition-2.4.0.csproj 2012-02-15 \
15:06:46 UTC (rev 6514) @@ -55,7 +55,6 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
- <Reference Include="OSGeo.MapGuide.ObjectModels.SymbolDefinition-2.4.0, \
Version=4.0.0.6359, Culture=neutral, PublicKeyToken=f526c48929fda856, \
processorArchitecture=MSIL" /> <Reference Include="System" />
<Reference Include="System.Data" />
<Reference Include="System.Drawing" />
@@ -86,6 +85,10 @@
<Project>{80FA3158-8B5F-48D1-A393-0378AFE48A7E}</Project>
<Name>OSGeo.MapGuide.MaestroAPI</Name>
</ProjectReference>
+ <ProjectReference \
Include="..\SymbolDefinition-2.4.0\OSGeo.MapGuide.ObjectModels.SymbolDefinition-2.4.0.csproj">
+ <Project>{222CB020-5336-47D7-9BB9-A22D18953C80}</Project>
+ <Name>OSGeo.MapGuide.ObjectModels.SymbolDefinition-2.4.0</Name>
+ </ProjectReference>
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Properties\Resources.resx">
Modified: trunk/Tools/Maestro/Maestro.AddIn.Local/Maestro.AddIn.Local.csproj
===================================================================
--- trunk/Tools/Maestro/Maestro.AddIn.Local/Maestro.AddIn.Local.csproj 2012-02-15 \
12:52:47 UTC (rev 6513)
+++ trunk/Tools/Maestro/Maestro.AddIn.Local/Maestro.AddIn.Local.csproj 2012-02-15 \
15:06:46 UTC (rev 6514) @@ -140,7 +140,7 @@
<ProjectReference \
Include="..\OSGeo.MapGuide.MaestroAPI.Local\OSGeo.MapGuide.MaestroAPI.Local.csproj"> \
<Project>{3DDF6501-0148-474C-8674-7C7DA49C7F02}</Project> \
<Name>OSGeo.MapGuide.MaestroAPI.Local</Name>
- <Private>False</Private>
+ <Private>True</Private>
</ProjectReference>
<ProjectReference \
Include="..\OSGeo.MapGuide.MaestroAPI\OSGeo.MapGuide.MaestroAPI.csproj"> \
<Project>{80FA3158-8B5F-48D1-A393-0378AFE48A7E}</Project>
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ExtendedObjectModels/OSGeo.MapGuide.ExtendedObjectModels.csproj
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ExtendedObjectModels/OSGeo.MapGuide.ExtendedObjectModels.csproj 2012-02-15 \
12:52:47 UTC (rev 6513)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ExtendedObjectModels/OSGeo.MapGuide.ExtendedObjectModels.csproj 2012-02-15 \
15:06:46 UTC (rev 6514) @@ -53,11 +53,6 @@
<DocumentationFile>..\SDK\bin\OSGeo.MapGuide.ExtendedObjectModels.XML</DocumentationFile>
</PropertyGroup>
<ItemGroup>
- <Reference Include="OSGeo.MapGuide.ObjectModels.LayerDefinition-2.4.0, \
Version=4.0.0.6359, Culture=neutral, PublicKeyToken=f526c48929fda856, \
processorArchitecture=MSIL" />
- <Reference Include="OSGeo.MapGuide.ObjectModels.MapDefinition-2.4.0, \
Version=4.0.0.6359, Culture=neutral, PublicKeyToken=f526c48929fda856, \
processorArchitecture=MSIL" />
- <Reference Include="OSGeo.MapGuide.ObjectModels.SymbolDefinition-2.4.0, \
Version=4.0.0.6359, Culture=neutral, PublicKeyToken=f526c48929fda856, \
processorArchitecture=MSIL" />
- <Reference Include="OSGeo.MapGuide.ObjectModels.WatermarkDefinition-2.4.0, \
Version=4.0.0.6359, Culture=neutral, PublicKeyToken=f526c48929fda856, \
processorArchitecture=MSIL" />
- <Reference Include="OSGeo.MapGuide.ObjectModels.WebLayout-2.4.0, \
Version=4.0.0.6359, Culture=neutral, PublicKeyToken=f526c48929fda856, \
processorArchitecture=MSIL" /> <Reference Include="System" />
<Reference Include="System.Data" />
<Reference Include="System.Xml" />
@@ -89,6 +84,10 @@
<Project>{F976A709-D9DB-407E-A4CD-2CEA31C6B1D9}</Project>
<Name>OSGeo.MapGuide.ObjectModels.LayerDefinition-2.3.0</Name>
</ProjectReference>
+ <ProjectReference \
Include="..\ExtendedModels\LayerDefinition-2.4.0\OSGeo.MapGuide.ObjectModels.LayerDefinition-2.4.0.csproj">
+ <Project>{16E6B250-C805-4C31-9A7D-F56A0051EC93}</Project>
+ <Name>OSGeo.MapGuide.ObjectModels.LayerDefinition-2.4.0</Name>
+ </ProjectReference>
<ProjectReference \
Include="..\ExtendedModels\LoadProcedure-1.1.0\OSGeo.MapGuide.ObjectModels.LoadProcedure-1.1.0.csproj">
<Project>{B2A1F69E-52AA-42A2-8DED-89ADB9B14A38}</Project>
<Name>OSGeo.MapGuide.ObjectModels.LoadProcedure-1.1.0</Name>
@@ -101,18 +100,34 @@
<Project>{C8DB3E77-3AF4-471D-A214-69DBEB32750E}</Project>
<Name>OSGeo.MapGuide.ObjectModels.MapDefinition-2.3.0</Name>
</ProjectReference>
+ <ProjectReference \
Include="..\ExtendedModels\MapDefinition-2.4.0\OSGeo.MapGuide.ObjectModels.MapDefinition-2.4.0.csproj">
+ <Project>{C0CA5D05-72C0-4F22-8618-B31BF0FFA190}</Project>
+ <Name>OSGeo.MapGuide.ObjectModels.MapDefinition-2.4.0</Name>
+ </ProjectReference>
<ProjectReference \
Include="..\ExtendedModels\SymbolDefinition-1.1.0\OSGeo.MapGuide.ObjectModels.SymbolDefinition-1.1.0.csproj">
<Project>{BF6E996E-27AF-44CD-B3CF-A40874E15B2E}</Project>
<Name>OSGeo.MapGuide.ObjectModels.SymbolDefinition-1.1.0</Name>
</ProjectReference>
+ <ProjectReference \
Include="..\ExtendedModels\SymbolDefinition-2.4.0\OSGeo.MapGuide.ObjectModels.SymbolDefinition-2.4.0.csproj">
+ <Project>{222CB020-5336-47D7-9BB9-A22D18953C80}</Project>
+ <Name>OSGeo.MapGuide.ObjectModels.SymbolDefinition-2.4.0</Name>
+ </ProjectReference>
<ProjectReference \
Include="..\ExtendedModels\WatermarkDefinition-2.3.0\OSGeo.MapGuide.ObjectModels.WatermarkDefinition-2.3.0.csproj">
<Project>{F84E21EE-360C-46EC-BD01-E66F8D9F5B3E}</Project>
<Name>OSGeo.MapGuide.ObjectModels.WatermarkDefinition-2.3.0</Name>
</ProjectReference>
+ <ProjectReference \
Include="..\ExtendedModels\WatermarkDefinition-2.4.0\OSGeo.MapGuide.ObjectModels.WatermarkDefinition-2.4.0.csproj">
+ <Project>{E367FE8E-E46F-4DA0-86CE-E6F37E78DEE0}</Project>
+ <Name>OSGeo.MapGuide.ObjectModels.WatermarkDefinition-2.4.0</Name>
+ </ProjectReference>
<ProjectReference \
Include="..\ExtendedModels\WebLayout-1.1.0\OSGeo.MapGuide.ObjectModels.WebLayout-1.1.0.csproj">
<Project>{0A93ACA8-5B21-44E6-B0B7-5D1E72D3A6A2}</Project>
<Name>OSGeo.MapGuide.ObjectModels.WebLayout-1.1.0</Name>
</ProjectReference>
+ <ProjectReference \
Include="..\ExtendedModels\WebLayout-2.4.0\OSGeo.MapGuide.ObjectModels.WebLayout-2.4.0.csproj">
+ <Project>{BEC17FD3-2ADB-4154-934D-494313C588EE}</Project>
+ <Name>OSGeo.MapGuide.ObjectModels.WebLayout-2.4.0</Name>
+ </ProjectReference>
<ProjectReference \
Include="..\OSGeo.MapGuide.MaestroAPI\OSGeo.MapGuide.MaestroAPI.csproj"> \
<Project>{80FA3158-8B5F-48D1-A393-0378AFE48A7E}</Project> \
<Name>OSGeo.MapGuide.MaestroAPI</Name>
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ConnectionProviderRegistry.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ConnectionProviderRegistry.cs 2012-02-15 \
12:52:47 UTC (rev 6513)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ConnectionProviderRegistry.cs 2012-02-15 \
15:06:46 UTC (rev 6514) @@ -170,8 +170,6 @@
});
_providers.Add(new ConnectionProviderEntry(name, desc, \
attr[0].IsMultiPlatform)); }
-
-
}
catch
{
Modified: trunk/Tools/Maestro/Properties/GlobalAssemblyInfo.cs
===================================================================
--- trunk/Tools/Maestro/Properties/GlobalAssemblyInfo.cs 2012-02-15 12:52:47 UTC (rev \
6513)
+++ trunk/Tools/Maestro/Properties/GlobalAssemblyInfo.cs 2012-02-15 15:06:46 UTC (rev \
6514) @@ -35,5 +35,5 @@
// 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("4.0.0.6359")]
-[assembly: AssemblyFileVersion("4.0.0.6359")]
+[assembly: AssemblyVersion("5.0.0.6514")]
+[assembly: AssemblyFileVersion("5.0.0.6514")]
_______________________________________________
mapguide-commits mailing list
mapguide-commits@lists.osgeo.org
http://lists.osgeo.org/mailman/listinfo/mapguide-commits
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic