Fisheye: Tag 1548 refers to a dead (removed) revision in file `DamClients/DamLive/trunk/src/build/Deltares.Dam.Version.targets'.
Fisheye: No comparison available. Pass `N' to diff?
Index: DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/Deltares.DamLive.Tests.csproj
===================================================================
diff -u
--- DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/Deltares.DamLive.Tests.csproj (revision 0)
+++ DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/Deltares.DamLive.Tests.csproj (revision 1548)
@@ -0,0 +1,54 @@
+
+
+
+
+ Debug
+ AnyCPU
+ {6C4EC8AD-4B8E-4D99-8F27-63C3B232ECC4}
+ Library
+ Properties
+ Deltares.DamLive.Tests
+ Deltares.DamLive.Tests
+ v4.5
+ 512
+
+
+ true
+ ..\bin\Debug\
+ DEBUG;TRACE
+ full
+ x86
+ prompt
+ MinimumRecommendedRules.ruleset
+
+
+ ..\bin\Release\
+ TRACE
+ true
+ pdbonly
+ x86
+ prompt
+ MinimumRecommendedRules.ruleset
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
Index: DamClients/DamLive/trunk/src/Deltares.Dam.Application.Live/Deltares.Dam.Application.Live.csproj
===================================================================
diff -u -r1545 -r1548
--- DamClients/DamLive/trunk/src/Deltares.Dam.Application.Live/Deltares.Dam.Application.Live.csproj (.../Deltares.Dam.Application.Live.csproj) (revision 1545)
+++ DamClients/DamLive/trunk/src/Deltares.Dam.Application.Live/Deltares.Dam.Application.Live.csproj (.../Deltares.Dam.Application.Live.csproj) (revision 1548)
@@ -141,7 +141,7 @@
PreserveNewest
-
+
Index: DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/Properties/AssemblyInfo.cs
===================================================================
diff -u
--- DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/Properties/AssemblyInfo.cs (revision 0)
+++ DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/Properties/AssemblyInfo.cs (revision 1548)
@@ -0,0 +1,10 @@
+using System.Reflection;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("Deltares.DamLive.Tests")]
+[assembly: AssemblyDescription("")]
+[assembly: ComVisible(false)]
+[assembly: Guid("6c4ec8ad-4b8e-4d99-8f27-63c3b232ecc4")]
Index: DamClients/DamLive/trunk/src/Deltares.DamLive.Version/Properties/AssemblyInfo.cs
===================================================================
diff -u -r1545 -r1548
--- DamClients/DamLive/trunk/src/Deltares.DamLive.Version/Properties/AssemblyInfo.cs (.../AssemblyInfo.cs) (revision 1545)
+++ DamClients/DamLive/trunk/src/Deltares.DamLive.Version/Properties/AssemblyInfo.cs (.../AssemblyInfo.cs) (revision 1548)
@@ -20,38 +20,12 @@
// All rights reserved.
using System.Reflection;
-using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyTitle("Deltares.DamLive.Version")]
[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Microsoft")]
-[assembly: AssemblyProduct("Deltares.DamLive.Version")]
-[assembly: AssemblyCopyright("Copyright © Microsoft 2018")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components. If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: Guid("a40c9407-ed80-4438-9e0e-e7bed8353d3b")]
-
-// Version information for an assembly consists of the following four values:
-//
-// Major Version
-// Minor Version
-// Build Number
-// Revision
-//
-// 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")]
Index: DamClients/DamLive/trunk/src/Deltares.DamLive.Version/GlobalAssembly.cs.svn
===================================================================
diff -u
--- DamClients/DamLive/trunk/src/Deltares.DamLive.Version/GlobalAssembly.cs.svn (revision 0)
+++ DamClients/DamLive/trunk/src/Deltares.DamLive.Version/GlobalAssembly.cs.svn (revision 1548)
@@ -0,0 +1,13 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("Deltares")]
+[assembly: AssemblyCopyright("Copyright © Deltares 2012-2018")]
+[assembly: AssemblyProduct("DAM (Dijksterkte Analyse Module)")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+[assembly: AssemblyVersion("18.1.0.SVNREV")]
+[assembly: AssemblyFileVersion("18.1.0.SVNREV")]
\ No newline at end of file
Index: DamClients/DamLive/trunk/src/Deltares.Dam.Application.Live/Properties/AssemblyInfo.cs
===================================================================
diff -u -r1545 -r1548
--- DamClients/DamLive/trunk/src/Deltares.Dam.Application.Live/Properties/AssemblyInfo.cs (.../AssemblyInfo.cs) (revision 1545)
+++ DamClients/DamLive/trunk/src/Deltares.Dam.Application.Live/Properties/AssemblyInfo.cs (.../AssemblyInfo.cs) (revision 1548)
@@ -20,41 +20,12 @@
// All rights reserved.
using System.Reflection;
-using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyTitle("DamLive")]
[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Deltares")]
-[assembly: AssemblyProduct("DamLive")]
-[assembly: AssemblyCopyright("Deltares Copyright � 2012-2018")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components. If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: Guid("a43f4365-f535-4f3a-b927-2b8ae3014bae")]
-
-// Version information for an assembly consists of the following four values:
-//
-// Major Version
-// Minor Version
-// Build Number
-// Revision
-//
-// 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("17.1.0.1442")]
-[assembly: AssemblyFileVersion("17.1.0.1442")]
-[assembly: InternalsVisibleTo("Deltares.Dam.Application.Live.Tests")]
-[assembly: InternalsVisibleTo("Deltares.Dam.IntegrationTests")]
-
Index: DamClients/DamLive/trunk/src/DamLive.sln
===================================================================
diff -u -r1538 -r1548
--- DamClients/DamLive/trunk/src/DamLive.sln (.../DamLive.sln) (revision 1538)
+++ DamClients/DamLive/trunk/src/DamLive.sln (.../DamLive.sln) (revision 1548)
@@ -42,6 +42,15 @@
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Deltares.DamLive.Version", "Deltares.DamLive.Version\Deltares.DamLive.Version.csproj", "{A40C9407-ED80-4438-9E0E-E7BED8353D3B}"
EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Deltares.DamLive.Tests", "Deltares.DamLive.Tests\Deltares.DamLive.Tests.csproj", "{6C4EC8AD-4B8E-4D99-8F27-63C3B232ECC4}"
+ ProjectSection(ProjectDependencies) = postProject
+ {A40C9407-ED80-4438-9E0E-E7BED8353D3B} = {A40C9407-ED80-4438-9E0E-E7BED8353D3B}
+ {F1CD9620-15CF-41F8-AF70-5AE004A50F60} = {F1CD9620-15CF-41F8-AF70-5AE004A50F60}
+ {48691761-637B-4EFF-A04C-2047E5FA9843} = {48691761-637B-4EFF-A04C-2047E5FA9843}
+ {17F76A8E-C9F4-415F-8D4B-0E8A3B36E665} = {17F76A8E-C9F4-415F-8D4B-0E8A3B36E665}
+ {09DD9498-9259-44BC-A84E-DA6B7DEDB133} = {09DD9498-9259-44BC-A84E-DA6B7DEDB133}
+ EndProjectSection
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|x86 = Debug|x86
@@ -68,6 +77,10 @@
{A40C9407-ED80-4438-9E0E-E7BED8353D3B}.Debug|x86.Build.0 = Debug|x86
{A40C9407-ED80-4438-9E0E-E7BED8353D3B}.Release|x86.ActiveCfg = Release|x86
{A40C9407-ED80-4438-9E0E-E7BED8353D3B}.Release|x86.Build.0 = Release|x86
+ {6C4EC8AD-4B8E-4D99-8F27-63C3B232ECC4}.Debug|x86.ActiveCfg = Debug|x86
+ {6C4EC8AD-4B8E-4D99-8F27-63C3B232ECC4}.Debug|x86.Build.0 = Debug|x86
+ {6C4EC8AD-4B8E-4D99-8F27-63C3B232ECC4}.Release|x86.ActiveCfg = Release|x86
+ {6C4EC8AD-4B8E-4D99-8F27-63C3B232ECC4}.Release|x86.Build.0 = Release|x86
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -80,5 +93,6 @@
{48691761-637B-4EFF-A04C-2047E5FA9843} = {F6A85256-50BA-4E97-8E3C-D8D488DFAF44}
{09DD9498-9259-44BC-A84E-DA6B7DEDB133} = {95699CCD-37A6-4F2E-9462-F2F474AD8AE8}
{A40C9407-ED80-4438-9E0E-E7BED8353D3B} = {31A32A36-649A-41A8-9F43-6A6193C04770}
+ {6C4EC8AD-4B8E-4D99-8F27-63C3B232ECC4} = {62CC2363-893F-4ECD-BCD6-AA7150AD6918}
EndGlobalSection
EndGlobal
Index: DamClients/DamLive/trunk/src/build/Deltares.Dam.Version.targets
===================================================================
diff -u -r1527 -r1548
--- DamClients/DamLive/trunk/src/build/Deltares.Dam.Version.targets (.../Deltares.Dam.Version.targets) (revision 1527)
+++ DamClients/DamLive/trunk/src/build/Deltares.Dam.Version.targets (.../Deltares.DamLive.Version.targets) (revision 1548)
@@ -28,7 +28,7 @@
-
+
GlobalAssembly.cs
Index: DamClients/DamLive/trunk/src/Deltares.DamLive.Version/Deltares.DamLive.Version.csproj
===================================================================
diff -u -r1545 -r1548
--- DamClients/DamLive/trunk/src/Deltares.DamLive.Version/Deltares.DamLive.Version.csproj (.../Deltares.DamLive.Version.csproj) (revision 1545)
+++ DamClients/DamLive/trunk/src/Deltares.DamLive.Version/Deltares.DamLive.Version.csproj (.../Deltares.DamLive.Version.csproj) (revision 1548)
@@ -47,8 +47,12 @@
Copying.GPL.licenseheader
+
-
+
+
+ "$(ProjectDir)..\..\utils\svn_insert_version.cmd" "$(ProjectDir)" GlobalAssembly.cs.svn GlobalAssembly.cs
+