Changeset 11920 for stable/HeuristicLab.GeoIP/1.12
- Timestamp:
- 02/05/15 17:37:03 (10 years ago)
- Location:
- stable
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
stable
- Property svn:mergeinfo changed
/trunk/sources merged: 11623,11631,11634
- Property svn:mergeinfo changed
-
stable/HeuristicLab.GeoIP/1.12/HeuristicLab.GeoIP.csproj
r8600 r11920 11 11 <RootNamespace>HeuristicLab.GeoIP</RootNamespace> 12 12 <AssemblyName>HeuristicLab.GeoIP</AssemblyName> 13 <TargetFrameworkVersion>v4. 0</TargetFrameworkVersion>13 <TargetFrameworkVersion>v4.5</TargetFrameworkVersion> 14 14 <FileAlignment>512</FileAlignment> 15 <TargetFrameworkProfile /> 15 16 </PropertyGroup> 16 17 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> … … 23 24 <WarningLevel>4</WarningLevel> 24 25 <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet> 26 <Prefer32Bit>false</Prefer32Bit> 25 27 </PropertyGroup> 26 28 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> … … 34 36 </DocumentationFile> 35 37 <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet> 38 <Prefer32Bit>false</Prefer32Bit> 36 39 </PropertyGroup> 37 40 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' "> … … 43 46 <ErrorReport>prompt</ErrorReport> 44 47 <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet> 48 <Prefer32Bit>false</Prefer32Bit> 45 49 </PropertyGroup> 46 50 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' "> … … 54 58 <ErrorReport>prompt</ErrorReport> 55 59 <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet> 60 <Prefer32Bit>false</Prefer32Bit> 56 61 </PropertyGroup> 57 62 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' "> … … 63 68 <ErrorReport>prompt</ErrorReport> 64 69 <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet> 70 <Prefer32Bit>false</Prefer32Bit> 65 71 </PropertyGroup> 66 72 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' "> … … 74 80 <ErrorReport>prompt</ErrorReport> 75 81 <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet> 82 <Prefer32Bit>false</Prefer32Bit> 76 83 </PropertyGroup> 77 84 <PropertyGroup> … … 122 129 <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> 123 130 <PropertyGroup> 124 <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">set Path=%25Path%25;$(ProjectDir);$(SolutionDir)131 <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">set Path=%25Path%25;$(ProjectDir);$(SolutionDir) 125 132 set ProjectDir=$(ProjectDir) 126 133 set SolutionDir=$(SolutionDir) … … 128 135 129 136 call PreBuildEvent.cmd</PreBuildEvent> 130 <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">137 <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' "> 131 138 export ProjectDir=$(ProjectDir) 132 139 export SolutionDir=$(SolutionDir) -
stable/HeuristicLab.GeoIP/1.12/Settings.Designer.cs
r8040 r11920 2 2 // <auto-generated> 3 3 // This code was generated by a tool. 4 // Runtime Version:4.0.30319. 5304 // Runtime Version:4.0.30319.34014 5 5 // 6 6 // Changes to this file may cause incorrect behavior and will be lost if … … 13 13 14 14 [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] 15 [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "1 0.0.0.0")]15 [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "12.0.0.0")] 16 16 internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { 17 17 -
stable/HeuristicLab.GeoIP/1.12/app.config
r8040 r11920 1 <?xml version="1.0" encoding="utf-8"?>1 <?xml version="1.0" encoding="utf-8"?> 2 2 <configuration> 3 3 <configSections> 4 <sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" 5 <section name="HeuristicLab.GeoIP.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" 4 <sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> 5 <section name="HeuristicLab.GeoIP.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false"/> 6 6 </sectionGroup> 7 7 </configSections> … … 13 13 </HeuristicLab.GeoIP.Settings> 14 14 </applicationSettings> 15 < /configuration>15 <startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/></startup></configuration>
Note: See TracChangeset
for help on using the changeset viewer.