corrade-vassal – Diff between revs 20 and 22

Subversion Repositories:
Rev:
Only display areas with differences – Ignore whitespace
Rev 20 Rev 22
1 <?xml version="1.0" encoding="utf-8"?> 1 <?xml version="1.0" encoding="utf-8"?>
2 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> 2 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3 <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" /> 3 <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
4 <PropertyGroup> 4 <PropertyGroup>
5 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> 5 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
6 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> 6 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
7 <ProjectGuid>{4419E938-ECD5-482F-AC8B-A3D20A5E6136}</ProjectGuid> 7 <ProjectGuid>{4419E938-ECD5-482F-AC8B-A3D20A5E6136}</ProjectGuid>
8 <OutputType>WinExe</OutputType> 8 <OutputType>WinExe</OutputType>
9 <AppDesignerFolder>Properties</AppDesignerFolder> 9 <AppDesignerFolder>Properties</AppDesignerFolder>
10 <RootNamespace>Vassal</RootNamespace> 10 <RootNamespace>Vassal</RootNamespace>
11 <AssemblyName>Vassal</AssemblyName> 11 <AssemblyName>Vassal</AssemblyName>
12 <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion> 12 <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
13 <FileAlignment>512</FileAlignment> 13 <FileAlignment>512</FileAlignment>
14 <PublishUrl>publish\</PublishUrl> 14 <PublishUrl>publish\</PublishUrl>
15 <Install>true</Install> 15 <Install>true</Install>
16 <InstallFrom>Disk</InstallFrom> 16 <InstallFrom>Disk</InstallFrom>
17 <UpdateEnabled>false</UpdateEnabled> 17 <UpdateEnabled>false</UpdateEnabled>
18 <UpdateMode>Foreground</UpdateMode> 18 <UpdateMode>Foreground</UpdateMode>
19 <UpdateInterval>7</UpdateInterval> 19 <UpdateInterval>7</UpdateInterval>
20 <UpdateIntervalUnits>Days</UpdateIntervalUnits> 20 <UpdateIntervalUnits>Days</UpdateIntervalUnits>
21 <UpdatePeriodically>false</UpdatePeriodically> 21 <UpdatePeriodically>false</UpdatePeriodically>
22 <UpdateRequired>false</UpdateRequired> 22 <UpdateRequired>false</UpdateRequired>
23 <MapFileExtensions>true</MapFileExtensions> 23 <MapFileExtensions>true</MapFileExtensions>
24 <ApplicationRevision>0</ApplicationRevision> 24 <ApplicationRevision>0</ApplicationRevision>
25 <ApplicationVersion>1.0.0.%2a</ApplicationVersion> 25 <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
26 <IsWebBootstrapper>false</IsWebBootstrapper> 26 <IsWebBootstrapper>false</IsWebBootstrapper>
27 <UseApplicationTrust>false</UseApplicationTrust> 27 <UseApplicationTrust>false</UseApplicationTrust>
28 <BootstrapperEnabled>true</BootstrapperEnabled> 28 <BootstrapperEnabled>true</BootstrapperEnabled>
29 <TargetFrameworkProfile /> 29 <TargetFrameworkProfile />
30 </PropertyGroup> 30 </PropertyGroup>
31 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> 31 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
32 <PlatformTarget>AnyCPU</PlatformTarget> 32 <PlatformTarget>AnyCPU</PlatformTarget>
33 <DebugSymbols>true</DebugSymbols> 33 <DebugSymbols>true</DebugSymbols>
34 <DebugType>full</DebugType> 34 <DebugType>full</DebugType>
35 <Optimize>false</Optimize> 35 <Optimize>false</Optimize>
36 <OutputPath>bin\Debug\</OutputPath> 36 <OutputPath>bin\Debug\</OutputPath>
37 <DefineConstants>DEBUG;TRACE</DefineConstants> 37 <DefineConstants>DEBUG;TRACE</DefineConstants>
38 <ErrorReport>prompt</ErrorReport> 38 <ErrorReport>prompt</ErrorReport>
39 <WarningLevel>4</WarningLevel> 39 <WarningLevel>4</WarningLevel>
40 </PropertyGroup> 40 </PropertyGroup>
41 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> 41 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
42 <PlatformTarget>AnyCPU</PlatformTarget> 42 <PlatformTarget>AnyCPU</PlatformTarget>
43 <DebugType>pdbonly</DebugType> 43 <DebugType>pdbonly</DebugType>
44 <Optimize>true</Optimize> 44 <Optimize>true</Optimize>
45 <OutputPath>bin\Release\</OutputPath> 45 <OutputPath>bin\Release\</OutputPath>
46 <DefineConstants>TRACE</DefineConstants> 46 <DefineConstants>TRACE</DefineConstants>
47 <ErrorReport>prompt</ErrorReport> 47 <ErrorReport>prompt</ErrorReport>
48 <WarningLevel>4</WarningLevel> 48 <WarningLevel>4</WarningLevel>
49 </PropertyGroup> 49 </PropertyGroup>
50 <PropertyGroup> 50 <PropertyGroup>
51 <ApplicationIcon>Vassal.ico</ApplicationIcon> 51 <ApplicationIcon>Vassal.ico</ApplicationIcon>
52 </PropertyGroup> 52 </PropertyGroup>
53 <PropertyGroup /> 53 <PropertyGroup />
54 <PropertyGroup> 54 <PropertyGroup>
55 <StartupObject>Vassal.Program</StartupObject> 55 <StartupObject>Vassal.Program</StartupObject>
56 </PropertyGroup> 56 </PropertyGroup>
57 <PropertyGroup /> 57 <PropertyGroup />
58 <ItemGroup> 58 <ItemGroup>
59 <Reference Include="AquaGauge, Version=1.0.5767.1836, Culture=neutral, processorArchitecture=MSIL"> 59 <Reference Include="AquaGauge, Version=1.0.5767.1836, Culture=neutral, processorArchitecture=MSIL">
60 <SpecificVersion>False</SpecificVersion> 60 <SpecificVersion>False</SpecificVersion>
61 <HintPath>..\..\AquaGauge\bin\Release\AquaGauge.dll</HintPath> 61 <HintPath>..\..\AquaGauge\bin\Release\AquaGauge.dll</HintPath>
62 </Reference> 62 </Reference>
63 <Reference Include="OpenMetaverse"> 63 <Reference Include="OpenMetaverse">
64 <HintPath>..\..\libopenmetaverse\bin\OpenMetaverse.dll</HintPath> 64 <HintPath>..\..\libopenmetaverse\bin\OpenMetaverse.dll</HintPath>
65 </Reference> 65 </Reference>
66 <Reference Include="OpenMetaverseTypes"> 66 <Reference Include="OpenMetaverseTypes">
67 <HintPath>..\..\libopenmetaverse\bin\OpenMetaverseTypes.dll</HintPath> 67 <HintPath>..\..\libopenmetaverse\bin\OpenMetaverseTypes.dll</HintPath>
68 </Reference> 68 </Reference>
69 <Reference Include="System" /> 69 <Reference Include="System" />
70 <Reference Include="System.Core" /> 70 <Reference Include="System.Core" />
71 <Reference Include="System.Web" /> 71 <Reference Include="System.Web" />
72 <Reference Include="System.Xml.Linq" /> 72 <Reference Include="System.Xml.Linq" />
73 <Reference Include="System.Data.DataSetExtensions" /> 73 <Reference Include="System.Data.DataSetExtensions" />
74 <Reference Include="Microsoft.CSharp" /> 74 <Reference Include="Microsoft.CSharp" />
75 <Reference Include="System.Data" /> 75 <Reference Include="System.Data" />
76 <Reference Include="System.Deployment" /> 76 <Reference Include="System.Deployment" />
77 <Reference Include="System.Drawing" /> 77 <Reference Include="System.Drawing" />
78 <Reference Include="System.Net.Http" /> 78 <Reference Include="System.Net.Http" />
79 <Reference Include="System.Windows.Forms" /> 79 <Reference Include="System.Windows.Forms" />
80 <Reference Include="System.Xml" /> 80 <Reference Include="System.Xml" />
81 </ItemGroup> 81 </ItemGroup>
82 <ItemGroup> 82 <ItemGroup>
83 <Compile Include="RegionEditForm.cs"> 83 <Compile Include="RegionEditForm.cs">
84 <SubType>Form</SubType> 84 <SubType>Form</SubType>
85 </Compile> 85 </Compile>
86 <Compile Include="RegionEditForm.Designer.cs"> 86 <Compile Include="RegionEditForm.Designer.cs">
87 <DependentUpon>RegionEditForm.cs</DependentUpon> 87 <DependentUpon>RegionEditForm.cs</DependentUpon>
88 </Compile> 88 </Compile>
89 <Compile Include="SettingsForm.cs"> 89 <Compile Include="SettingsForm.cs">
90 <SubType>Form</SubType> 90 <SubType>Form</SubType>
91 </Compile> 91 </Compile>
92 <Compile Include="SettingsForm.Designer.cs"> 92 <Compile Include="SettingsForm.Designer.cs">
93 <DependentUpon>SettingsForm.cs</DependentUpon> 93 <DependentUpon>SettingsForm.cs</DependentUpon>
94 </Compile> 94 </Compile>
95 <Compile Include="VassalConfiguration.cs" /> 95 <Compile Include="VassalConfiguration.cs" />
96 <Compile Include="VassalForm.cs"> 96 <Compile Include="VassalForm.cs">
97 <SubType>Form</SubType> 97 <SubType>Form</SubType>
98 </Compile> 98 </Compile>
99 <Compile Include="VassalForm.Designer.cs"> 99 <Compile Include="VassalForm.Designer.cs">
100 <DependentUpon>VassalForm.cs</DependentUpon> 100 <DependentUpon>VassalForm.cs</DependentUpon>
101 </Compile> 101 </Compile>
102 <Compile Include="Vassal.cs" /> 102 <Compile Include="Vassal.cs" />
103 <Compile Include="Properties\AssemblyInfo.cs" /> 103 <Compile Include="Properties\AssemblyInfo.cs" />
104 <EmbeddedResource Include="RegionEditForm.resx"> 104 <EmbeddedResource Include="RegionEditForm.resx">
105 <DependentUpon>RegionEditForm.cs</DependentUpon> 105 <DependentUpon>RegionEditForm.cs</DependentUpon>
106 </EmbeddedResource> 106 </EmbeddedResource>
107 <EmbeddedResource Include="SettingsForm.resx"> 107 <EmbeddedResource Include="SettingsForm.resx">
108 <DependentUpon>SettingsForm.cs</DependentUpon> 108 <DependentUpon>SettingsForm.cs</DependentUpon>
109 </EmbeddedResource> 109 </EmbeddedResource>
110 <EmbeddedResource Include="VassalForm.resx"> 110 <EmbeddedResource Include="VassalForm.resx">
111 <DependentUpon>VassalForm.cs</DependentUpon> 111 <DependentUpon>VassalForm.cs</DependentUpon>
112 </EmbeddedResource> 112 </EmbeddedResource>
113 <EmbeddedResource Include="Properties\Resources.resx"> 113 <EmbeddedResource Include="Properties\Resources.resx">
114 <Generator>ResXFileCodeGenerator</Generator> 114 <Generator>ResXFileCodeGenerator</Generator>
115 <LastGenOutput>Resources.Designer.cs</LastGenOutput> 115 <LastGenOutput>Resources.Designer.cs</LastGenOutput>
116 <SubType>Designer</SubType> 116 <SubType>Designer</SubType>
117 </EmbeddedResource> 117 </EmbeddedResource>
118 <Compile Include="Properties\Resources.Designer.cs"> 118 <Compile Include="Properties\Resources.Designer.cs">
119 <AutoGen>True</AutoGen> 119 <AutoGen>True</AutoGen>
120 <DependentUpon>Resources.resx</DependentUpon> 120 <DependentUpon>Resources.resx</DependentUpon>
121 <DesignTime>True</DesignTime> 121 <DesignTime>True</DesignTime>
122 </Compile> 122 </Compile>
123 <None Include="..\..\libopenmetaverse-overrides\libopenjpeg-dotnet-2-1.5.0-dotnet-1-arm.so"> 123 <None Include="..\..\libopenmetaverse-overrides\libopenjpeg-dotnet-2-1.5.0-dotnet-1-arm.so">
124 <Link>libopenjpeg-dotnet-2-1.5.0-dotnet-1-arm.so</Link> 124 <Link>libs\libopenjpeg-dotnet-2-1.5.0-dotnet-1-arm.so</Link>
125 <CopyToOutputDirectory>Always</CopyToOutputDirectory> 125 <CopyToOutputDirectory>Always</CopyToOutputDirectory>
126 </None> 126 </None>
127 <None Include="..\..\libopenmetaverse-overrides\libopenjpeg-dotnet-2-1.5.0-dotnet-1-freebsd.so"> 127 <None Include="..\..\libopenmetaverse-overrides\libopenjpeg-dotnet-2-1.5.0-dotnet-1-freebsd.so">
128 <Link>libopenjpeg-dotnet-2-1.5.0-dotnet-1-freebsd.so</Link> 128 <Link>libs\libopenjpeg-dotnet-2-1.5.0-dotnet-1-freebsd.so</Link>
129 <CopyToOutputDirectory>Always</CopyToOutputDirectory> 129 <CopyToOutputDirectory>Always</CopyToOutputDirectory>
130 </None> 130 </None>
131 <None Include="..\..\libopenmetaverse-overrides\libopenjpeg-dotnet-2-1.5.0-dotnet-1-x86_64-freebsd.so"> 131 <None Include="..\..\libopenmetaverse-overrides\libopenjpeg-dotnet-2-1.5.0-dotnet-1-x86_64-freebsd.so">
132 <Link>libopenjpeg-dotnet-2-1.5.0-dotnet-1-x86_64-freebsd.so</Link> 132 <Link>libs\libopenjpeg-dotnet-2-1.5.0-dotnet-1-x86_64-freebsd.so</Link>
133 <CopyToOutputDirectory>Always</CopyToOutputDirectory> 133 <CopyToOutputDirectory>Always</CopyToOutputDirectory>
134 </None> 134 </None>
135 <None Include="Properties\Settings.settings"> 135 <None Include="Properties\Settings.settings">
136 <Generator>SettingsSingleFileGenerator</Generator> 136 <Generator>SettingsSingleFileGenerator</Generator>
137 <LastGenOutput>Settings.Designer.cs</LastGenOutput> 137 <LastGenOutput>Settings.Designer.cs</LastGenOutput>
138 </None> 138 </None>
139 <Compile Include="Properties\Settings.Designer.cs"> 139 <Compile Include="Properties\Settings.Designer.cs">
140 <AutoGen>True</AutoGen> 140 <AutoGen>True</AutoGen>
141 <DependentUpon>Settings.settings</DependentUpon> 141 <DependentUpon>Settings.settings</DependentUpon>
142 <DesignTimeSharedInput>True</DesignTimeSharedInput> 142 <DesignTimeSharedInput>True</DesignTimeSharedInput>
143 </Compile> 143 </Compile>
144 <None Include="Regions.csv"> 144 <None Include="Regions.csv">
145 <CopyToOutputDirectory>Always</CopyToOutputDirectory> 145 <CopyToOutputDirectory>Always</CopyToOutputDirectory>
146 </None> 146 </None>
147 <None Include="Vassal.exe.config"> 147 <None Include="Vassal.exe.config">
148 <CopyToOutputDirectory>Always</CopyToOutputDirectory> 148 <CopyToOutputDirectory>Always</CopyToOutputDirectory>
149 </None> 149 </None>
150 <None Include="Vassal.exe.manifest"> 150 <None Include="Vassal.exe.manifest">
151 <CopyToOutputDirectory>Always</CopyToOutputDirectory> 151 <CopyToOutputDirectory>Always</CopyToOutputDirectory>
152 </None> 152 </None>
153 <None Include="Vassal.ini"> 153 <None Include="Vassal.ini">
154 <CopyToOutputDirectory>Always</CopyToOutputDirectory> 154 <CopyToOutputDirectory>Always</CopyToOutputDirectory>
155 </None> 155 </None>
156 </ItemGroup> 156 </ItemGroup>
157 <ItemGroup> 157 <ItemGroup>
158 <None Include="App.config" /> 158 <None Include="App.config" />
159 </ItemGroup> 159 </ItemGroup>
160 <ItemGroup> 160 <ItemGroup>
161 <EmbeddedResource Include="img\loading.gif" /> 161 <EmbeddedResource Include="img\loading.gif" />
162 </ItemGroup> 162 </ItemGroup>
163 <ItemGroup> 163 <ItemGroup>
164 <EmbeddedResource Include="img\offline.png" /> 164 <EmbeddedResource Include="img\offline.png" />
165 <EmbeddedResource Include="img\online.png" /> 165 <EmbeddedResource Include="img\online.png" />
166 <Content Include="Vassal.ico" /> 166 <Content Include="Vassal.ico" />
167 </ItemGroup> 167 </ItemGroup>
168 <ItemGroup> 168 <ItemGroup />
169 <Folder Include="libs\" /> -  
170 </ItemGroup> -  
171 <ItemGroup> 169 <ItemGroup>
172 <BootstrapperPackage Include=".NETFramework,Version=v4.5"> 170 <BootstrapperPackage Include=".NETFramework,Version=v4.5">
173 <Visible>False</Visible> 171 <Visible>False</Visible>
174 <ProductName>Microsoft .NET Framework 4.5 %28x86 and x64%29</ProductName> 172 <ProductName>Microsoft .NET Framework 4.5 %28x86 and x64%29</ProductName>
175 <Install>true</Install> 173 <Install>true</Install>
176 </BootstrapperPackage> 174 </BootstrapperPackage>
177 <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1"> 175 <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
178 <Visible>False</Visible> 176 <Visible>False</Visible>
179 <ProductName>.NET Framework 3.5 SP1</ProductName> 177 <ProductName>.NET Framework 3.5 SP1</ProductName>
180 <Install>false</Install> 178 <Install>false</Install>
181 </BootstrapperPackage> 179 </BootstrapperPackage>
182 </ItemGroup> 180 </ItemGroup>
183 <ItemGroup> 181 <ItemGroup>
184 <ProjectReference Include="..\..\wasSharp\wasSharp.csproj"> 182 <ProjectReference Include="..\..\wasSharp\wasSharp.csproj">
185 <Project>{a971e1c9-776c-4cd2-88ac-71197c7b955e}</Project> 183 <Project>{a971e1c9-776c-4cd2-88ac-71197c7b955e}</Project>
186 <Name>wasSharp</Name> 184 <Name>wasSharp</Name>
187 </ProjectReference> 185 </ProjectReference>
188 </ItemGroup> 186 </ItemGroup>
189 <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> 187 <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
190 <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 188 <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
191 Other similar extension points exist, see Microsoft.Common.targets. 189 Other similar extension points exist, see Microsoft.Common.targets.
192 <Target Name="BeforeBuild"> 190 <Target Name="BeforeBuild">
193 </Target> 191 </Target>
194 <Target Name="AfterBuild"> 192 <Target Name="AfterBuild">
195 </Target> 193 </Target>
196 --> 194 -->
197 </Project> 195 </Project>
198   196  
199
Generated by GNU Enscript 1.6.5.90.
 197
Generated by GNU Enscript 1.6.5.90.
200   198  
201   199  
202   200