corrade-vassal – Diff between revs 13 and 16

Subversion Repositories:
Rev:
Only display areas with differences – Ignore whitespace
Rev 13 Rev 16
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</TargetFrameworkVersion> 12 <TargetFrameworkVersion>v4.5</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 </PropertyGroup> 29 </PropertyGroup>
30 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> 30 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
31 <PlatformTarget>AnyCPU</PlatformTarget> 31 <PlatformTarget>AnyCPU</PlatformTarget>
32 <DebugSymbols>true</DebugSymbols> 32 <DebugSymbols>true</DebugSymbols>
33 <DebugType>full</DebugType> 33 <DebugType>full</DebugType>
34 <Optimize>false</Optimize> 34 <Optimize>false</Optimize>
35 <OutputPath>bin\Debug\</OutputPath> 35 <OutputPath>bin\Debug\</OutputPath>
36 <DefineConstants>DEBUG;TRACE</DefineConstants> 36 <DefineConstants>DEBUG;TRACE</DefineConstants>
37 <ErrorReport>prompt</ErrorReport> 37 <ErrorReport>prompt</ErrorReport>
38 <WarningLevel>4</WarningLevel> 38 <WarningLevel>4</WarningLevel>
39 </PropertyGroup> 39 </PropertyGroup>
40 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> 40 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
41 <PlatformTarget>AnyCPU</PlatformTarget> 41 <PlatformTarget>AnyCPU</PlatformTarget>
42 <DebugType>pdbonly</DebugType> 42 <DebugType>pdbonly</DebugType>
43 <Optimize>true</Optimize> 43 <Optimize>true</Optimize>
44 <OutputPath>bin\Release\</OutputPath> 44 <OutputPath>bin\Release\</OutputPath>
45 <DefineConstants>TRACE</DefineConstants> 45 <DefineConstants>TRACE</DefineConstants>
46 <ErrorReport>prompt</ErrorReport> 46 <ErrorReport>prompt</ErrorReport>
47 <WarningLevel>4</WarningLevel> 47 <WarningLevel>4</WarningLevel>
48 </PropertyGroup> 48 </PropertyGroup>
49 <PropertyGroup> 49 <PropertyGroup>
50 <ApplicationIcon>Vassal.ico</ApplicationIcon> 50 <ApplicationIcon>Vassal.ico</ApplicationIcon>
51 </PropertyGroup> 51 </PropertyGroup>
52 <PropertyGroup /> 52 <PropertyGroup />
53 <PropertyGroup> 53 <PropertyGroup>
54 <StartupObject>Vassal.Program</StartupObject> 54 <StartupObject>Vassal.Program</StartupObject>
55 </PropertyGroup> 55 </PropertyGroup>
56 <PropertyGroup /> 56 <PropertyGroup />
57 <ItemGroup> 57 <ItemGroup>
58 <Reference Include="AquaGauge, Version=1.0.5767.1836, Culture=neutral, processorArchitecture=MSIL"> 58 <Reference Include="AquaGauge, Version=1.0.5767.1836, Culture=neutral, processorArchitecture=MSIL">
59 <SpecificVersion>False</SpecificVersion> 59 <SpecificVersion>False</SpecificVersion>
60 <HintPath>..\..\AquaGauge\bin\Release\AquaGauge.dll</HintPath> 60 <HintPath>..\..\AquaGauge\bin\Release\AquaGauge.dll</HintPath>
61 </Reference> 61 </Reference>
62 <Reference Include="OpenMetaverse"> 62 <Reference Include="OpenMetaverse">
63 <HintPath>..\..\libopenmetaverse\bin\OpenMetaverse.dll</HintPath> 63 <HintPath>..\..\libopenmetaverse\bin\OpenMetaverse.dll</HintPath>
64 </Reference> 64 </Reference>
65 <Reference Include="OpenMetaverseTypes"> 65 <Reference Include="OpenMetaverseTypes">
66 <HintPath>..\..\libopenmetaverse\bin\OpenMetaverseTypes.dll</HintPath> 66 <HintPath>..\..\libopenmetaverse\bin\OpenMetaverseTypes.dll</HintPath>
67 </Reference> 67 </Reference>
68 <Reference Include="System" /> 68 <Reference Include="System" />
69 <Reference Include="System.Core" /> 69 <Reference Include="System.Core" />
70 <Reference Include="System.Web" /> 70 <Reference Include="System.Web" />
71 <Reference Include="System.Xml.Linq" /> 71 <Reference Include="System.Xml.Linq" />
72 <Reference Include="System.Data.DataSetExtensions" /> 72 <Reference Include="System.Data.DataSetExtensions" />
73 <Reference Include="Microsoft.CSharp" /> 73 <Reference Include="Microsoft.CSharp" />
74 <Reference Include="System.Data" /> 74 <Reference Include="System.Data" />
75 <Reference Include="System.Deployment" /> 75 <Reference Include="System.Deployment" />
76 <Reference Include="System.Drawing" /> 76 <Reference Include="System.Drawing" />
77 <Reference Include="System.Net.Http" /> 77 <Reference Include="System.Net.Http" />
78 <Reference Include="System.Windows.Forms" /> 78 <Reference Include="System.Windows.Forms" />
79 <Reference Include="System.Xml" /> 79 <Reference Include="System.Xml" />
80 <Reference Include="wasSharp"> 80 <Reference Include="wasSharp">
81 <HintPath>..\..\wasSharp\bin\Release\wasSharp.dll</HintPath> 81 <HintPath>..\..\wasSharp\bin\Release\wasSharp.dll</HintPath>
82 </Reference> 82 </Reference>
83 </ItemGroup> 83 </ItemGroup>
84 <ItemGroup> 84 <ItemGroup>
85 <Compile Include="RegionEditForm.cs"> 85 <Compile Include="RegionEditForm.cs">
86 <SubType>Form</SubType> 86 <SubType>Form</SubType>
87 </Compile> 87 </Compile>
88 <Compile Include="RegionEditForm.Designer.cs"> 88 <Compile Include="RegionEditForm.Designer.cs">
89 <DependentUpon>RegionEditForm.cs</DependentUpon> 89 <DependentUpon>RegionEditForm.cs</DependentUpon>
90 </Compile> 90 </Compile>
91 <Compile Include="SettingsForm.cs"> 91 <Compile Include="SettingsForm.cs">
92 <SubType>Form</SubType> 92 <SubType>Form</SubType>
93 </Compile> 93 </Compile>
94 <Compile Include="SettingsForm.Designer.cs"> 94 <Compile Include="SettingsForm.Designer.cs">
95 <DependentUpon>SettingsForm.cs</DependentUpon> 95 <DependentUpon>SettingsForm.cs</DependentUpon>
96 </Compile> 96 </Compile>
97 <Compile Include="VassalConfiguration.cs" /> 97 <Compile Include="VassalConfiguration.cs" />
98 <Compile Include="VassalForm.cs"> 98 <Compile Include="VassalForm.cs">
99 <SubType>Form</SubType> 99 <SubType>Form</SubType>
100 </Compile> 100 </Compile>
101 <Compile Include="VassalForm.Designer.cs"> 101 <Compile Include="VassalForm.Designer.cs">
102 <DependentUpon>VassalForm.cs</DependentUpon> 102 <DependentUpon>VassalForm.cs</DependentUpon>
103 </Compile> 103 </Compile>
104 <Compile Include="Vassal.cs" /> 104 <Compile Include="Vassal.cs" />
105 <Compile Include="Properties\AssemblyInfo.cs" /> 105 <Compile Include="Properties\AssemblyInfo.cs" />
106 <EmbeddedResource Include="RegionEditForm.resx"> 106 <EmbeddedResource Include="RegionEditForm.resx">
107 <DependentUpon>RegionEditForm.cs</DependentUpon> 107 <DependentUpon>RegionEditForm.cs</DependentUpon>
108 </EmbeddedResource> 108 </EmbeddedResource>
109 <EmbeddedResource Include="SettingsForm.resx"> 109 <EmbeddedResource Include="SettingsForm.resx">
110 <DependentUpon>SettingsForm.cs</DependentUpon> 110 <DependentUpon>SettingsForm.cs</DependentUpon>
111 </EmbeddedResource> 111 </EmbeddedResource>
112 <EmbeddedResource Include="VassalForm.resx"> 112 <EmbeddedResource Include="VassalForm.resx">
113 <DependentUpon>VassalForm.cs</DependentUpon> 113 <DependentUpon>VassalForm.cs</DependentUpon>
114 </EmbeddedResource> 114 </EmbeddedResource>
115 <EmbeddedResource Include="Properties\Resources.resx"> 115 <EmbeddedResource Include="Properties\Resources.resx">
116 <Generator>ResXFileCodeGenerator</Generator> 116 <Generator>ResXFileCodeGenerator</Generator>
117 <LastGenOutput>Resources.Designer.cs</LastGenOutput> 117 <LastGenOutput>Resources.Designer.cs</LastGenOutput>
118 <SubType>Designer</SubType> 118 <SubType>Designer</SubType>
119 </EmbeddedResource> 119 </EmbeddedResource>
120 <Compile Include="Properties\Resources.Designer.cs"> 120 <Compile Include="Properties\Resources.Designer.cs">
121 <AutoGen>True</AutoGen> 121 <AutoGen>True</AutoGen>
122 <DependentUpon>Resources.resx</DependentUpon> 122 <DependentUpon>Resources.resx</DependentUpon>
123 </Compile> 123 </Compile>
-   124 <None Include="..\..\libopenmetaverse-overrides\libopenjpeg-dotnet-2-1.5.0-dotnet-1-arm.so">
-   125 <Link>libopenjpeg-dotnet-2-1.5.0-dotnet-1-arm.so</Link>
-   126 <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-   127 </None>
-   128 <None Include="..\..\libopenmetaverse-overrides\libopenjpeg-dotnet-2-1.5.0-dotnet-1-freebsd.so">
-   129 <Link>libopenjpeg-dotnet-2-1.5.0-dotnet-1-freebsd.so</Link>
-   130 <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-   131 </None>
-   132 <None Include="..\..\libopenmetaverse-overrides\libopenjpeg-dotnet-2-1.5.0-dotnet-1-x86_64-freebsd.so">
-   133 <Link>libopenjpeg-dotnet-2-1.5.0-dotnet-1-x86_64-freebsd.so</Link>
-   134 <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-   135 </None>
124 <None Include="Properties\Settings.settings"> 136 <None Include="Properties\Settings.settings">
125 <Generator>SettingsSingleFileGenerator</Generator> 137 <Generator>SettingsSingleFileGenerator</Generator>
126 <LastGenOutput>Settings.Designer.cs</LastGenOutput> 138 <LastGenOutput>Settings.Designer.cs</LastGenOutput>
127 </None> 139 </None>
128 <Compile Include="Properties\Settings.Designer.cs"> 140 <Compile Include="Properties\Settings.Designer.cs">
129 <AutoGen>True</AutoGen> 141 <AutoGen>True</AutoGen>
130 <DependentUpon>Settings.settings</DependentUpon> 142 <DependentUpon>Settings.settings</DependentUpon>
131 <DesignTimeSharedInput>True</DesignTimeSharedInput> 143 <DesignTimeSharedInput>True</DesignTimeSharedInput>
132 </Compile> 144 </Compile>
133 <None Include="Regions.csv"> 145 <None Include="Regions.csv">
134 <CopyToOutputDirectory>Always</CopyToOutputDirectory> 146 <CopyToOutputDirectory>Always</CopyToOutputDirectory>
135 </None> 147 </None>
136 <None Include="Vassal.exe.config"> 148 <None Include="Vassal.exe.config">
137 <CopyToOutputDirectory>Always</CopyToOutputDirectory> 149 <CopyToOutputDirectory>Always</CopyToOutputDirectory>
138 </None> 150 </None>
139 <None Include="Vassal.exe.manifest"> 151 <None Include="Vassal.exe.manifest">
140 <CopyToOutputDirectory>Always</CopyToOutputDirectory> 152 <CopyToOutputDirectory>Always</CopyToOutputDirectory>
141 </None> 153 </None>
142 <None Include="Vassal.ini"> 154 <None Include="Vassal.ini">
143 <CopyToOutputDirectory>Always</CopyToOutputDirectory> 155 <CopyToOutputDirectory>Always</CopyToOutputDirectory>
144 </None> 156 </None>
145 </ItemGroup> 157 </ItemGroup>
146 <ItemGroup> 158 <ItemGroup>
147 <None Include="App.config" /> 159 <None Include="App.config" />
148 </ItemGroup> 160 </ItemGroup>
149 <ItemGroup> 161 <ItemGroup>
150 <EmbeddedResource Include="img\loading.gif" /> 162 <EmbeddedResource Include="img\loading.gif" />
151 </ItemGroup> 163 </ItemGroup>
152 <ItemGroup> 164 <ItemGroup>
153 <EmbeddedResource Include="img\offline.png" /> 165 <EmbeddedResource Include="img\offline.png" />
154 <EmbeddedResource Include="img\online.png" /> 166 <EmbeddedResource Include="img\online.png" />
155 <Content Include="Vassal.ico" /> 167 <Content Include="Vassal.ico" />
156 </ItemGroup> 168 </ItemGroup>
157 <ItemGroup> 169 <ItemGroup>
158 <Folder Include="libs\" /> 170 <Folder Include="libs\" />
159 </ItemGroup> 171 </ItemGroup>
160 <ItemGroup> 172 <ItemGroup>
161 <BootstrapperPackage Include=".NETFramework,Version=v4.5"> 173 <BootstrapperPackage Include=".NETFramework,Version=v4.5">
162 <Visible>False</Visible> 174 <Visible>False</Visible>
163 <ProductName>Microsoft .NET Framework 4.5 %28x86 and x64%29</ProductName> 175 <ProductName>Microsoft .NET Framework 4.5 %28x86 and x64%29</ProductName>
164 <Install>true</Install> 176 <Install>true</Install>
165 </BootstrapperPackage> 177 </BootstrapperPackage>
166 <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1"> 178 <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
167 <Visible>False</Visible> 179 <Visible>False</Visible>
168 <ProductName>.NET Framework 3.5 SP1</ProductName> 180 <ProductName>.NET Framework 3.5 SP1</ProductName>
169 <Install>false</Install> 181 <Install>false</Install>
170 </BootstrapperPackage> 182 </BootstrapperPackage>
171 </ItemGroup> 183 </ItemGroup>
172 <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> 184 <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
173 <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 185 <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
174 Other similar extension points exist, see Microsoft.Common.targets. 186 Other similar extension points exist, see Microsoft.Common.targets.
175 <Target Name="BeforeBuild"> 187 <Target Name="BeforeBuild">
176 </Target> 188 </Target>
177 <Target Name="AfterBuild"> 189 <Target Name="AfterBuild">
178 </Target> 190 </Target>
179 --> 191 -->
180 </Project> 192 </Project>
181   193  
182
Generated by GNU Enscript 1.6.5.90.
 194
Generated by GNU Enscript 1.6.5.90.
183   195  
184   196  
185   197