diff --git a/AllSamples.sln b/AllSamples.sln
deleted file mode 100644
index 5272eb8..0000000
--- a/AllSamples.sln
+++ /dev/null
@@ -1,107 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lidgren.Network", "Lidgren.Network\Lidgren.Network.csproj", "{FA245447-5F23-4AA1-BD5F-8D2DDF33CFBD}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitTests", "UnitTests\UnitTests.csproj", "{9D7AC4F7-39CD-4BC8-8F45-00B67C196340}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Samples", "Samples", "{DA6697E7-4DD4-45EF-90A7-2FC265855019}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SamplesCommon", "Samples\SamplesCommon\SamplesCommon.csproj", "{773069DA-B66E-4667-ADCB-0D215AD8CF3E}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ImageServer", "Samples\ImageServer\ImageServer.csproj", "{36382EFB-BE9E-45B3-BEC8-E70F65CDF868}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ImageClient", "Samples\ImageClient\ImageClient.csproj", "{69E64B8C-4736-4334-87BF-DD631A3AD144}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ChatServer", "Samples\ChatServer\ChatServer.csproj", "{E2711561-B3C9-4580-B054-891CE54E15EE}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ChatClient", "Samples\ChatClient\ChatClient.csproj", "{321F68AE-7F97-415E-A3F9-7C477EFF95EE}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DurableServer", "Samples\DurableServer\DurableServer.csproj", "{034984CA-FB37-44AF-BBF9-EC58ED75F5F3}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DurableClient", "Samples\DurableClient\DurableClient.csproj", "{0B4B02BB-0F43-4466-A369-0682281AF60E}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BarebonesServer", "Samples\BarebonesServer\BarebonesServer.csproj", "{438173C5-8E95-4AE1-AAAB-5C1009F05302}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BarebonesClient", "Samples\BarebonesClient\BarebonesClient.csproj", "{BC0CBAEE-70FE-4B1E-A2FA-BCC731F1E48F}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ManyServer", "Samples\ManyServer\ManyServer.csproj", "{44EFFA4A-C7FC-4C45-B84D-F13A391EF4E7}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ManyClients", "Samples\ManyClients\ManyClients.csproj", "{A41772F5-F20F-408D-ABD1-5D1C144853C6}"
-EndProject
-Global
- GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug|Any CPU = Debug|Any CPU
- Release|Any CPU = Release|Any CPU
- EndGlobalSection
- GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {FA245447-5F23-4AA1-BD5F-8D2DDF33CFBD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {FA245447-5F23-4AA1-BD5F-8D2DDF33CFBD}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {FA245447-5F23-4AA1-BD5F-8D2DDF33CFBD}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {FA245447-5F23-4AA1-BD5F-8D2DDF33CFBD}.Release|Any CPU.Build.0 = Release|Any CPU
- {9D7AC4F7-39CD-4BC8-8F45-00B67C196340}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {9D7AC4F7-39CD-4BC8-8F45-00B67C196340}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {9D7AC4F7-39CD-4BC8-8F45-00B67C196340}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {9D7AC4F7-39CD-4BC8-8F45-00B67C196340}.Release|Any CPU.Build.0 = Release|Any CPU
- {773069DA-B66E-4667-ADCB-0D215AD8CF3E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {773069DA-B66E-4667-ADCB-0D215AD8CF3E}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {773069DA-B66E-4667-ADCB-0D215AD8CF3E}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {773069DA-B66E-4667-ADCB-0D215AD8CF3E}.Release|Any CPU.Build.0 = Release|Any CPU
- {36382EFB-BE9E-45B3-BEC8-E70F65CDF868}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {36382EFB-BE9E-45B3-BEC8-E70F65CDF868}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {36382EFB-BE9E-45B3-BEC8-E70F65CDF868}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {36382EFB-BE9E-45B3-BEC8-E70F65CDF868}.Release|Any CPU.Build.0 = Release|Any CPU
- {69E64B8C-4736-4334-87BF-DD631A3AD144}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {69E64B8C-4736-4334-87BF-DD631A3AD144}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {69E64B8C-4736-4334-87BF-DD631A3AD144}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {69E64B8C-4736-4334-87BF-DD631A3AD144}.Release|Any CPU.Build.0 = Release|Any CPU
- {E2711561-B3C9-4580-B054-891CE54E15EE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {E2711561-B3C9-4580-B054-891CE54E15EE}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {E2711561-B3C9-4580-B054-891CE54E15EE}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {E2711561-B3C9-4580-B054-891CE54E15EE}.Release|Any CPU.Build.0 = Release|Any CPU
- {321F68AE-7F97-415E-A3F9-7C477EFF95EE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {321F68AE-7F97-415E-A3F9-7C477EFF95EE}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {321F68AE-7F97-415E-A3F9-7C477EFF95EE}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {321F68AE-7F97-415E-A3F9-7C477EFF95EE}.Release|Any CPU.Build.0 = Release|Any CPU
- {034984CA-FB37-44AF-BBF9-EC58ED75F5F3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {034984CA-FB37-44AF-BBF9-EC58ED75F5F3}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {034984CA-FB37-44AF-BBF9-EC58ED75F5F3}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {034984CA-FB37-44AF-BBF9-EC58ED75F5F3}.Release|Any CPU.Build.0 = Release|Any CPU
- {0B4B02BB-0F43-4466-A369-0682281AF60E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {0B4B02BB-0F43-4466-A369-0682281AF60E}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {0B4B02BB-0F43-4466-A369-0682281AF60E}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {0B4B02BB-0F43-4466-A369-0682281AF60E}.Release|Any CPU.Build.0 = Release|Any CPU
- {438173C5-8E95-4AE1-AAAB-5C1009F05302}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {438173C5-8E95-4AE1-AAAB-5C1009F05302}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {438173C5-8E95-4AE1-AAAB-5C1009F05302}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {438173C5-8E95-4AE1-AAAB-5C1009F05302}.Release|Any CPU.Build.0 = Release|Any CPU
- {BC0CBAEE-70FE-4B1E-A2FA-BCC731F1E48F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {BC0CBAEE-70FE-4B1E-A2FA-BCC731F1E48F}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {BC0CBAEE-70FE-4B1E-A2FA-BCC731F1E48F}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {BC0CBAEE-70FE-4B1E-A2FA-BCC731F1E48F}.Release|Any CPU.Build.0 = Release|Any CPU
- {44EFFA4A-C7FC-4C45-B84D-F13A391EF4E7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {44EFFA4A-C7FC-4C45-B84D-F13A391EF4E7}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {44EFFA4A-C7FC-4C45-B84D-F13A391EF4E7}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {44EFFA4A-C7FC-4C45-B84D-F13A391EF4E7}.Release|Any CPU.Build.0 = Release|Any CPU
- {A41772F5-F20F-408D-ABD1-5D1C144853C6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {A41772F5-F20F-408D-ABD1-5D1C144853C6}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {A41772F5-F20F-408D-ABD1-5D1C144853C6}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {A41772F5-F20F-408D-ABD1-5D1C144853C6}.Release|Any CPU.Build.0 = Release|Any CPU
- EndGlobalSection
- GlobalSection(SolutionProperties) = preSolution
- HideSolutionNode = FALSE
- EndGlobalSection
- GlobalSection(NestedProjects) = preSolution
- {773069DA-B66E-4667-ADCB-0D215AD8CF3E} = {DA6697E7-4DD4-45EF-90A7-2FC265855019}
- {36382EFB-BE9E-45B3-BEC8-E70F65CDF868} = {DA6697E7-4DD4-45EF-90A7-2FC265855019}
- {69E64B8C-4736-4334-87BF-DD631A3AD144} = {DA6697E7-4DD4-45EF-90A7-2FC265855019}
- {E2711561-B3C9-4580-B054-891CE54E15EE} = {DA6697E7-4DD4-45EF-90A7-2FC265855019}
- {321F68AE-7F97-415E-A3F9-7C477EFF95EE} = {DA6697E7-4DD4-45EF-90A7-2FC265855019}
- {034984CA-FB37-44AF-BBF9-EC58ED75F5F3} = {DA6697E7-4DD4-45EF-90A7-2FC265855019}
- {0B4B02BB-0F43-4466-A369-0682281AF60E} = {DA6697E7-4DD4-45EF-90A7-2FC265855019}
- {438173C5-8E95-4AE1-AAAB-5C1009F05302} = {DA6697E7-4DD4-45EF-90A7-2FC265855019}
- {BC0CBAEE-70FE-4B1E-A2FA-BCC731F1E48F} = {DA6697E7-4DD4-45EF-90A7-2FC265855019}
- {44EFFA4A-C7FC-4C45-B84D-F13A391EF4E7} = {DA6697E7-4DD4-45EF-90A7-2FC265855019}
- {A41772F5-F20F-408D-ABD1-5D1C144853C6} = {DA6697E7-4DD4-45EF-90A7-2FC265855019}
- EndGlobalSection
-EndGlobal
diff --git a/Lidgren.Network.sln b/Lidgren.Network.sln
new file mode 100644
index 0000000..3384fb7
--- /dev/null
+++ b/Lidgren.Network.sln
@@ -0,0 +1,26 @@
+
+Microsoft Visual Studio Solution File, Format Version 10.00
+# Visual Studio 2008
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lidgren.Network", "Lidgren.Network\Lidgren.Network.csproj", "{AE483C29-042E-4226-BA52-D247CE7676DA}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitTests", "UnitTests\UnitTests.csproj", "{1515E834-F71E-4D9C-B601-74C709D3A0AE}"
+EndProject
+Global
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|Any CPU = Debug|Any CPU
+ Release|Any CPU = Release|Any CPU
+ EndGlobalSection
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {AE483C29-042E-4226-BA52-D247CE7676DA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {AE483C29-042E-4226-BA52-D247CE7676DA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {AE483C29-042E-4226-BA52-D247CE7676DA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {AE483C29-042E-4226-BA52-D247CE7676DA}.Release|Any CPU.Build.0 = Release|Any CPU
+ {1515E834-F71E-4D9C-B601-74C709D3A0AE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {1515E834-F71E-4D9C-B601-74C709D3A0AE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {1515E834-F71E-4D9C-B601-74C709D3A0AE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {1515E834-F71E-4D9C-B601-74C709D3A0AE}.Release|Any CPU.Build.0 = Release|Any CPU
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ EndGlobalSection
+EndGlobal
diff --git a/Lidgren.Network/Lidgren.Network.csproj b/Lidgren.Network/Lidgren.Network.csproj
index 829602c..52f2def 100644
--- a/Lidgren.Network/Lidgren.Network.csproj
+++ b/Lidgren.Network/Lidgren.Network.csproj
@@ -5,13 +5,21 @@
AnyCPU
9.0.21022
2.0
- {FA245447-5F23-4AA1-BD5F-8D2DDF33CFBD}
+ {AE483C29-042E-4226-BA52-D247CE7676DA}
Library
Properties
Lidgren.Network
Lidgren.Network
v3.5
512
+
+
+
+
+
+
+
+
true
@@ -21,7 +29,6 @@
DEBUG;TRACE
prompt
4
- true
pdbonly
@@ -30,64 +37,76 @@
TRACE
prompt
4
- true
+
+ 3.5
+
+
+ 3.5
+
+
+ 3.5
+
-
-
-
-
+
+
+
-
+
-
-
-
+
-
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ text/microsoft-resx
+
+
+ 2.0
+
+
+ System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
\ No newline at end of file
diff --git a/Samples/SamplesCommon/Properties/AssemblyInfo.cs b/Samples/SamplesCommon/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000..f121a97
--- /dev/null
+++ b/Samples/SamplesCommon/Properties/AssemblyInfo.cs
@@ -0,0 +1,36 @@
+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("SamplesCommon")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("Microsoft")]
+[assembly: AssemblyProduct("SamplesCommon")]
+[assembly: AssemblyCopyright("Copyright © Microsoft 2010")]
+[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("7d1622f4-1dc7-4e94-8ec0-0a2a295dcf9a")]
+
+// 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")]
diff --git a/Samples/SamplesCommon/SamplesCommon.csproj b/Samples/SamplesCommon/SamplesCommon.csproj
new file mode 100644
index 0000000..f7fbfa5
--- /dev/null
+++ b/Samples/SamplesCommon/SamplesCommon.csproj
@@ -0,0 +1,80 @@
+
+
+
+ Debug
+ AnyCPU
+ 9.0.21022
+ 2.0
+ {773069DA-B66E-4667-ADCB-0D215AD8CF3E}
+ Library
+ Properties
+ SamplesCommon
+ SamplesCommon
+ v3.5
+ 512
+
+
+
+
+
+
+
+
+
+
+ true
+ full
+ false
+ bin\Debug\
+ DEBUG;TRACE
+ prompt
+ 4
+
+
+ pdbonly
+ true
+ bin\Release\
+ TRACE
+ prompt
+ 4
+
+
+
+
+ 3.5
+
+
+
+
+
+
+
+
+ Form
+
+
+ NetPeerSettingsWindow.cs
+
+
+
+
+
+ NetPeerSettingsWindow.cs
+ Designer
+
+
+
+
+ {AE483C29-042E-4226-BA52-D247CE7676DA}
+ Lidgren.Network
+
+
+
+
+
\ No newline at end of file
diff --git a/UnitTests/UnitTests.csproj b/UnitTests/UnitTests.csproj
index ddf2e0a..09124cd 100644
--- a/UnitTests/UnitTests.csproj
+++ b/UnitTests/UnitTests.csproj
@@ -12,10 +12,14 @@
UnitTests
v3.5
512
- SAK
- SAK
- SAK
- SAK
+
+
+
+
+
+
+
+
true
diff --git a/lidgren-network-gen3-backup.7z b/lidgren-network-gen3-backup.7z
new file mode 100644
index 0000000..70026fb
Binary files /dev/null and b/lidgren-network-gen3-backup.7z differ