diff --git a/ETS-WS/ETS-WS/ETS-WS.csproj b/ETS-WS/ETS-WS/ETS-WS.csproj index e349c72..9720696 100644 --- a/ETS-WS/ETS-WS/ETS-WS.csproj +++ b/ETS-WS/ETS-WS/ETS-WS.csproj @@ -33,6 +33,8 @@ prompt 4 Default Web Site/ETS-WS + true + true bin\ @@ -67,15 +69,17 @@ ;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets ;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules Default Web Site/ETS-WS + true + true False ..\packages\AjaxControlToolkit.4.1.60919\lib\40\AjaxControlToolkit.dll - + False - ..\packages\AjaxMin.4.68.4663.23906\lib\net40\AjaxMin.dll + ..\packages\AjaxMin.4.74.4698.25434\lib\net40\AjaxMin.dll ..\packages\AjaxControlToolkit.4.1.60919\lib\40\SanitizerProviders\HtmlAgilityPack.dll diff --git a/ETS-WS/ETS-WS/Web.ETS.config b/ETS-WS/ETS-WS/Web.ETS.config index 6c502ac..660707a 100644 --- a/ETS-WS/ETS-WS/Web.ETS.config +++ b/ETS-WS/ETS-WS/Web.ETS.config @@ -15,20 +15,14 @@ --> - - - - + + diff --git a/ETS-WS/ETS-WS/bin/AjaxMin.dll b/ETS-WS/ETS-WS/bin/AjaxMin.dll index e76753c..b3ccf43 100644 Binary files a/ETS-WS/ETS-WS/bin/AjaxMin.dll and b/ETS-WS/ETS-WS/bin/AjaxMin.dll differ diff --git a/ETS-WS/ETS-WS/bin/ETS-WS.dll b/ETS-WS/ETS-WS/bin/ETS-WS.dll index 2b0ce1c..3209041 100644 Binary files a/ETS-WS/ETS-WS/bin/ETS-WS.dll and b/ETS-WS/ETS-WS/bin/ETS-WS.dll differ diff --git a/ETS-WS/ETS-WS/packages.config b/ETS-WS/ETS-WS/packages.config index 36993a3..be74dc8 100644 --- a/ETS-WS/ETS-WS/packages.config +++ b/ETS-WS/ETS-WS/packages.config @@ -1,7 +1,7 @@  - + diff --git a/ETS-WS/packages/AjaxMin.4.72.4679.35523/AjaxMin.4.72.4679.35523.nupkg b/ETS-WS/packages/AjaxMin.4.72.4679.35523/AjaxMin.4.72.4679.35523.nupkg deleted file mode 100644 index 3ebe984..0000000 Binary files a/ETS-WS/packages/AjaxMin.4.72.4679.35523/AjaxMin.4.72.4679.35523.nupkg and /dev/null differ diff --git a/ETS-WS/packages/AjaxMin.4.72.4679.35523/lib/net20/AjaxMin.dll b/ETS-WS/packages/AjaxMin.4.72.4679.35523/lib/net20/AjaxMin.dll deleted file mode 100644 index 917bb11..0000000 Binary files a/ETS-WS/packages/AjaxMin.4.72.4679.35523/lib/net20/AjaxMin.dll and /dev/null differ diff --git a/ETS-WS/packages/AjaxMin.4.72.4679.35523/lib/net35/AjaxMin.dll b/ETS-WS/packages/AjaxMin.4.72.4679.35523/lib/net35/AjaxMin.dll deleted file mode 100644 index ec0201b..0000000 Binary files a/ETS-WS/packages/AjaxMin.4.72.4679.35523/lib/net35/AjaxMin.dll and /dev/null differ diff --git a/ETS-WS/packages/AjaxMin.4.72.4679.35523/lib/net40/AjaxMin.dll b/ETS-WS/packages/AjaxMin.4.72.4679.35523/lib/net40/AjaxMin.dll deleted file mode 100644 index 2b2d06f..0000000 Binary files a/ETS-WS/packages/AjaxMin.4.72.4679.35523/lib/net40/AjaxMin.dll and /dev/null differ diff --git a/ETS-WS/packages/AjaxMin.4.72.4679.35523/tools/net40/AjaxMin.dll b/ETS-WS/packages/AjaxMin.4.72.4679.35523/tools/net40/AjaxMin.dll deleted file mode 100644 index 2b2d06f..0000000 Binary files a/ETS-WS/packages/AjaxMin.4.72.4679.35523/tools/net40/AjaxMin.dll and /dev/null differ diff --git a/ETS-WS/packages/AjaxMin.4.72.4679.35523/tools/net40/AjaxMinTask.dll b/ETS-WS/packages/AjaxMin.4.72.4679.35523/tools/net40/AjaxMinTask.dll deleted file mode 100644 index 6e43fc7..0000000 Binary files a/ETS-WS/packages/AjaxMin.4.72.4679.35523/tools/net40/AjaxMinTask.dll and /dev/null differ diff --git a/ETS-WS/packages/AjaxMin.4.74.4698.25434/AjaxMin.4.74.4698.25434.nupkg b/ETS-WS/packages/AjaxMin.4.74.4698.25434/AjaxMin.4.74.4698.25434.nupkg new file mode 100644 index 0000000..ee003f5 Binary files /dev/null and b/ETS-WS/packages/AjaxMin.4.74.4698.25434/AjaxMin.4.74.4698.25434.nupkg differ diff --git a/ETS-WS/packages/AjaxMin.4.72.4679.35523/AjaxMin.4.72.4679.35523.nuspec b/ETS-WS/packages/AjaxMin.4.74.4698.25434/AjaxMin.4.74.4698.25434.nuspec similarity index 95% rename from ETS-WS/packages/AjaxMin.4.72.4679.35523/AjaxMin.4.72.4679.35523.nuspec rename to ETS-WS/packages/AjaxMin.4.74.4698.25434/AjaxMin.4.74.4698.25434.nuspec index bfdece0..0ebc048 100644 --- a/ETS-WS/packages/AjaxMin.4.72.4679.35523/AjaxMin.4.72.4679.35523.nuspec +++ b/ETS-WS/packages/AjaxMin.4.74.4698.25434/AjaxMin.4.74.4698.25434.nuspec @@ -2,7 +2,7 @@ AjaxMin - 4.72.4679.35523 + 4.74.4698.25434 Microsoft Ajax Minifier Microsoft Corporation, Ron Logan Microsoft Corporation, Ron Logan diff --git a/ETS-WS/packages/AjaxMin.4.74.4698.25434/lib/net20/AjaxMin.dll b/ETS-WS/packages/AjaxMin.4.74.4698.25434/lib/net20/AjaxMin.dll new file mode 100644 index 0000000..51002bc Binary files /dev/null and b/ETS-WS/packages/AjaxMin.4.74.4698.25434/lib/net20/AjaxMin.dll differ diff --git a/ETS-WS/packages/AjaxMin.4.74.4698.25434/lib/net35/AjaxMin.dll b/ETS-WS/packages/AjaxMin.4.74.4698.25434/lib/net35/AjaxMin.dll new file mode 100644 index 0000000..b814656 Binary files /dev/null and b/ETS-WS/packages/AjaxMin.4.74.4698.25434/lib/net35/AjaxMin.dll differ diff --git a/ETS-WS/packages/AjaxMin.4.74.4698.25434/lib/net40/AjaxMin.dll b/ETS-WS/packages/AjaxMin.4.74.4698.25434/lib/net40/AjaxMin.dll new file mode 100644 index 0000000..b3ccf43 Binary files /dev/null and b/ETS-WS/packages/AjaxMin.4.74.4698.25434/lib/net40/AjaxMin.dll differ diff --git a/ETS-WS/packages/AjaxMin.4.74.4698.25434/tools/net40/AjaxMin.dll b/ETS-WS/packages/AjaxMin.4.74.4698.25434/tools/net40/AjaxMin.dll new file mode 100644 index 0000000..b3ccf43 Binary files /dev/null and b/ETS-WS/packages/AjaxMin.4.74.4698.25434/tools/net40/AjaxMin.dll differ diff --git a/ETS-WS/packages/AjaxMin.4.72.4679.35523/tools/net40/AjaxMin.tasks b/ETS-WS/packages/AjaxMin.4.74.4698.25434/tools/net40/AjaxMin.tasks similarity index 100% rename from ETS-WS/packages/AjaxMin.4.72.4679.35523/tools/net40/AjaxMin.tasks rename to ETS-WS/packages/AjaxMin.4.74.4698.25434/tools/net40/AjaxMin.tasks diff --git a/ETS-WS/packages/AjaxMin.4.74.4698.25434/tools/net40/AjaxMinTask.dll b/ETS-WS/packages/AjaxMin.4.74.4698.25434/tools/net40/AjaxMinTask.dll new file mode 100644 index 0000000..06b16c1 Binary files /dev/null and b/ETS-WS/packages/AjaxMin.4.74.4698.25434/tools/net40/AjaxMinTask.dll differ diff --git a/ETS-WS/packages/AjaxMin.4.72.4679.35523/tools/net40/AjaxMinTask.targets b/ETS-WS/packages/AjaxMin.4.74.4698.25434/tools/net40/AjaxMinTask.targets similarity index 100% rename from ETS-WS/packages/AjaxMin.4.72.4679.35523/tools/net40/AjaxMinTask.targets rename to ETS-WS/packages/AjaxMin.4.74.4698.25434/tools/net40/AjaxMinTask.targets diff --git a/ETS_Data/app.config b/ETS_Data/app.config index 0ba3fdb..d7ff40f 100644 --- a/ETS_Data/app.config +++ b/ETS_Data/app.config @@ -3,11 +3,7 @@ - - + + \ No newline at end of file