corrade-vassal – Diff between revs 2 and 6

Subversion Repositories:
Rev:
Only display areas with differencesIgnore whitespace
Rev 2 Rev 6
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 </PropertyGroup> 14 </PropertyGroup>
15 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> 15 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
16 <PlatformTarget>AnyCPU</PlatformTarget> 16 <PlatformTarget>AnyCPU</PlatformTarget>
17 <DebugSymbols>true</DebugSymbols> 17 <DebugSymbols>true</DebugSymbols>
18 <DebugType>full</DebugType> 18 <DebugType>full</DebugType>
19 <Optimize>false</Optimize> 19 <Optimize>false</Optimize>
20 <OutputPath>bin\Debug\</OutputPath> 20 <OutputPath>bin\Debug\</OutputPath>
21 <DefineConstants>DEBUG;TRACE</DefineConstants> 21 <DefineConstants>DEBUG;TRACE</DefineConstants>
22 <ErrorReport>prompt</ErrorReport> 22 <ErrorReport>prompt</ErrorReport>
23 <WarningLevel>4</WarningLevel> 23 <WarningLevel>4</WarningLevel>
24 </PropertyGroup> 24 </PropertyGroup>
25 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> 25 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
26 <PlatformTarget>AnyCPU</PlatformTarget> 26 <PlatformTarget>AnyCPU</PlatformTarget>
27 <DebugType>pdbonly</DebugType> 27 <DebugType>pdbonly</DebugType>
28 <Optimize>true</Optimize> 28 <Optimize>true</Optimize>
29 <OutputPath>bin\Release\</OutputPath> 29 <OutputPath>bin\Release\</OutputPath>
30 <DefineConstants>TRACE</DefineConstants> 30 <DefineConstants>TRACE</DefineConstants>
31 <ErrorReport>prompt</ErrorReport> 31 <ErrorReport>prompt</ErrorReport>
32 <WarningLevel>4</WarningLevel> 32 <WarningLevel>4</WarningLevel>
33 </PropertyGroup> 33 </PropertyGroup>
34 <PropertyGroup> 34 <PropertyGroup>
35 <ApplicationIcon>Vassal.ico</ApplicationIcon> 35 <ApplicationIcon>Vassal.ico</ApplicationIcon>
36 </PropertyGroup> 36 </PropertyGroup>
37 <ItemGroup> 37 <ItemGroup>
38 <Reference Include="OpenMetaverse"> 38 <Reference Include="OpenMetaverse">
39 <HintPath>..\..\libopenmetaverse\bin\OpenMetaverse.dll</HintPath> 39 <HintPath>..\..\libopenmetaverse\bin\OpenMetaverse.dll</HintPath>
40 </Reference> 40 </Reference>
41 <Reference Include="OpenMetaverseTypes"> 41 <Reference Include="OpenMetaverseTypes">
42 <HintPath>..\..\libopenmetaverse\bin\OpenMetaverseTypes.dll</HintPath> 42 <HintPath>..\..\libopenmetaverse\bin\OpenMetaverseTypes.dll</HintPath>
43 </Reference> 43 </Reference>
44 <Reference Include="System" /> 44 <Reference Include="System" />
45 <Reference Include="System.Core" /> 45 <Reference Include="System.Core" />
46 <Reference Include="System.Web" /> 46 <Reference Include="System.Web" />
47 <Reference Include="System.Xml.Linq" /> 47 <Reference Include="System.Xml.Linq" />
48 <Reference Include="System.Data.DataSetExtensions" /> 48 <Reference Include="System.Data.DataSetExtensions" />
49 <Reference Include="Microsoft.CSharp" /> 49 <Reference Include="Microsoft.CSharp" />
50 <Reference Include="System.Data" /> 50 <Reference Include="System.Data" />
51 <Reference Include="System.Deployment" /> 51 <Reference Include="System.Deployment" />
52 <Reference Include="System.Drawing" /> 52 <Reference Include="System.Drawing" />
53 <Reference Include="System.Net.Http" /> 53 <Reference Include="System.Net.Http" />
54 <Reference Include="System.Windows.Forms" /> 54 <Reference Include="System.Windows.Forms" />
55 <Reference Include="System.Xml" /> 55 <Reference Include="System.Xml" />
56 </ItemGroup> 56 </ItemGroup>
57 <ItemGroup> 57 <ItemGroup>
58 <Compile Include="RegionEditForm.cs"> 58 <Compile Include="RegionEditForm.cs">
59 <SubType>Form</SubType> 59 <SubType>Form</SubType>
60 </Compile> 60 </Compile>
61 <Compile Include="RegionEditForm.Designer.cs"> 61 <Compile Include="RegionEditForm.Designer.cs">
62 <DependentUpon>RegionEditForm.cs</DependentUpon> 62 <DependentUpon>RegionEditForm.cs</DependentUpon>
63 </Compile> 63 </Compile>
64 <Compile Include="SettingsForm.cs"> 64 <Compile Include="SettingsForm.cs">
65 <SubType>Form</SubType> 65 <SubType>Form</SubType>
66 </Compile> 66 </Compile>
67 <Compile Include="SettingsForm.Designer.cs"> 67 <Compile Include="SettingsForm.Designer.cs">
68 <DependentUpon>SettingsForm.cs</DependentUpon> 68 <DependentUpon>SettingsForm.cs</DependentUpon>
69 </Compile> 69 </Compile>
70 <Compile Include="VassalConfiguration.cs" /> 70 <Compile Include="VassalConfiguration.cs" />
71 <Compile Include="VassalForm.cs"> 71 <Compile Include="VassalForm.cs">
72 <SubType>Form</SubType> 72 <SubType>Form</SubType>
73 </Compile> 73 </Compile>
74 <Compile Include="VassalForm.Designer.cs"> 74 <Compile Include="VassalForm.Designer.cs">
75 <DependentUpon>VassalForm.cs</DependentUpon> 75 <DependentUpon>VassalForm.cs</DependentUpon>
76 </Compile> 76 </Compile>
77 <Compile Include="Vassal.cs" /> 77 <Compile Include="Vassal.cs" />
78 <Compile Include="Properties\AssemblyInfo.cs" /> 78 <Compile Include="Properties\AssemblyInfo.cs" />
79 <EmbeddedResource Include="RegionEditForm.resx"> 79 <EmbeddedResource Include="RegionEditForm.resx">
80 <DependentUpon>RegionEditForm.cs</DependentUpon> 80 <DependentUpon>RegionEditForm.cs</DependentUpon>
81 </EmbeddedResource> 81 </EmbeddedResource>
82 <EmbeddedResource Include="SettingsForm.resx"> 82 <EmbeddedResource Include="SettingsForm.resx">
83 <DependentUpon>SettingsForm.cs</DependentUpon> 83 <DependentUpon>SettingsForm.cs</DependentUpon>
84 </EmbeddedResource> 84 </EmbeddedResource>
85 <EmbeddedResource Include="VassalForm.resx"> 85 <EmbeddedResource Include="VassalForm.resx">
86 <DependentUpon>VassalForm.cs</DependentUpon> 86 <DependentUpon>VassalForm.cs</DependentUpon>
87 </EmbeddedResource> 87 </EmbeddedResource>
88 <EmbeddedResource Include="Properties\Resources.resx"> 88 <EmbeddedResource Include="Properties\Resources.resx">
89 <Generator>ResXFileCodeGenerator</Generator> 89 <Generator>ResXFileCodeGenerator</Generator>
90 <LastGenOutput>Resources.Designer.cs</LastGenOutput> 90 <LastGenOutput>Resources.Designer.cs</LastGenOutput>
91 <SubType>Designer</SubType> 91 <SubType>Designer</SubType>
92 </EmbeddedResource> 92 </EmbeddedResource>
93 <Compile Include="Properties\Resources.Designer.cs"> 93 <Compile Include="Properties\Resources.Designer.cs">
94 <AutoGen>True</AutoGen> 94 <AutoGen>True</AutoGen>
95 <DependentUpon>Resources.resx</DependentUpon> 95 <DependentUpon>Resources.resx</DependentUpon>
96 </Compile> 96 </Compile>
97 <None Include="Properties\Settings.settings"> 97 <None Include="Properties\Settings.settings">
98 <Generator>SettingsSingleFileGenerator</Generator> 98 <Generator>SettingsSingleFileGenerator</Generator>
99 <LastGenOutput>Settings.Designer.cs</LastGenOutput> 99 <LastGenOutput>Settings.Designer.cs</LastGenOutput>
100 </None> 100 </None>
101 <Compile Include="Properties\Settings.Designer.cs"> 101 <Compile Include="Properties\Settings.Designer.cs">
102 <AutoGen>True</AutoGen> 102 <AutoGen>True</AutoGen>
103 <DependentUpon>Settings.settings</DependentUpon> 103 <DependentUpon>Settings.settings</DependentUpon>
104 <DesignTimeSharedInput>True</DesignTimeSharedInput> 104 <DesignTimeSharedInput>True</DesignTimeSharedInput>
105 </Compile> 105 </Compile>
106 <None Include="Regions.csv"> 106 <None Include="Regions.csv">
107 <CopyToOutputDirectory>Always</CopyToOutputDirectory> 107 <CopyToOutputDirectory>Always</CopyToOutputDirectory>
108 </None> 108 </None>
-   109 <None Include="Vassal.exe.config">
-   110 <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-   111 </None>
109 <None Include="Vassal.ini"> 112 <None Include="Vassal.ini">
110 <CopyToOutputDirectory>Always</CopyToOutputDirectory> 113 <CopyToOutputDirectory>Always</CopyToOutputDirectory>
111 </None> 114 </None>
112 </ItemGroup> 115 </ItemGroup>
113 <ItemGroup> 116 <ItemGroup>
114 <None Include="App.config" /> 117 <None Include="App.config" />
115 </ItemGroup> 118 </ItemGroup>
116 <ItemGroup> 119 <ItemGroup>
117 <EmbeddedResource Include="img\loading.gif" /> 120 <EmbeddedResource Include="img\loading.gif" />
118 </ItemGroup> 121 </ItemGroup>
119 <ItemGroup> 122 <ItemGroup>
120 <Content Include="Vassal.ico" /> 123 <Content Include="Vassal.ico" />
121 </ItemGroup> 124 </ItemGroup>
-   125 <ItemGroup>
-   126 <Folder Include="libs\" />
-   127 </ItemGroup>
122 <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> 128 <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
123 <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 129 <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
124 Other similar extension points exist, see Microsoft.Common.targets. 130 Other similar extension points exist, see Microsoft.Common.targets.
125 <Target Name="BeforeBuild"> 131 <Target Name="BeforeBuild">
126 </Target> 132 </Target>
127 <Target Name="AfterBuild"> 133 <Target Name="AfterBuild">
128 </Target> 134 </Target>
129 --> 135 -->
130 </Project> 136 </Project>
131   137  
132
Generated by GNU Enscript 1.6.5.90.
138
Generated by GNU Enscript 1.6.5.90.
133   139  
134   140  
135   141