You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@devicemap.apache.org by wk...@apache.org on 2015/03/05 14:21:55 UTC
svn commit: r1664339 - in /devicemap/trunk/devicemap: csharp/
csharp/DeviceMap/ csharp/DeviceMap/Properties/ csharp/DeviceMapConsole/
csharp/DeviceMapConsole/Properties/ vbnet/ vbnet/DeviceMap/
vbnet/DeviceMap/My Project/ vbnet/DeviceMapConsole/ vbnet/...
Author: wkeil
Date: Thu Mar 5 13:21:54 2015
New Revision: 1664339
URL: http://svn.apache.org/r1664339
Log:
https://issues.apache.org/jira/browse/DMAP-149
Added:
devicemap/trunk/devicemap/csharp/DeviceMap-ASF.ico (with props)
devicemap/trunk/devicemap/vbnet/DeviceMap-ASF.ico (with props)
Modified:
devicemap/trunk/devicemap/csharp/DeviceMap.sln
devicemap/trunk/devicemap/csharp/DeviceMap/App.config
devicemap/trunk/devicemap/csharp/DeviceMap/DeviceMap.csproj
devicemap/trunk/devicemap/csharp/DeviceMap/Properties/AssemblyInfo.cs
devicemap/trunk/devicemap/csharp/DeviceMapConsole/App.config
devicemap/trunk/devicemap/csharp/DeviceMapConsole/DeviceMapConsole.csproj
devicemap/trunk/devicemap/csharp/DeviceMapConsole/Properties/AssemblyInfo.cs
devicemap/trunk/devicemap/vbnet/DeviceMap.sln
devicemap/trunk/devicemap/vbnet/DeviceMap/DeviceMap.vbproj
devicemap/trunk/devicemap/vbnet/DeviceMap/My Project/AssemblyInfo.vb
devicemap/trunk/devicemap/vbnet/DeviceMap/My Project/Resources.Designer.vb
devicemap/trunk/devicemap/vbnet/DeviceMap/My Project/Settings.Designer.vb
devicemap/trunk/devicemap/vbnet/DeviceMapConsole/App.config
devicemap/trunk/devicemap/vbnet/DeviceMapConsole/DeviceMapConsole.vbproj
devicemap/trunk/devicemap/vbnet/DeviceMapConsole/My Project/AssemblyInfo.vb
devicemap/trunk/devicemap/vbnet/DeviceMapConsole/My Project/Resources.Designer.vb
devicemap/trunk/devicemap/vbnet/DeviceMapConsole/My Project/Settings.Designer.vb
Added: devicemap/trunk/devicemap/csharp/DeviceMap-ASF.ico
URL: http://svn.apache.org/viewvc/devicemap/trunk/devicemap/csharp/DeviceMap-ASF.ico?rev=1664339&view=auto
==============================================================================
Binary file - no diff available.
Propchange: devicemap/trunk/devicemap/csharp/DeviceMap-ASF.ico
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: devicemap/trunk/devicemap/csharp/DeviceMap.sln
URL: http://svn.apache.org/viewvc/devicemap/trunk/devicemap/csharp/DeviceMap.sln?rev=1664339&r1=1664338&r2=1664339&view=diff
==============================================================================
--- devicemap/trunk/devicemap/csharp/DeviceMap.sln (original)
+++ devicemap/trunk/devicemap/csharp/DeviceMap.sln Thu Mar 5 13:21:54 2015
@@ -1,12 +1,17 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2013
-VisualStudioVersion = 12.0.30501.0
+VisualStudioVersion = 12.0.31101.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DeviceMap", "DeviceMap\DeviceMap.csproj", "{80034170-C27C-4AB9-A98F-F2FCCF83A8FA}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DeviceMapConsole", "DeviceMapConsole\DeviceMapConsole.csproj", "{E5F9D389-6339-4386-BCAE-C2581B4CA8F2}"
EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{7DCC9ED6-2870-4E5E-8239-290E65FFAC57}"
+ ProjectSection(SolutionItems) = preProject
+ DeviceMap-ASF.ico = DeviceMap-ASF.ico
+ EndProjectSection
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Modified: devicemap/trunk/devicemap/csharp/DeviceMap/App.config
URL: http://svn.apache.org/viewvc/devicemap/trunk/devicemap/csharp/DeviceMap/App.config?rev=1664339&r1=1664338&r2=1664339&view=diff
==============================================================================
--- devicemap/trunk/devicemap/csharp/DeviceMap/App.config (original)
+++ devicemap/trunk/devicemap/csharp/DeviceMap/App.config Thu Mar 5 13:21:54 2015
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
<configuration>
<startup>
- <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" />
+ <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/>
</startup>
-</configuration>
\ No newline at end of file
+</configuration>
Modified: devicemap/trunk/devicemap/csharp/DeviceMap/DeviceMap.csproj
URL: http://svn.apache.org/viewvc/devicemap/trunk/devicemap/csharp/DeviceMap/DeviceMap.csproj?rev=1664339&r1=1664338&r2=1664339&view=diff
==============================================================================
--- devicemap/trunk/devicemap/csharp/DeviceMap/DeviceMap.csproj (original)
+++ devicemap/trunk/devicemap/csharp/DeviceMap/DeviceMap.csproj Thu Mar 5 13:21:54 2015
@@ -9,9 +9,10 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>DeviceMap</RootNamespace>
<AssemblyName>DeviceMap</AssemblyName>
- <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+ <TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
@@ -35,6 +36,9 @@
<PropertyGroup>
<StartupObject />
</PropertyGroup>
+ <PropertyGroup>
+ <ApplicationIcon>DeviceMap-ASF.ico</ApplicationIcon>
+ </PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.configuration" />
@@ -61,7 +65,9 @@
</ItemGroup>
<ItemGroup>
<None Include="App.config" />
- <None Include="DeviceMap.pfx" />
+ </ItemGroup>
+ <ItemGroup>
+ <Content Include="DeviceMap-ASF.ico" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Modified: devicemap/trunk/devicemap/csharp/DeviceMap/Properties/AssemblyInfo.cs
URL: http://svn.apache.org/viewvc/devicemap/trunk/devicemap/csharp/DeviceMap/Properties/AssemblyInfo.cs?rev=1664339&r1=1664338&r2=1664339&view=diff
==============================================================================
--- devicemap/trunk/devicemap/csharp/DeviceMap/Properties/AssemblyInfo.cs (original)
+++ devicemap/trunk/devicemap/csharp/DeviceMap/Properties/AssemblyInfo.cs Thu Mar 5 13:21:54 2015
@@ -8,9 +8,9 @@ using System.Runtime.InteropServices;
[assembly: AssemblyTitle("DeviceMap")]
[assembly: AssemblyDescription(".Net version of DeviceMap Client")]
[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("ASF")]
+[assembly: AssemblyCompany("Apache Software Foundation")]
[assembly: AssemblyProduct("DeviceMap")]
-[assembly: AssemblyCopyright("Copyright © ASF 2013")]
+[assembly: AssemblyCopyright("Copyright © ASF 2015")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
[assembly: System.CLSCompliant(true)]
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// 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("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("1.1.0.0")]
+[assembly: AssemblyFileVersion("1.1.0.0")]
Modified: devicemap/trunk/devicemap/csharp/DeviceMapConsole/App.config
URL: http://svn.apache.org/viewvc/devicemap/trunk/devicemap/csharp/DeviceMapConsole/App.config?rev=1664339&r1=1664338&r2=1664339&view=diff
==============================================================================
--- devicemap/trunk/devicemap/csharp/DeviceMapConsole/App.config (original)
+++ devicemap/trunk/devicemap/csharp/DeviceMapConsole/App.config Thu Mar 5 13:21:54 2015
@@ -5,6 +5,6 @@
<add name="DeviceMap" connectionString="http://svn.apache.org/repos/asf/incubator/devicemap/trunk/data/device-data/src/main/resources/devicedata"/>
</connectionStrings>
<startup>
- <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2"/>
+ <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/>
</startup>
-</configuration>
\ No newline at end of file
+</configuration>
Modified: devicemap/trunk/devicemap/csharp/DeviceMapConsole/DeviceMapConsole.csproj
URL: http://svn.apache.org/viewvc/devicemap/trunk/devicemap/csharp/DeviceMapConsole/DeviceMapConsole.csproj?rev=1664339&r1=1664338&r2=1664339&view=diff
==============================================================================
--- devicemap/trunk/devicemap/csharp/DeviceMapConsole/DeviceMapConsole.csproj (original)
+++ devicemap/trunk/devicemap/csharp/DeviceMapConsole/DeviceMapConsole.csproj Thu Mar 5 13:21:54 2015
@@ -9,9 +9,10 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>DeviceMapConsole</RootNamespace>
<AssemblyName>DeviceMapConsole</AssemblyName>
- <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+ <TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
@@ -33,8 +34,7 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup>
- <ApplicationIcon>
- </ApplicationIcon>
+ <ApplicationIcon>DeviceMap-ASF.ico</ApplicationIcon>
</PropertyGroup>
<PropertyGroup>
<StartupObject>
@@ -57,6 +57,7 @@
<None Include="App.config" />
</ItemGroup>
<ItemGroup>
+ <Content Include="DeviceMap-ASF.ico" />
<Content Include="ua_strings.txt">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
Modified: devicemap/trunk/devicemap/csharp/DeviceMapConsole/Properties/AssemblyInfo.cs
URL: http://svn.apache.org/viewvc/devicemap/trunk/devicemap/csharp/DeviceMapConsole/Properties/AssemblyInfo.cs?rev=1664339&r1=1664338&r2=1664339&view=diff
==============================================================================
--- devicemap/trunk/devicemap/csharp/DeviceMapConsole/Properties/AssemblyInfo.cs (original)
+++ devicemap/trunk/devicemap/csharp/DeviceMapConsole/Properties/AssemblyInfo.cs Thu Mar 5 13:21:54 2015
@@ -8,9 +8,9 @@ using System.Runtime.InteropServices;
[assembly: AssemblyTitle("DeviceMapConsole")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
+[assembly: AssemblyCompany("Apache Software Foundation")]
[assembly: AssemblyProduct("DeviceMapConsole")]
-[assembly: AssemblyCopyright("Copyright © 2014")]
+[assembly: AssemblyCopyright("Copyright © 2015")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// 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("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("1.1.0.0")]
+[assembly: AssemblyFileVersion("1.1.0.0")]
Added: devicemap/trunk/devicemap/vbnet/DeviceMap-ASF.ico
URL: http://svn.apache.org/viewvc/devicemap/trunk/devicemap/vbnet/DeviceMap-ASF.ico?rev=1664339&view=auto
==============================================================================
Binary file - no diff available.
Propchange: devicemap/trunk/devicemap/vbnet/DeviceMap-ASF.ico
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: devicemap/trunk/devicemap/vbnet/DeviceMap.sln
URL: http://svn.apache.org/viewvc/devicemap/trunk/devicemap/vbnet/DeviceMap.sln?rev=1664339&r1=1664338&r2=1664339&view=diff
==============================================================================
--- devicemap/trunk/devicemap/vbnet/DeviceMap.sln (original)
+++ devicemap/trunk/devicemap/vbnet/DeviceMap.sln Thu Mar 5 13:21:54 2015
@@ -1,12 +1,17 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2013
-VisualStudioVersion = 12.0.30501.0
+VisualStudioVersion = 12.0.31101.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "DeviceMap", "DeviceMap\DeviceMap.vbproj", "{2B8A4B1A-ADDF-4A37-BAD2-C389D69858B0}"
EndProject
Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "DeviceMapConsole", "DeviceMapConsole\DeviceMapConsole.vbproj", "{25243D5B-6173-416D-9ED1-4A6B061517CB}"
EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{B856D59B-4B20-404D-A98C-AEC2C6F8E162}"
+ ProjectSection(SolutionItems) = preProject
+ DeviceMap-ASF.ico = DeviceMap-ASF.ico
+ EndProjectSection
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -26,9 +31,9 @@ Global
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
- BuildVersion_UseUniversalClock = True
- BuildVersion_UseGlobalSettings = True
- BuildVersion_UpdateFileVersion = True
BuildVersion_UpdateAssemblyVersion = True
+ BuildVersion_UpdateFileVersion = True
+ BuildVersion_UseGlobalSettings = True
+ BuildVersion_UseUniversalClock = True
EndGlobalSection
EndGlobal
Modified: devicemap/trunk/devicemap/vbnet/DeviceMap/DeviceMap.vbproj
URL: http://svn.apache.org/viewvc/devicemap/trunk/devicemap/vbnet/DeviceMap/DeviceMap.vbproj?rev=1664339&r1=1664338&r2=1664339&view=diff
==============================================================================
--- devicemap/trunk/devicemap/vbnet/DeviceMap/DeviceMap.vbproj (original)
+++ devicemap/trunk/devicemap/vbnet/DeviceMap/DeviceMap.vbproj Thu Mar 5 13:21:54 2015
@@ -10,7 +10,8 @@
<AssemblyName>DeviceMap</AssemblyName>
<FileAlignment>512</FileAlignment>
<MyType>Windows</MyType>
- <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+ <TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -46,7 +47,8 @@
<SignAssembly>false</SignAssembly>
</PropertyGroup>
<PropertyGroup>
- <AssemblyOriginatorKeyFile>DeviceMap.pfx</AssemblyOriginatorKeyFile>
+ <AssemblyOriginatorKeyFile>
+ </AssemblyOriginatorKeyFile>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
@@ -105,7 +107,6 @@
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
- <None Include="DeviceMap.pfx" />
<None Include="My Project\Application.myapp">
<Generator>MyApplicationCodeGenerator</Generator>
<LastGenOutput>Application.Designer.vb</LastGenOutput>
Modified: devicemap/trunk/devicemap/vbnet/DeviceMap/My Project/AssemblyInfo.vb
URL: http://svn.apache.org/viewvc/devicemap/trunk/devicemap/vbnet/DeviceMap/My%20Project/AssemblyInfo.vb?rev=1664339&r1=1664338&r2=1664339&view=diff
==============================================================================
--- devicemap/trunk/devicemap/vbnet/DeviceMap/My Project/AssemblyInfo.vb (original)
+++ devicemap/trunk/devicemap/vbnet/DeviceMap/My Project/AssemblyInfo.vb Thu Mar 5 13:21:54 2015
@@ -11,7 +11,7 @@ Imports System.Runtime.InteropServices
<Assembly: AssemblyDescription(".Net version of DeviceMap")>
<Assembly: AssemblyCompany("ASF")>
<Assembly: AssemblyProduct("DeviceMap")>
-<Assembly: AssemblyCopyright("Copyright © ASF 2013")>
+<Assembly: AssemblyCopyright("Copyright © ASF 2015")>
<Assembly: AssemblyTrademark("")>
<Assembly: CLSCompliant(True)>
<Assembly: ComVisible(False)>
@@ -30,5 +30,5 @@ Imports System.Runtime.InteropServices
' by using the '*' as shown below:
' <Assembly: AssemblyVersion("1.0.*")>
-<Assembly: AssemblyVersion("1.0.0.0")>
-<Assembly: AssemblyFileVersion("1.0.0.0")>
+<Assembly: AssemblyVersion("1.1.0.0")>
+<Assembly: AssemblyFileVersion("1.1.0.0")>
Modified: devicemap/trunk/devicemap/vbnet/DeviceMap/My Project/Resources.Designer.vb
URL: http://svn.apache.org/viewvc/devicemap/trunk/devicemap/vbnet/DeviceMap/My%20Project/Resources.Designer.vb?rev=1664339&r1=1664338&r2=1664339&view=diff
==============================================================================
--- devicemap/trunk/devicemap/vbnet/DeviceMap/My Project/Resources.Designer.vb (original)
+++ devicemap/trunk/devicemap/vbnet/DeviceMap/My Project/Resources.Designer.vb Thu Mar 5 13:21:54 2015
@@ -11,6 +11,7 @@
Option Strict On
Option Explicit On
+Imports System
Namespace My.Resources
@@ -21,20 +22,20 @@ Namespace My.Resources
'''<summary>
''' A strongly-typed resource class, for looking up localized strings, etc.
'''</summary>
- <Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0"), _
- Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _
- Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(), _
- Global.Microsoft.VisualBasic.HideModuleNameAttribute()> _
+ <Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0"), _
+ Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _
+ Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(), _
+ Global.Microsoft.VisualBasic.HideModuleNameAttribute()> _
Friend Module Resources
-
+
Private resourceMan As Global.System.Resources.ResourceManager
-
+
Private resourceCulture As Global.System.Globalization.CultureInfo
-
+
'''<summary>
''' Returns the cached ResourceManager instance used by this class.
'''</summary>
- <Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)> _
+ <Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)> _
Friend ReadOnly Property ResourceManager() As Global.System.Resources.ResourceManager
Get
If Object.ReferenceEquals(resourceMan, Nothing) Then
@@ -44,17 +45,17 @@ Namespace My.Resources
Return resourceMan
End Get
End Property
-
+
'''<summary>
''' Overrides the current thread's CurrentUICulture property for all
''' resource lookups using this strongly typed resource class.
'''</summary>
- <Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)> _
+ <Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)> _
Friend Property Culture() As Global.System.Globalization.CultureInfo
Get
Return resourceCulture
End Get
- Set(ByVal value As Global.System.Globalization.CultureInfo)
+ Set
resourceCulture = value
End Set
End Property
Modified: devicemap/trunk/devicemap/vbnet/DeviceMap/My Project/Settings.Designer.vb
URL: http://svn.apache.org/viewvc/devicemap/trunk/devicemap/vbnet/DeviceMap/My%20Project/Settings.Designer.vb?rev=1664339&r1=1664338&r2=1664339&view=diff
==============================================================================
--- devicemap/trunk/devicemap/vbnet/DeviceMap/My Project/Settings.Designer.vb (original)
+++ devicemap/trunk/devicemap/vbnet/DeviceMap/My Project/Settings.Designer.vb Thu Mar 5 13:21:54 2015
@@ -13,42 +13,42 @@ Option Explicit On
Namespace My
-
- <Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(), _
- Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0"), _
- Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)> _
+
+ <Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(), _
+ Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "12.0.0.0"), _
+ Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)> _
Partial Friend NotInheritable Class MySettings
Inherits Global.System.Configuration.ApplicationSettingsBase
-
- Private Shared defaultInstance As MySettings = CType(Global.System.Configuration.ApplicationSettingsBase.Synchronized(New MySettings), MySettings)
-
+
+ Private Shared defaultInstance As MySettings = CType(Global.System.Configuration.ApplicationSettingsBase.Synchronized(New MySettings()),MySettings)
+
#Region "My.Settings Auto-Save Functionality"
#If _MyType = "WindowsForms" Then
- Private Shared addedHandler As Boolean
+ Private Shared addedHandler As Boolean
- Private Shared addedHandlerLockObject As New Object
+ Private Shared addedHandlerLockObject As New Object
- <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)> _
- Private Shared Sub AutoSaveSettings(ByVal sender As Global.System.Object, ByVal e As Global.System.EventArgs)
- If My.Application.SaveMySettingsOnExit Then
- My.Settings.Save()
- End If
- End Sub
+ <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)> _
+ Private Shared Sub AutoSaveSettings(ByVal sender As Global.System.Object, ByVal e As Global.System.EventArgs)
+ If My.Application.SaveMySettingsOnExit Then
+ My.Settings.Save()
+ End If
+ End Sub
#End If
#End Region
-
+
Public Shared ReadOnly Property [Default]() As MySettings
Get
-
+
#If _MyType = "WindowsForms" Then
- If Not addedHandler Then
- SyncLock addedHandlerLockObject
- If Not addedHandler Then
- AddHandler My.Application.Shutdown, AddressOf AutoSaveSettings
- addedHandler = True
- End If
- End SyncLock
- End If
+ If Not addedHandler Then
+ SyncLock addedHandlerLockObject
+ If Not addedHandler Then
+ AddHandler My.Application.Shutdown, AddressOf AutoSaveSettings
+ addedHandler = True
+ End If
+ End SyncLock
+ End If
#End If
Return defaultInstance
End Get
Modified: devicemap/trunk/devicemap/vbnet/DeviceMapConsole/App.config
URL: http://svn.apache.org/viewvc/devicemap/trunk/devicemap/vbnet/DeviceMapConsole/App.config?rev=1664339&r1=1664338&r2=1664339&view=diff
==============================================================================
--- devicemap/trunk/devicemap/vbnet/DeviceMapConsole/App.config (original)
+++ devicemap/trunk/devicemap/vbnet/DeviceMapConsole/App.config Thu Mar 5 13:21:54 2015
@@ -5,6 +5,6 @@
<add name="DeviceMap" connectionString="http://svn.apache.org/repos/asf/incubator/devicemap/trunk/data/device-data/src/main/resources/devicedata"/>
</connectionStrings>
<startup>
- <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2"/>
+ <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/>
</startup>
-</configuration>
\ No newline at end of file
+</configuration>
Modified: devicemap/trunk/devicemap/vbnet/DeviceMapConsole/DeviceMapConsole.vbproj
URL: http://svn.apache.org/viewvc/devicemap/trunk/devicemap/vbnet/DeviceMapConsole/DeviceMapConsole.vbproj?rev=1664339&r1=1664338&r2=1664339&view=diff
==============================================================================
--- devicemap/trunk/devicemap/vbnet/DeviceMapConsole/DeviceMapConsole.vbproj (original)
+++ devicemap/trunk/devicemap/vbnet/DeviceMapConsole/DeviceMapConsole.vbproj Thu Mar 5 13:21:54 2015
@@ -11,8 +11,9 @@
<AssemblyName>DeviceMapConsole</AssemblyName>
<FileAlignment>512</FileAlignment>
<MyType>Console</MyType>
- <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+ <TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
@@ -46,6 +47,9 @@
<PropertyGroup>
<OptionInfer>On</OptionInfer>
</PropertyGroup>
+ <PropertyGroup>
+ <ApplicationIcon>DeviceMap-ASF.ico</ApplicationIcon>
+ </PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Data" />
@@ -105,6 +109,7 @@
<None Include="App.config" />
</ItemGroup>
<ItemGroup>
+ <Content Include="DeviceMap-ASF.ico" />
<Content Include="ua_strings.txt">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
Modified: devicemap/trunk/devicemap/vbnet/DeviceMapConsole/My Project/AssemblyInfo.vb
URL: http://svn.apache.org/viewvc/devicemap/trunk/devicemap/vbnet/DeviceMapConsole/My%20Project/AssemblyInfo.vb?rev=1664339&r1=1664338&r2=1664339&view=diff
==============================================================================
--- devicemap/trunk/devicemap/vbnet/DeviceMapConsole/My Project/AssemblyInfo.vb (original)
+++ devicemap/trunk/devicemap/vbnet/DeviceMapConsole/My Project/AssemblyInfo.vb Thu Mar 5 13:21:54 2015
@@ -12,7 +12,7 @@ Imports System.Runtime.InteropServices
<Assembly: AssemblyDescription("")>
<Assembly: AssemblyCompany("")>
<Assembly: AssemblyProduct("DeviceMapConsole")>
-<Assembly: AssemblyCopyright("Copyright © 2014")>
+<Assembly: AssemblyCopyright("Copyright © 2015")>
<Assembly: AssemblyTrademark("")>
<Assembly: ComVisible(False)>
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
' by using the '*' as shown below:
' <Assembly: AssemblyVersion("1.0.*")>
-<Assembly: AssemblyVersion("1.0.0.0")>
-<Assembly: AssemblyFileVersion("1.0.0.0")>
+<Assembly: AssemblyVersion("1.1.0.0")>
+<Assembly: AssemblyFileVersion("1.1.0.0")>
Modified: devicemap/trunk/devicemap/vbnet/DeviceMapConsole/My Project/Resources.Designer.vb
URL: http://svn.apache.org/viewvc/devicemap/trunk/devicemap/vbnet/DeviceMapConsole/My%20Project/Resources.Designer.vb?rev=1664339&r1=1664338&r2=1664339&view=diff
==============================================================================
--- devicemap/trunk/devicemap/vbnet/DeviceMapConsole/My Project/Resources.Designer.vb (original)
+++ devicemap/trunk/devicemap/vbnet/DeviceMapConsole/My Project/Resources.Designer.vb Thu Mar 5 13:21:54 2015
@@ -11,6 +11,7 @@
Option Strict On
Option Explicit On
+Imports System
Namespace My.Resources
@@ -21,20 +22,20 @@ Namespace My.Resources
'''<summary>
''' A strongly-typed resource class, for looking up localized strings, etc.
'''</summary>
- <Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0"), _
- Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _
- Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(), _
- Global.Microsoft.VisualBasic.HideModuleNameAttribute()> _
+ <Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0"), _
+ Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _
+ Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(), _
+ Global.Microsoft.VisualBasic.HideModuleNameAttribute()> _
Friend Module Resources
-
+
Private resourceMan As Global.System.Resources.ResourceManager
-
+
Private resourceCulture As Global.System.Globalization.CultureInfo
-
+
'''<summary>
''' Returns the cached ResourceManager instance used by this class.
'''</summary>
- <Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)> _
+ <Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)> _
Friend ReadOnly Property ResourceManager() As Global.System.Resources.ResourceManager
Get
If Object.ReferenceEquals(resourceMan, Nothing) Then
@@ -44,17 +45,17 @@ Namespace My.Resources
Return resourceMan
End Get
End Property
-
+
'''<summary>
''' Overrides the current thread's CurrentUICulture property for all
''' resource lookups using this strongly typed resource class.
'''</summary>
- <Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)> _
+ <Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)> _
Friend Property Culture() As Global.System.Globalization.CultureInfo
Get
Return resourceCulture
End Get
- Set(ByVal value As Global.System.Globalization.CultureInfo)
+ Set
resourceCulture = value
End Set
End Property
Modified: devicemap/trunk/devicemap/vbnet/DeviceMapConsole/My Project/Settings.Designer.vb
URL: http://svn.apache.org/viewvc/devicemap/trunk/devicemap/vbnet/DeviceMapConsole/My%20Project/Settings.Designer.vb?rev=1664339&r1=1664338&r2=1664339&view=diff
==============================================================================
--- devicemap/trunk/devicemap/vbnet/DeviceMapConsole/My Project/Settings.Designer.vb (original)
+++ devicemap/trunk/devicemap/vbnet/DeviceMapConsole/My Project/Settings.Designer.vb Thu Mar 5 13:21:54 2015
@@ -13,42 +13,42 @@ Option Explicit On
Namespace My
-
- <Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(), _
- Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0"), _
- Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)> _
+
+ <Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(), _
+ Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "12.0.0.0"), _
+ Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)> _
Partial Friend NotInheritable Class MySettings
Inherits Global.System.Configuration.ApplicationSettingsBase
-
- Private Shared defaultInstance As MySettings = CType(Global.System.Configuration.ApplicationSettingsBase.Synchronized(New MySettings), MySettings)
-
+
+ Private Shared defaultInstance As MySettings = CType(Global.System.Configuration.ApplicationSettingsBase.Synchronized(New MySettings()),MySettings)
+
#Region "My.Settings Auto-Save Functionality"
#If _MyType = "WindowsForms" Then
- Private Shared addedHandler As Boolean
+ Private Shared addedHandler As Boolean
- Private Shared addedHandlerLockObject As New Object
+ Private Shared addedHandlerLockObject As New Object
- <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)> _
- Private Shared Sub AutoSaveSettings(ByVal sender As Global.System.Object, ByVal e As Global.System.EventArgs)
- If My.Application.SaveMySettingsOnExit Then
- My.Settings.Save()
- End If
- End Sub
+ <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)> _
+ Private Shared Sub AutoSaveSettings(ByVal sender As Global.System.Object, ByVal e As Global.System.EventArgs)
+ If My.Application.SaveMySettingsOnExit Then
+ My.Settings.Save()
+ End If
+ End Sub
#End If
#End Region
-
+
Public Shared ReadOnly Property [Default]() As MySettings
Get
-
+
#If _MyType = "WindowsForms" Then
- If Not addedHandler Then
- SyncLock addedHandlerLockObject
- If Not addedHandler Then
- AddHandler My.Application.Shutdown, AddressOf AutoSaveSettings
- addedHandler = True
- End If
- End SyncLock
- End If
+ If Not addedHandler Then
+ SyncLock addedHandlerLockObject
+ If Not addedHandler Then
+ AddHandler My.Application.Shutdown, AddressOf AutoSaveSettings
+ addedHandler = True
+ End If
+ End SyncLock
+ End If
#End If
Return defaultInstance
End Get