diff --git a/.gitignore b/.gitignore index 74eb345..87b4716 100644 --- a/.gitignore +++ b/.gitignore @@ -158,3 +158,5 @@ $RECYCLE.BIN/ packages/* *.nupkg !packages/build/ + +.vs/ \ No newline at end of file diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..592d6de --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "Common.Native"] + path = Common.Native + url = https://github.com/ckaczor/Common.Native.git diff --git a/ChrisKaczor.pfx b/ChrisKaczor.pfx deleted file mode 100644 index fe27207..0000000 Binary files a/ChrisKaczor.pfx and /dev/null differ diff --git a/Common.Native b/Common.Native new file mode 160000 index 0000000..5022d64 --- /dev/null +++ b/Common.Native @@ -0,0 +1 @@ +Subproject commit 5022d644f2af6b736cd25901843979ece5981dd1 diff --git a/Common.Wpf.csproj b/Common.Wpf.csproj index bac7e9a..a03d624 100644 --- a/Common.Wpf.csproj +++ b/Common.Wpf.csproj @@ -14,8 +14,9 @@ 512 {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} 4 - true - ChrisKaczor.pfx + false + + 3.5 @@ -135,6 +136,9 @@ false + + packages\System.Windows.Interactivity.WPF.2.0.20525\lib\net40\Microsoft.Expression.Interactions.dll + @@ -143,8 +147,8 @@ - - ..\FloatingStatusWindowLibrary\packages\Expression.Blend.Sdk.1.0.2\lib\net45\System.Windows.Interactivity.dll + + packages\System.Windows.Interactivity.WPF.2.0.20525\lib\net40\System.Windows.Interactivity.dll @@ -260,16 +264,19 @@ - + + + + + + {ed1c07a1-54f5-4796-8b06-2a0bb1960d84} Common.Native - - + -