Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

(GH-267) Using chocolatey.lib for local operations. #282

Merged
merged 18 commits into from
Apr 18, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions BuildScripts/default.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,7 @@ Task -Name __InstallChocolatey -Description $private -Action {
}

exec {
Invoke-Expression "$script:chocolateyCommand upgrade chocolatey";
Invoke-Expression "$script:chocolateyCommand upgrade chocolatey -pre";
}

Write-Output "Latest Chocolatey installed."
Expand Down Expand Up @@ -358,7 +358,7 @@ Task -Name __InstallGitVersion -Depends __InstallChocolatey -Description $privat

if (-not (Test-Path $gitVersionExe)) {
exec {
Invoke-Expression "$script:chocolateyCommand install GitVersion.Portable -pre -y -source https://www.myget.org/F/gep13/";
Invoke-Expression "$script:chocolateyCommand install GitVersion.Portable -y";
}
} else {
Write-Output "GitVersion.Portable already installed";
Expand Down
Binary file modified BuildScripts/dupfinder.config
Binary file not shown.
Binary file modified BuildScripts/inspectcode.config
Binary file not shown.
5 changes: 3 additions & 2 deletions Source/ChocolateyGui.sln
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2013
VisualStudioVersion = 12.0.31101.0
# Visual Studio 14
VisualStudioVersion = 14.0.23107.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ChocolateyGui", "ChocolateyGui\ChocolateyGui.csproj", "{851FC2F6-AFB0-4153-8520-BF68E1BEA3CB}"
EndProject
Expand All @@ -17,6 +17,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "BuildScripts", "BuildScript
..\BuildScripts\dupfinder.config = ..\BuildScripts\dupfinder.config
..\BuildScripts\dupfinder.xsl = ..\BuildScripts\dupfinder.xsl
..\BuildScripts\inspectcode.config = ..\BuildScripts\inspectcode.config
Settings.StyleCop = Settings.StyleCop
..\BuildScripts\StyleCop.props = ..\BuildScripts\StyleCop.props
..\BuildScripts\StyleCopReport.xsl = ..\BuildScripts\StyleCopReport.xsl
EndProjectSection
Expand Down
4 changes: 3 additions & 1 deletion Source/ChocolateyGui.sln.DotSettings
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,6 @@
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantUsingDirective/@EntryIndexedValue">ERROR</s:String>
<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/BLANK_LINES_BETWEEN_USING_GROUPS/@EntryValue">0</s:Int64>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=UI/@EntryIndexedValue">UI</s:String>
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateBlankLinesAroundFieldToBlankLinesAroundProperty/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EAddAccessorOwnerDeclarationBracesMigration/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateBlankLinesAroundFieldToBlankLinesAroundProperty/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateThisQualifierSettings/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
11 changes: 8 additions & 3 deletions Source/ChocolateyGui/App.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,10 @@ namespace ChocolateyGui
using Autofac;
using ChocolateyGui.IoC;
using ChocolateyGui.Services;
using ChocolateyGui.Utilities.Extensions;
using ChocolateyGui.Views.Windows;
using ChocolateyGui.Utilities.Extensions;
using ChocolateyGui.ViewModels.Items;
using ChocolateyGui.Views.Windows;
using NuGet;

/// <summary>
/// Interaction logic for App.xaml
Expand All @@ -23,7 +25,10 @@ static App()
{
Container = AutoFacConfiguration.RegisterAutoFac();

Log = typeof(App).GetLogger();
Log = typeof(App).GetLogger();

AutoMapper.Mapper.CreateMap<IPackage, IPackageViewModel>();
AutoMapper.Mapper.CreateMap<IPackageViewModel, IPackageViewModel>();

AppDomain.CurrentDomain.FirstChanceException += CurrentDomain_FirstChanceException;
AppDomain.CurrentDomain.UnhandledException += CurrentDomain_UnhandledException;
Expand Down
94 changes: 0 additions & 94 deletions Source/ChocolateyGui/AsyncProcess/ProcessEx.cs

This file was deleted.

59 changes: 0 additions & 59 deletions Source/ChocolateyGui/AsyncProcess/ProcessEx.overloads.cs

This file was deleted.

45 changes: 0 additions & 45 deletions Source/ChocolateyGui/AsyncProcess/ProcessResults.cs

This file was deleted.

Loading