Permalink
Browse files

Merge branch 'master' into VcapClientUpdates

Conflicts:
	src/IronFoundry/Types/Framework.cs
	test/IronFoundry.Test/IronFoundry.Test.csproj
	test/IronFoundry.Test/JsonTests.cs
	test/IronFoundry.Test/packages.config
  • Loading branch information...
lukebakken committed Feb 22, 2013
2 parents d6fcb51 + 06f9268 commit fa40c95344fe65a4a39c77fe90e235950475f6cf
Showing with 2,308 additions and 3,156 deletions.
  1. +15 −0 .gitattributes
  2. BIN .nuget/NuGet.exe
  3. +4 −0 CHANGELOG.md
  4. +15 −10 IronFoundry.sln
  5. +8 −1 IronFoundry.sln.DotSettings
  6. +50 −50 build.bat
  7. +8 −8 clean.ps1
  8. +0 −18 docs/licenses/uhuru_software.txt
  9. +2 −2 src/IronFoundry.CloudFoundryExplorer.Installer/Product.wxs
  10. +13 −13 src/IronFoundry.CloudFoundryExplorer/App.config
  11. +6 −6 src/IronFoundry.CloudFoundryExplorer/App.xaml
  12. +63 −63 src/IronFoundry.CloudFoundryExplorer/Properties/Resources.Designer.cs
  13. +117 −117 src/IronFoundry.CloudFoundryExplorer/Properties/Resources.resx
  14. +6 −6 src/IronFoundry.CloudFoundryExplorer/Properties/Settings.settings
  15. +4 −4 src/IronFoundry.CloudFoundryExplorer/packages.config
  16. +7 −0 src/IronFoundry.Dea.Service.Installer/Product.wxs
  17. +2 −2 src/IronFoundry.Dea.Service/App.config
  18. +19 −5 src/IronFoundry.Dea/Agent/Agent.cs
  19. +68 −6 src/IronFoundry.Dea/Agent/ConfigManager.cs
  20. +39 −3 src/IronFoundry.Dea/Constants.cs
  21. +1 −4 src/IronFoundry.Dea/IronFoundry.Dea.csproj
  22. +3 −0 src/IronFoundry.Dea/Logging/ILog.cs
  23. +25 −1 src/IronFoundry.Dea/Logging/NLogLogger.cs
  24. +9 −0 src/IronFoundry.Dea/Properties/Resources.Designer.cs
  25. +3 −0 src/IronFoundry.Dea/Properties/Resources.resx
  26. +2 −1 src/IronFoundry.Dea/Providers/IWebServerAdministrationProvider.cs
  27. +2 −1 src/IronFoundry.Dea/Providers/NatsMessagingProvider.cs
  28. +28 −11 src/IronFoundry.Dea/Providers/WebServerAdministrationProvider.cs
  29. +1 −1 src/IronFoundry.Dea/Services/FilesService.cs
  30. +14 −14 src/IronFoundry.Dea/Types/Advertise.cs
  31. +0 −28 src/IronFoundry.Dea/Types/Credentials.cs
  32. +1 −2 src/IronFoundry.Dea/Types/Droplet.cs
  33. +51 −16 src/IronFoundry.Dea/Types/Instance.cs
  34. +2 −1 src/IronFoundry.Dea/Types/Service.cs
  35. +9 −0 src/IronFoundry.Dea/WinService/CustomCommands.cs
  36. +6 −1 src/IronFoundry.Dea/WinService/FilesWinService.cs
  37. +16 −0 src/IronFoundry.Dea/WinService/MultipleServiceManager.cs
  38. +0 −1,024 src/IronFoundry.Dea/WindowsJobObjects/JobObject.cs
  39. +0 −40 src/IronFoundry.Dea/WindowsJobObjects/JobObjectHandle.cs
  40. +0 −443 src/IronFoundry.Dea/WindowsJobObjects/NativeMethods.cs
  41. +1 −1 src/IronFoundry.Ui.Controls/Model/CloudEventArgs.cs
  42. +7 −7 src/IronFoundry.Ui.Controls/Model/CloudFoundryProvider.cs
  43. +3 −3 src/IronFoundry.Ui.Controls/Model/ICloudFoundryProvider.cs
  44. +1 −1 src/IronFoundry.Ui.Controls/Model/IPreferencesProvider.cs
  45. +1 −1 src/IronFoundry.Ui.Controls/Model/PreferencesProvider.cs
  46. +1 −1 src/IronFoundry.Ui.Controls/Mvvm/TreeViewItemViewModel.cs
  47. +72 −72 src/IronFoundry.Ui.Controls/Properties/Resources.Designer.cs
  48. +122 −122 src/IronFoundry.Ui.Controls/Properties/Resources.resx
  49. +6 −6 src/IronFoundry.Ui.Controls/Properties/Settings.settings
  50. +1 −1 src/IronFoundry.Ui.Controls/ViewModel/Cloud/ChangePasswordViewModel.cs
  51. +3 −3 src/IronFoundry.Ui.Controls/ViewModel/Cloud/CloudViewModel.cs
  52. +2 −2 src/IronFoundry.Ui.Controls/ViewModel/Cloud/CreateServiceViewModel.cs
  53. +1 −1 src/IronFoundry.Ui.Controls/ViewModel/Cloud/ManageApplicationUrlsViewModel.cs
  54. +3 −3 src/IronFoundry.Ui.Controls/ViewModel/Explorer/ApplicationTreeViewItemViewModel.cs
  55. +1 −2 src/IronFoundry.Ui.Controls/ViewModel/Explorer/CloudExplorerViewModel.cs
  56. +1 −1 src/IronFoundry.Ui.Controls/ViewModel/Explorer/CloudTreeViewItemViewModel.cs
  57. +1 −1 src/IronFoundry.Ui.Controls/ViewModel/Explorer/FileTreeViewItemViewModel.cs
  58. +1 −1 src/IronFoundry.Ui.Controls/ViewModel/Explorer/FolderTreeViewItemViewModel.cs
  59. +2 −2 src/IronFoundry.Ui.Controls/ViewModel/Explorer/InstanceTreeViewItemViewModel.cs
  60. +5 −5 src/IronFoundry.Ui.Controls/ViewModel/ExplorerViewModel.cs
  61. +4 −4 src/IronFoundry.Ui.Controls/ViewModel/ManageCloudsViewModel.cs
  62. +2 −2 src/IronFoundry.Ui.Controls/ViewModel/Push/AddApplicationServiceViewModel.cs
  63. +2 −2 src/IronFoundry.Ui.Controls/ViewModel/Push/PushViewModel.cs
  64. +6 −6 src/IronFoundry.Ui.Controls/ViewModel/UpdateViewModel.cs
  65. +2 −3 src/IronFoundry.Ui.Controls/Views/CloudExplorer.xaml
  66. BIN src/IronFoundry.Ui.Controls/Views/CloudView.xaml
  67. +4 −4 src/IronFoundry.Ui.Controls/packages.config
  68. +8 −4 src/IronFoundry.VisualStudioExtension/CloudFoundryPackage.cs
  69. +104 −104 src/IronFoundry.VisualStudioExtension/CloudFoundryPackage.vsct
  70. +14 −2 src/IronFoundry.VisualStudioExtension/IronFoundry.VisualStudioExtension.csproj
  71. +28 −1 src/IronFoundry.VisualStudioExtension/Resources.Designer.cs
  72. +148 −148 src/IronFoundry.VisualStudioExtension/Resources.resx
  73. +10 −5 src/IronFoundry.VisualStudioExtension/source.extension.vsixmanifest
  74. +30 −21 src/IronFoundry/Extensions/SafeObservableCollection.cs
  75. +8 −3 src/IronFoundry/Extensions/UriExtensionMethods.cs
  76. +28 −23 src/IronFoundry/IronFoundry.csproj
  77. +6 −1 src/IronFoundry/{Types → Models}/AccessToken.cs
  78. +22 −0 src/IronFoundry/Models/AppServer.cs
  79. +17 −25 src/IronFoundry/{Types → Models}/Application.cs
  80. +7 −2 src/IronFoundry/{Types → Models}/Cloud.cs
  81. +129 −0 src/IronFoundry/Models/CloudUrl.cs
  82. +6 −1 src/IronFoundry/{Types → Models}/Crash.cs
  83. +6 −1 src/IronFoundry/{Types → Models}/EntityBase.cs
  84. +10 −6 src/IronFoundry/{Types → Models}/ExternalInstance.cs
  85. +21 −0 src/IronFoundry/Models/Framework.cs
  86. +12 −0 src/IronFoundry/Models/IMergeable.cs
  87. +6 −28 src/IronFoundry/{Types → Models}/Info.cs
  88. +24 −0 src/IronFoundry/Models/InfoLimits.cs
  89. +21 −0 src/IronFoundry/Models/InfoUsage.cs
  90. +167 −0 src/IronFoundry/Models/Instance.cs
  91. +6 −1 src/IronFoundry/{Types → Models}/Limits.cs
  92. +24 −0 src/IronFoundry/Models/Message.cs
  93. +15 −14 src/IronFoundry/{Types → Models}/Preferences.cs
  94. +6 −1 src/IronFoundry/{Types → Models}/PreferencesV2.cs
  95. +6 −1 src/IronFoundry/{Types → Models}/ProvisionedService.cs
  96. +25 −0 src/IronFoundry/Models/Runtime.cs
  97. +6 −1 src/IronFoundry/{Types → Models}/StatInfo.cs
  98. +6 −1 src/IronFoundry/{Types → Models}/Stats.cs
  99. +6 −14 src/IronFoundry/{Types → Models}/SystemService.cs
  100. +20 −0 src/IronFoundry/Models/SystemServiceEqualityComparer.cs
  101. +7 −2 src/IronFoundry/{Types → Models}/Usage.cs
  102. +6 −1 src/IronFoundry/{Types → Models}/VcapResponse.cs
  103. +8 −3 src/IronFoundry/{Types → Models}/VcapUser.cs
  104. +7 −2 src/IronFoundry/{Types → Models}/VcapUserApp.cs
  105. +9 −0 src/IronFoundry/Properties/Resources.Designer.cs
  106. +180 −177 src/IronFoundry/Properties/Resources.resx
  107. +0 −88 src/IronFoundry/Types/CloudUrl.cs
  108. +0 −41 src/IronFoundry/Types/Framework.cs
  109. +0 −7 src/IronFoundry/Types/IMergeable.cs
  110. +0 −102 src/IronFoundry/Types/Instance.cs
  111. +0 −19 src/IronFoundry/Types/Message.cs
  112. +18 −11 src/IronFoundry/Vcap/AppsHelper.cs
  113. +29 −26 src/IronFoundry/Vcap/BaseVmcHelper.cs
  114. +3 −1 src/IronFoundry/Vcap/IVcapClient.cs
  115. +3 −3 src/IronFoundry/Vcap/InfoHelper.cs
  116. +5 −5 src/IronFoundry/Vcap/MiscHelper.cs
  117. +6 −6 src/IronFoundry/Vcap/ServicesHelper.cs
  118. +8 −8 src/IronFoundry/Vcap/UserHelper.cs
  119. +24 −25 src/IronFoundry/Vcap/VcapClient.cs
  120. +1 −1 src/IronFoundry/Vcap/VcapClientResult.cs
  121. +7 −6 src/IronFoundry/Vcap/VcapCredentialManager.cs
  122. +25 −15 src/IronFoundry/Vcap/VcapRequest.cs
  123. +2 −2 src/shared/CommonAssemblyInfo.cs
  124. +3 −3 src/shared/ExtensionMethods.cs
  125. +1 −1 test/IronFoundry.Test/IronFoundry.Test.csproj
  126. +39 −31 test/IronFoundry.Test/JsonTests.cs
  127. +2 −2 test/IronFoundry.Test/UserTests.cs
  128. +1 −1 test/IronFoundry.Test/packages.config
  129. +30 −0 tools/dea-monitor.rb
  130. +29 −0 tools/iis_cleanup.ps1
  131. +29 −0 tools/stop-apps.rb
View
@@ -0,0 +1,15 @@
+# Set default behaviour, in case users don't have core.autocrlf set.
+* text=auto
+
+# Explicitly declare text files we want to always be normalized and converted
+# to native line endings on checkout.
+*.cs text
+
+# Declare files that will always have CRLF line endings on checkout.
+*.csproj text eol=crlf
+*.sln text eol=crlf
+
+# Denote all files that are truly binary and should not be modified.
+*.exe binary
+*.png binary
+*.jpg binary
View
Binary file not shown.
View
@@ -0,0 +1,4 @@
+### 1.7.0
+
+* Modified FilesService to not request a lock when reading files.
+
View
@@ -1,6 +1,6 @@

-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 2012
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{612435DA-4BBF-49B5-B0AA-36E6529C1D8B}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{9E04D2BE-86B8-47B9-809D-84506CFDF42D}"
@@ -13,8 +13,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "common", "common", "{698503
common\IronFoundry.snk = common\IronFoundry.snk
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IronFoundry", "src\IronFoundry\IronFoundry.csproj", "{506CCDF4-11FE-4138-8061-25495EEBF8E0}"
-EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "images", "images", "{63D980C4-727A-4473-8BFA-8966B5AF1681}"
ProjectSection(SolutionItems) = preProject
images\cloud_droplet.png = images\cloud_droplet.png
@@ -30,6 +28,19 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "images", "images", "{63D980
images\server.png = images\server.png
EndProjectSection
EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{443DDB66-F24A-4C73-AA16-9C27DD8B67C8}"
+ ProjectSection(SolutionItems) = preProject
+ .nuget\NuGet.exe = .nuget\NuGet.exe
+ .nuget\NuGet.targets = .nuget\NuGet.targets
+ EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{EE6F9E81-B251-47D5-B847-D0EA8957414C}"
+ ProjectSection(SolutionItems) = preProject
+ tools\iis_cleanup.ps1 = tools\iis_cleanup.ps1
+ EndProjectSection
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IronFoundry", "src\IronFoundry\IronFoundry.csproj", "{506CCDF4-11FE-4138-8061-25495EEBF8E0}"
+EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IronFoundry.Dea", "src\IronFoundry.Dea\IronFoundry.Dea.csproj", "{9E0B2522-39F5-4AC4-BF2F-A7C6B16C9EAA}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IronFoundry.Dea.Service", "src\IronFoundry.Dea.Service\IronFoundry.Dea.Service.csproj", "{8704AF02-615E-4679-B183-FB7164408FA0}"
@@ -49,12 +60,6 @@ Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "IronFoundry.CloudFoundryExp
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IronFoundry.Test", "test\IronFoundry.Test\IronFoundry.Test.csproj", "{34013CB7-3FF3-4061-9E45-CB6101F5977A}"
EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{443DDB66-F24A-4C73-AA16-9C27DD8B67C8}"
- ProjectSection(SolutionItems) = preProject
- .nuget\NuGet.exe = .nuget\NuGet.exe
- .nuget\NuGet.targets = .nuget\NuGet.targets
- EndProjectSection
-EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|x64 = Debug|x64
@@ -1,8 +1,12 @@
<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+ <s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertToConstant_002ELocal/@EntryIndexedValue">DO_NOT_SHOW</s:String>
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=InvertIf/@EntryIndexedValue">DO_NOT_SHOW</s:String>
+ <s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MemberCanBeMadeStatic_002ELocal/@EntryIndexedValue">DO_NOT_SHOW</s:String>
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantIfElseBlock/@EntryIndexedValue">DO_NOT_SHOW</s:String>
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=SuggestUseVarKeywordEverywhere/@EntryIndexedValue">DO_NOT_SHOW</s:String>
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=SuggestUseVarKeywordEvident/@EntryIndexedValue">HINT</s:String>
+ <s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/EXPLICIT_PRIVATE_MODIFIER/@EntryValue">True</s:Boolean>
+ <s:Boolean x:Key="/Default/CodeStyle/CSharpUsing/AddImportsToDeepestScope/@EntryValue">True</s:Boolean>
<s:String x:Key="/Default/CodeStyle/CSharpUsing/MandatoryImports/=System/@EntryIndexedValue">System</s:String>
<s:String x:Key="/Default/CodeStyle/CSharpUsing/MandatoryImports/=System_002ECollections_002EGeneric/@EntryIndexedValue">System.Collections.Generic</s:String>
<s:String x:Key="/Default/CodeStyle/CSharpUsing/MandatoryImports/=System_002ELinq/@EntryIndexedValue">System.Linq</s:String>
@@ -19,7 +23,10 @@
<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/INDENT_ANONYMOUS_METHOD_BLOCK/@EntryValue">False</s:Boolean>
<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/INDENT_EMBRACED_INITIALIZER_BLOCK/@EntryValue">False</s:Boolean>
<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_LIMIT/@EntryValue">140</s:Int64>
- <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=ID/@EntryIndexedValue">ID</s:String>
+ <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=ID/@EntryIndexedValue"></s:String>
+ <s:Boolean x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=ID/@EntryIndexRemoved">True</s:Boolean>
+ <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=IP/@EntryIndexedValue">IP</s:String>
+
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateInstanceFields/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateStaticFields/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PublicFields/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String></wpf:ResourceDictionary>
View
100 build.bat
@@ -1,50 +1,50 @@
-@echo off
-
-setlocal
-
-set VCVARSALL="C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\vcvarsall.bat"
-
-set SLN="%~dp0\IronFoundry.sln"
-set VERSION=1.7.0.0
-
-set NOCLEAN=0
-if /i "%1"=="NOCLEAN" set NOCLEAN=1
-
-if not exist %VCVARSALL% (
- echo Required file %VCVARSALL% not found.
- exit 1
-)
-
-if not exist %SLN% (
- echo Required file %SLN% not found.
- exit 1
-)
-
-rem Prevent this from being run multiple times on a dev machine
-if "%DevEnvDir%"=="" (
- call %VCVARSALL% x86
-)
-
-if %NOCLEAN% equ 0 (
- echo CLEANING...
- powershell -nologo -file clean.ps1
- echo DONE.
-)
-
-msbuild /v:n /t:build /p:Configuration=Debug /p:Platform=x86 %SLN%
-if ERRORLEVEL 1 goto build_failed
-
-msbuild /v:n /t:build /p:Configuration=Debug /p:Platform=x64 %SLN%
-if ERRORLEVEL 1 goto build_failed
-
-msbuild /v:n /t:build /p:Configuration=Release /p:Platform=x86 /p:WixValues="VERSION=%VERSION%" %SLN%
-if ERRORLEVEL 1 goto build_failed
-
-msbuild /v:n /t:build /p:Configuration=Release /p:Platform=x64 /p:WixValues="VERSION=%VERSION%" %SLN%
-if ERRORLEVEL 1 goto build_failed
-
-exit /b %ERRORLEVEL%
-
-:build_failed
-echo Build failed!
-exit /b 1
+@echo off
+
+setlocal
+
+set VCVARSALL="C:\Program Files (x86)\Microsoft Visual Studio 11.0\Common7\Tools\VsDevCmd.bat"
+
+set SLN="%~dp0\IronFoundry.sln"
+set VERSION=1.9.0
+
+set NOCLEAN=0
+if /i "%1"=="NOCLEAN" set NOCLEAN=1
+
+if not exist %VCVARSALL% (
+ echo Required file %VCVARSALL% not found.
+ exit 1
+)
+
+if not exist %SLN% (
+ echo Required file %SLN% not found.
+ exit 1
+)
+
+rem Prevent this from being run multiple times on a dev machine
+if "%DevEnvDir%"=="" (
+ call %VCVARSALL% x86
+)
+
+if %NOCLEAN% equ 0 (
+ echo CLEANING...
+ powershell -noprofile -nologo -file clean.ps1
+ echo DONE.
+)
+
+msbuild /v:n /t:build /p:Configuration=Debug /p:Platform=x86 %SLN%
+if ERRORLEVEL 1 goto build_failed
+
+msbuild /v:n /t:build /p:Configuration=Debug /p:Platform=x64 %SLN%
+if ERRORLEVEL 1 goto build_failed
+
+msbuild /v:n /t:build /p:Configuration=Release /p:Platform=x86 /p:WixValues="VERSION=%VERSION%" %SLN%
+if ERRORLEVEL 1 goto build_failed
+
+msbuild /v:n /t:build /p:Configuration=Release /p:Platform=x64 /p:WixValues="VERSION=%VERSION%" %SLN%
+if ERRORLEVEL 1 goto build_failed
+
+exit /b %ERRORLEVEL%
+
+:build_failed
+echo Build failed!
+exit /b 1
View
@@ -1,8 +1,8 @@
-get-childitem src -include bin,obj -recurse | where { $_.psIsContainer -eq $true } | foreach ($_) {
- write-host -foregroundcolor 'yellow' "Removing: $_"
- remove-item $_ -recurse -force
-}
-get-childitem test -include bin,obj -recurse | where { $_.psIsContainer -eq $true } | foreach ($_) {
- write-host -foregroundcolor 'yellow' "Removing: $_"
- remove-item $_ -recurse -force
-}
+get-childitem src -include bin,obj -recurse | where { $_.psIsContainer -eq $true } | foreach ($_) {
+ write-host -foregroundcolor 'yellow' "Removing: $_"
+ remove-item $_ -recurse -force
+}
+get-childitem test -include bin,obj -recurse | where { $_.psIsContainer -eq $true } | foreach ($_) {
+ write-host -foregroundcolor 'yellow' "Removing: $_"
+ remove-item $_ -recurse -force
+}
@@ -1,18 +0,0 @@
--------------------- Uhuru Source Code ---------------------------------
-
-Copyright [2011] [Uhuru Software, Inc.]
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS ORIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO VENT SHALL THEAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHERLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS INTHE SOFTWARE.
@@ -5,7 +5,7 @@
xmlns:netfx="http://schemas.microsoft.com/wix/NetFxExtension">
<?ifndef var.VERSION ?>
- <?define VERSION = '1.1.0.0' ?>
+ <?define VERSION = '1.9.0.0' ?>
<?endif?>
<?define var.BUILDDIR = $(var.IronFoundry.CloudFoundryExplorer.TargetDir)?>
@@ -334,5 +334,5 @@
<ComponentGroupRef Id="CommonComponents" />
<ComponentGroupRef Id="AppComponents" />
</Feature>
- </Product>
+ </Product>
</Wix>
@@ -1,14 +1,14 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
- <startup>
- <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0,Profile=Client" />
- </startup>
- <runtime>
- <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
- <dependentAssembly>
- <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
- <bindingRedirect oldVersion="0.0.0.0-4.5.0.0" newVersion="4.5.0.0" />
- </dependentAssembly>
- </assemblyBinding>
- </runtime>
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+ <startup>
+ <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0,Profile=Client" />
+ </startup>
+ <runtime>
+ <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+ <dependentAssembly>
+ <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
+ <bindingRedirect oldVersion="0.0.0.0-4.5.0.0" newVersion="4.5.0.0" />
+ </dependentAssembly>
+ </assemblyBinding>
+ </runtime>
</configuration>
@@ -1,7 +1,7 @@
-<Application x:Class="IronFoundry.CloudFoundryExplorer.App"
- xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
- xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
- StartupUri="/IronFoundry.Ui.Controls;component/Views/Explorer.xaml"
- xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
- xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+<Application x:Class="IronFoundry.CloudFoundryExplorer.App"
+ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+ StartupUri="/IronFoundry.Ui.Controls;component/Views/Explorer.xaml"
+ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+ xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
mc:Ignorable="d" />
Oops, something went wrong.

0 comments on commit fa40c95

Please sign in to comment.