devicemap-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wk...@apache.org
Subject svn commit: r1696061 - in /devicemap/trunk/clients/1.0/csharp: DeviceMap/Properties/AssemblyInfo.cs DeviceMapConsole/App.config DeviceMapConsole/DeviceMapConsole.csproj DeviceMapConsole/Program.cs DeviceMapConsole/Properties/AssemblyInfo.cs
Date Sat, 15 Aug 2015 16:04:42 GMT
Author: wkeil
Date: Sat Aug 15 16:04:42 2015
New Revision: 1696061

URL: http://svn.apache.org/r1696061
Log:
DMAP-172: Build .NET clients with Visual Studio Code 

Task-Url: https://issues.apache.org/jira/browse/DMAP-172

Modified:
    devicemap/trunk/clients/1.0/csharp/DeviceMap/Properties/AssemblyInfo.cs
    devicemap/trunk/clients/1.0/csharp/DeviceMapConsole/App.config
    devicemap/trunk/clients/1.0/csharp/DeviceMapConsole/DeviceMapConsole.csproj
    devicemap/trunk/clients/1.0/csharp/DeviceMapConsole/Program.cs
    devicemap/trunk/clients/1.0/csharp/DeviceMapConsole/Properties/AssemblyInfo.cs

Modified: devicemap/trunk/clients/1.0/csharp/DeviceMap/Properties/AssemblyInfo.cs
URL: http://svn.apache.org/viewvc/devicemap/trunk/clients/1.0/csharp/DeviceMap/Properties/AssemblyInfo.cs?rev=1696061&r1=1696060&r2=1696061&view=diff
==============================================================================
--- devicemap/trunk/clients/1.0/csharp/DeviceMap/Properties/AssemblyInfo.cs (original)
+++ devicemap/trunk/clients/1.0/csharp/DeviceMap/Properties/AssemblyInfo.cs Sat Aug 15 16:04:42
2015
@@ -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.1.0.0")]
-[assembly: AssemblyFileVersion("1.1.0.0")]
+[assembly: AssemblyVersion("1.0.1.0")]
+[assembly: AssemblyFileVersion("1.0.1.0")]

Modified: devicemap/trunk/clients/1.0/csharp/DeviceMapConsole/App.config
URL: http://svn.apache.org/viewvc/devicemap/trunk/clients/1.0/csharp/DeviceMapConsole/App.config?rev=1696061&r1=1696060&r2=1696061&view=diff
==============================================================================
--- devicemap/trunk/clients/1.0/csharp/DeviceMapConsole/App.config (original)
+++ devicemap/trunk/clients/1.0/csharp/DeviceMapConsole/App.config Sat Aug 15 16:04:42 2015
@@ -1,8 +1,9 @@
 <?xml version="1.0"?>
 <configuration>
   <connectionStrings>
+    <!--
     <add name="_DeviceMap" connectionString="C:\Ddr\Resources"/>
-    <add name="_DeviceMap2" connectionString="http://svn.apache.org/repos/asf/incubator/devicemap/trunk/data/device-data/src/main/resources/devicedata"/>
<!-- Deprecated -->
+    <add name="_DeviceMap2" connectionString="http://svn.apache.org/repos/asf/incubator/devicemap/trunk/data/device-data/src/main/resources/devicedata"/>
--> <!-- Deprecated -->
     <add name="DeviceMap" connectionString ="http://devicemap-vm.apache.org/data/latest/"/>
   </connectionStrings>   
     <startup> 

Modified: devicemap/trunk/clients/1.0/csharp/DeviceMapConsole/DeviceMapConsole.csproj
URL: http://svn.apache.org/viewvc/devicemap/trunk/clients/1.0/csharp/DeviceMapConsole/DeviceMapConsole.csproj?rev=1696061&r1=1696060&r2=1696061&view=diff
==============================================================================
--- devicemap/trunk/clients/1.0/csharp/DeviceMapConsole/DeviceMapConsole.csproj (original)
+++ devicemap/trunk/clients/1.0/csharp/DeviceMapConsole/DeviceMapConsole.csproj Sat Aug 15
16:04:42 2015
@@ -13,6 +13,23 @@
     <FileAlignment>512</FileAlignment>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <TargetFrameworkProfile />
+    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <PublishUrl>publish\</PublishUrl>
+    <Install>true</Install>
+    <InstallFrom>Disk</InstallFrom>
+    <UpdateEnabled>false</UpdateEnabled>
+    <UpdateMode>Foreground</UpdateMode>
+    <UpdateInterval>7</UpdateInterval>
+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+    <UpdatePeriodically>false</UpdatePeriodically>
+    <UpdateRequired>false</UpdateRequired>
+    <MapFileExtensions>true</MapFileExtensions>
+    <AutorunEnabled>true</AutorunEnabled>
+    <ApplicationRevision>1</ApplicationRevision>
+    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+    <UseApplicationTrust>false</UseApplicationTrust>
+    <PublishWizardCompleted>true</PublishWizardCompleted>
+    <BootstrapperEnabled>true</BootstrapperEnabled>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -37,8 +54,20 @@
     <ApplicationIcon>DeviceMap-ASF.ico</ApplicationIcon>
   </PropertyGroup>
   <PropertyGroup>
-    <StartupObject>
-    </StartupObject>
+    <StartupObject>Program</StartupObject>
+  </PropertyGroup>
+  <PropertyGroup>
+    <ManifestCertificateThumbprint>2B4EB5845A963C683DC9398D1589048058EC6DA3</ManifestCertificateThumbprint>
+  </PropertyGroup>
+  <PropertyGroup>
+    <ManifestKeyFile>
+    </ManifestKeyFile>
+  </PropertyGroup>
+  <PropertyGroup>
+    <GenerateManifests>true</GenerateManifests>
+  </PropertyGroup>
+  <PropertyGroup>
+    <SignManifests>false</SignManifests>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
@@ -57,6 +86,7 @@
     <None Include="App.config">
       <SubType>Designer</SubType>
     </None>
+    <None Include="DeviceMapConsole_TemporaryKey.pfx" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="DeviceMap-ASF.ico" />
@@ -70,6 +100,23 @@
       <Name>DeviceMap</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <BootstrapperPackage Include=".NETFramework,Version=v4.0">
+      <Visible>False</Visible>
+      <ProductName>Microsoft .NET Framework 4 %28x86 and x64%29</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Windows.Installer.4.5">
+      <Visible>False</Visible>
+      <ProductName>Windows Installer 4.5</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and
uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

Modified: devicemap/trunk/clients/1.0/csharp/DeviceMapConsole/Program.cs
URL: http://svn.apache.org/viewvc/devicemap/trunk/clients/1.0/csharp/DeviceMapConsole/Program.cs?rev=1696061&r1=1696060&r2=1696061&view=diff
==============================================================================
--- devicemap/trunk/clients/1.0/csharp/DeviceMapConsole/Program.cs (original)
+++ devicemap/trunk/clients/1.0/csharp/DeviceMapConsole/Program.cs Sat Aug 15 16:04:42 2015
@@ -21,8 +21,6 @@ using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using DeviceMap;
 class Program
 {

Modified: devicemap/trunk/clients/1.0/csharp/DeviceMapConsole/Properties/AssemblyInfo.cs
URL: http://svn.apache.org/viewvc/devicemap/trunk/clients/1.0/csharp/DeviceMapConsole/Properties/AssemblyInfo.cs?rev=1696061&r1=1696060&r2=1696061&view=diff
==============================================================================
--- devicemap/trunk/clients/1.0/csharp/DeviceMapConsole/Properties/AssemblyInfo.cs (original)
+++ devicemap/trunk/clients/1.0/csharp/DeviceMapConsole/Properties/AssemblyInfo.cs Sat Aug
15 16:04:42 2015
@@ -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.1.0.0")]
-[assembly: AssemblyFileVersion("1.1.0.0")]
+[assembly: AssemblyVersion("1.0.1.0")]
+[assembly: AssemblyFileVersion("1.0.1.0")]



Mime
View raw message