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.

Sign up for GitHub

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

Profile only #80

Merged
merged 7 commits into from
Jan 16, 2020
Merged

Profile only #80

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
2455eb4
Feature complete Profile Only support ready for testing
Dijji Dec 12, 2019
0593f24
Fix problem with removing registry entries created by version 1.3
Dijji Jan 7, 2020
205fd7c
Updated version information
Dijji Jan 7, 2020
b4632f6
Add support for merging profiles from the command line
Dijji Jan 10, 2020
a076f39
Add profile only test cases
Dijji Jan 10, 2020
b172c6d
Update version numbers
Dijji Jan 14, 2020
0ba6cb6
Add missing documentation of merge option for command line associatio…
Dijji Jan 16, 2020
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
Prev Previous commit
Next Next commit
Updated version information
  • Loading branch information
@Dijji
Dijji committed Jan 7, 2020
commit 205fd7c92b0b591f42a90a1137a5a8a39ffc1eaa
5 changes: 5 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,3 +57,8 @@
/Release
/Setup/msi/Release
/Setup/obj/x86/Release
/CommandLine/FileMeta.aps
/ContextMenuHandler/ContextMenuHandler.aps
/PropertyHandler/FileMetaPropertyHandler.aps
/TestDriverAssoc/.vs/TestDriverAssoc/v15
/TestSandbox
Binary file modified CommandLine/FileMeta.rc
View file
Open in desktop
Binary file not shown.
Binary file modified ContextMenuHandler/ContextMenuHandler.rc
View file
Open in desktop
Binary file not shown.
Binary file modified PropertyHandler/FileMetaPropertyHandler.rc
View file
Open in desktop
Binary file not shown.
4 changes: 2 additions & 2 deletions Setup/Product.wxs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Also thanks to Alek Davis for the 32/64-bit strategy: http://alekdavis.blogspot.
-->

<?define ProductName = "File Metadata" ?>
<?define ProductVersion = "1.5" ?>
<?define ProductVersion = "1.6" ?>

<?if $(var.Platform) = x64 ?>
<?define ProductDisplayName = "$(var.ProductName) 64-bit" ?>
Expand Down Expand Up @@ -34,7 +34,7 @@ Also thanks to Alek Davis for the 32/64-bit strategy: http://alekdavis.blogspot.

<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
<Product Id="$(var.ProductId)" Name="$(var.ProductDisplayName) (v$(var.ProductVersion))"
Language="1033" Version="1.5.6128.0" Manufacturer="Dijji" UpgradeCode="$(var.ProductUpgradeCode)">
Language="1033" Version="1.6.7311.0" Manufacturer="Dijji" UpgradeCode="$(var.ProductUpgradeCode)">
<Package InstallerVersion="400" Compressed="yes" InstallScope="perMachine" />
<Condition Message="[ProductName] is for Windows Vista, Windows Server 2008, or higher.">
<![CDATA[Installed OR (VersionNT >= 600)]]>
Expand Down
42 changes: 17 additions & 25 deletions TestDriverAssoc/Properties/Resources.Designer.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

22 changes: 9 additions & 13 deletions TestDriverAssoc/Properties/Settings.Designer.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 4 additions & 1 deletion TestDriverAssoc/TestDriverAssoc.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,11 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>TestDriverAssoc</RootNamespace>
<AssemblyName>TestDriverAssoc</AssemblyName>
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<WarningLevel>4</WarningLevel>
<TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
<PlatformTarget>x86</PlatformTarget>
Expand Down Expand Up @@ -62,6 +63,7 @@
<Reference Include="System" />
<Reference Include="System.Data" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xaml" />
<Reference Include="System.Xml" />
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
Expand Down Expand Up @@ -118,6 +120,7 @@
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
</EmbeddedResource>
<None Include="app.config" />
<None Include="app.manifest">
<SubType>Designer</SubType>
</None>
Expand Down
3 changes: 3 additions & 0 deletions TestDriverAssoc/app.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
<?xml version="1.0"?>
<configuration>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>