1.1.0-RC1

dnp3 · Mar 12, 2013 · 0ca8b1e · 0ca8b1e
1 parent bc0fa34
commit 0ca8b1e
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 10 deletions.
diff --git a/clr/DNP3CLRAdapter/DNP3CLRAdapter.vcxproj b/clr/DNP3CLRAdapter/DNP3CLRAdapter.vcxproj
@@ -132,6 +132,8 @@
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <AdditionalDependencies />
+      <Version>
+      </Version>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

diff --git a/clr/DNP3CLRInterface/DNP3CLRInterface.csproj b/clr/DNP3CLRInterface/DNP3CLRInterface.csproj
@@ -68,6 +68,11 @@
     <Compile Include="OutstationResponses.cs" />
     <Compile Include="PrintingDataObserver.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Properties\Settings.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTimeSharedInput>True</DesignTimeSharedInput>
+      <DependentUpon>Settings.settings</DependentUpon>
+    </Compile>
     <Compile Include="SerialSettings.cs" />
     <Compile Include="SimpleCommandHandler.cs" />
     <Compile Include="StackState.cs" />
@@ -76,6 +81,11 @@
     <None Include="..\..\file.licenseheader">
       <Link>file.licenseheader</Link>
     </None>
+    <None Include="app.config" />
+    <None Include="Properties\Settings.settings">
+      <Generator>SettingsSingleFileGenerator</Generator>
+      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
+    </None>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

diff --git a/clr/DNP3CLRInterface/Properties/AssemblyInfo.cs b/clr/DNP3CLRInterface/Properties/AssemblyInfo.cs
@@ -35,11 +35,11 @@
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("DNP3CLRInterface")]
-[assembly: AssemblyDescription("")]
+[assembly: AssemblyDescription("Public API for opendnp3 CLR bindings")]
 [assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Microsoft")]
+[assembly: AssemblyCompany("Automatak, LLC")]
 [assembly: AssemblyProduct("DNP3CLRInterface")]
-[assembly: AssemblyCopyright("Copyright © Microsoft 2013")]
+[assembly: AssemblyCopyright("Copyright © Automatak, LLC 2013")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -61,5 +61,5 @@
 // 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")]
diff --git a/java/api/pom.xml b/java/api/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.automatak.dnp3</groupId>
         <artifactId>opendnp3-parent</artifactId>
-        <version>1.1.0-SNAPSHOT</version>
+        <version>1.1.0-RC1</version>
     </parent>
 
     <artifactId>opendnp3-api</artifactId>

diff --git a/java/bindings/pom.xml b/java/bindings/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.automatak.dnp3</groupId>
         <artifactId>opendnp3-parent</artifactId>
-        <version>1.1.0-SNAPSHOT</version>
+        <version>1.1.0-RC1</version>
     </parent>
 
     <artifactId>opendnp3-bindings</artifactId>

diff --git a/java/example/pom.xml b/java/example/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.automatak.dnp3</groupId>
         <artifactId>opendnp3-parent</artifactId>
-        <version>1.1.0-SNAPSHOT</version>
+        <version>1.1.0-RC1</version>
     </parent>
 
     <artifactId>opendnp3-example</artifactId>

diff --git a/java/opendnp3java.vcxproj b/java/opendnp3java.vcxproj
@@ -127,6 +127,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
+      <Version>110</Version>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

diff --git a/java/pom.xml b/java/pom.xml
@@ -4,7 +4,7 @@
 
     <groupId>com.automatak.dnp3</groupId>
     <artifactId>opendnp3-parent</artifactId>
-    <version>1.1.0-SNAPSHOT</version>
+    <version>1.1.0-RC1</version>
     <packaging>pom</packaging>
 
     <name>opendnp3</name>
@@ -24,7 +24,7 @@
         <maven-scala.plugin.version>3.1.3</maven-scala.plugin.version>
         <maven-source-plugin.version>2.1.2</maven-source-plugin.version>
         <maven-bundle.version>2.1.0</maven-bundle.version>
-        <opendnp3.version>1.1.0-SNAPSHOT</opendnp3.version>
+        <opendnp3.version>1.1.0-RC1</opendnp3.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <scala.version.short>2.10</scala.version.short>
         <scala.version>2.10.0</scala.version>