-
-
Notifications
You must be signed in to change notification settings - Fork 265
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
Update .NET Framework to 4.8, migrate to sdk format #404
Open
Repiteo
wants to merge
5
commits into
dwmkerr:main
Choose a base branch
from
Repiteo:modernize-frameworks
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+857
−5,204
Open
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
5f030e2
Update .NET Framework versions (4.0/4.5 → 4.8)
Repiteo 8d6d4e9
Convert `.csproj` files to sdk format
Repiteo 2261657
Modernize builder tools
Repiteo 94ec811
Implement `Directory.Build.props` for shared info
Repiteo cbbddd5
Modernize NuGet packages, update dotnet tests
Repiteo File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,60 @@ | ||
| name: Validate | ||
| on: [push, pull_request] | ||
|
|
||
| concurrency: | ||
| group: ci-${{github.actor}}-${{github.head_ref || github.run_number}}-${{github.ref}} | ||
| cancel-in-progress: true | ||
|
|
||
| jobs: | ||
| sharp-shell: | ||
| name: SharpShell | ||
| runs-on: windows-latest | ||
| steps: | ||
| - name: Checkout | ||
| uses: actions/checkout@v4 | ||
| with: | ||
| submodules: recursive | ||
|
|
||
| - name: Build SharpShell | ||
| run: dotnet build -c Release SharpShell | ||
|
|
||
| - name: Run Tests | ||
| run: dotnet test -c Release SharpShell || True | ||
|
|
||
| - name: Upload Artifacts | ||
| uses: actions/upload-artifact@v4 | ||
| with: | ||
| name: ${{github.job}} | ||
| path: SharpShell/artifacts | ||
|
|
||
| native-bridge: | ||
| name: NativeBridge (VS${{matrix.vs-year}}) | ||
| runs-on: windows-${{matrix.vs-year}} | ||
| strategy: | ||
| matrix: | ||
| include: | ||
| - vs-year: 2019 | ||
| vs-version: 16.11 | ||
| - vs-year: 2022 | ||
| vs-version: 17.10 | ||
|
|
||
| steps: | ||
| - name: Checkout | ||
| uses: actions/checkout@v4 | ||
| with: | ||
| submodules: recursive | ||
|
|
||
| - name: Add MSBuild to PATH | ||
| uses: microsoft/setup-msbuild@v2 | ||
| with: | ||
| vs-version: ${{matrix.vs-version}} | ||
| msbuild-architecture: x64 | ||
|
|
||
| - name: Build Native Bridge | ||
| run: msbuild /p:Configuration=Release SharpShellNativeBridge | ||
|
|
||
| - name: Upload Artifacts | ||
| uses: actions/upload-artifact@v4 | ||
| with: | ||
| name: ${{github.job}}-vs${{matrix.vs-year}} | ||
| path: SharpShellNativeBridge/artifacts |
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| <Project> | ||
| <PropertyGroup> | ||
| <Authors>Dave Kerr</Authors> | ||
| <Product>SharpShell</Product> | ||
| <Copyright>Copyright © Dave Kerr 2010-Present</Copyright> | ||
| <PackageTags>Shell,SharpShell,COM,Context Menu,Icon Handler</PackageTags> | ||
| <RepositoryUrl>https://github.com/dwmkerr/sharpshell</RepositoryUrl> | ||
| <Version>2.7.2</Version> | ||
| <FileVersion>$(Version).0</FileVersion> | ||
| <AssemblyVersion>$(Version).0</AssemblyVersion> | ||
| <PlatformTarget>AnyCPU</PlatformTarget> | ||
| <NeutralLanguage>en-US</NeutralLanguage> | ||
| <GenerateResourceUsePreserializedResources>true</GenerateResourceUsePreserializedResources> | ||
| </PropertyGroup> | ||
| </Project> |
95 changes: 8 additions & 87 deletions
95
...hell/Samples/ContextMenu/AdvancedContextMenuExtension/AdvancedContextMenuExtension.csproj
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,96 +1,17 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||
| <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" /> | ||
| <Project Sdk="Microsoft.NET.Sdk"> | ||
| <PropertyGroup> | ||
| <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> | ||
| <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> | ||
| <ProjectGuid>{35EB7DB4-325E-4E05-BD63-8717314944EE}</ProjectGuid> | ||
| <TargetFramework>net48</TargetFramework> | ||
| <OutputType>Library</OutputType> | ||
| <AppDesignerFolder>Properties</AppDesignerFolder> | ||
| <RootNamespace>AdvancedContextMenuExtension</RootNamespace> | ||
| <AssemblyName>AdvancedContextMenuExtension</AssemblyName> | ||
| <TargetFrameworkVersion>v4.5</TargetFrameworkVersion> | ||
| <FileAlignment>512</FileAlignment> | ||
| <SccProjectName> | ||
| </SccProjectName> | ||
| <SccLocalPath> | ||
| </SccLocalPath> | ||
| <SccAuxPath> | ||
| </SccAuxPath> | ||
| <SccProvider> | ||
| </SccProvider> | ||
| </PropertyGroup> | ||
| <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> | ||
| <DebugSymbols>true</DebugSymbols> | ||
| <DebugType>full</DebugType> | ||
| <Optimize>false</Optimize> | ||
| <OutputPath>bin\Debug\</OutputPath> | ||
| <DefineConstants>DEBUG;TRACE</DefineConstants> | ||
| <ErrorReport>prompt</ErrorReport> | ||
| <WarningLevel>4</WarningLevel> | ||
| </PropertyGroup> | ||
| <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> | ||
| <DebugType>pdbonly</DebugType> | ||
| <Optimize>true</Optimize> | ||
| <OutputPath>bin\Release\</OutputPath> | ||
| <DefineConstants>TRACE</DefineConstants> | ||
| <ErrorReport>prompt</ErrorReport> | ||
| <WarningLevel>4</WarningLevel> | ||
| </PropertyGroup> | ||
| <PropertyGroup> | ||
| <UseWindowsForms>true</UseWindowsForms> | ||
| <ImportWindowsDesktopTargets>true</ImportWindowsDesktopTargets> | ||
| <SignAssembly>true</SignAssembly> | ||
| </PropertyGroup> | ||
| <PropertyGroup> | ||
| <AssemblyOriginatorKeyFile>Key.snk</AssemblyOriginatorKeyFile> | ||
| </PropertyGroup> | ||
| <ItemGroup> | ||
| <Reference Include="System" /> | ||
| <Reference Include="System.Core" /> | ||
| <Reference Include="System.Drawing" /> | ||
| <Reference Include="System.Windows.Forms" /> | ||
| <Reference Include="System.Xml.Linq" /> | ||
| <Reference Include="System.Data.DataSetExtensions" /> | ||
| <Reference Include="Microsoft.CSharp" /> | ||
| <Reference Include="System.Data" /> | ||
| <Reference Include="System.Xml" /> | ||
| </ItemGroup> | ||
| <ItemGroup> | ||
| <Compile Include="AdvancedContextMenu.cs" /> | ||
| <Compile Include="Properties\AssemblyInfo.cs" /> | ||
| <Compile Include="Properties\Resources.Designer.cs"> | ||
| <AutoGen>True</AutoGen> | ||
| <DesignTime>True</DesignTime> | ||
| <DependentUpon>Resources.resx</DependentUpon> | ||
| </Compile> | ||
| <ProjectReference Include="..\..\..\SharpShell\SharpShell.csproj" /> | ||
| </ItemGroup> | ||
| <ItemGroup> | ||
| <ProjectReference Include="..\..\..\SharpShell\SharpShell.csproj"> | ||
| <Project>{b5d5f670-bfba-4d09-91c6-74bb12b7edd4}</Project> | ||
| <Name>SharpShell</Name> | ||
| </ProjectReference> | ||
| <PackageReference Include="Microsoft.CSharp" Version="4.7.0" /> | ||
| <PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" /> | ||
| </ItemGroup> | ||
| <ItemGroup> | ||
| <None Include="Key.snk" /> | ||
| </ItemGroup> | ||
| <ItemGroup> | ||
| <EmbeddedResource Include="Properties\Resources.resx"> | ||
| <Generator>ResXFileCodeGenerator</Generator> | ||
| <LastGenOutput>Resources.Designer.cs</LastGenOutput> | ||
| </EmbeddedResource> | ||
| </ItemGroup> | ||
| <ItemGroup> | ||
| <None Include="Resources\Copy.png" /> | ||
| </ItemGroup> | ||
| <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> | ||
| <PropertyGroup> | ||
| <PostBuildEvent> | ||
| </PostBuildEvent> | ||
| </PropertyGroup> | ||
| <!-- To modify your build process, add your task inside one of the targets below and uncomment it. | ||
| Other similar extension points exist, see Microsoft.Common.targets. | ||
| <Target Name="BeforeBuild"> | ||
| </Target> | ||
| <Target Name="AfterBuild"> | ||
| </Target> | ||
| --> | ||
| </Project> | ||
| </Project> |
36 changes: 0 additions & 36 deletions
36
SharpShell/Samples/ContextMenu/AdvancedContextMenuExtension/Properties/AssemblyInfo.cs
This file was deleted.
Oops, something went wrong.
6 changes: 3 additions & 3 deletions
6
SharpShell/Samples/ContextMenu/AdvancedContextMenuExtension/Properties/Resources.Designer.cs
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
83 changes: 8 additions & 75 deletions
83
...hell/Samples/ContextMenu/CopyDirectoryLocationHandler/CopyDirectoryLocationHandler.csproj
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,85 +1,18 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||
| <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" /> | ||
| <Project Sdk="Microsoft.NET.Sdk"> | ||
| <PropertyGroup> | ||
| <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> | ||
| <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> | ||
| <ProjectGuid>{5C7562AA-9976-4390-A55C-AB9E61A3145C}</ProjectGuid> | ||
| <TargetFramework>net48</TargetFramework> | ||
| <OutputType>Library</OutputType> | ||
| <AppDesignerFolder>Properties</AppDesignerFolder> | ||
| <RootNamespace>CopyDirectoryLocationHandler</RootNamespace> | ||
| <AssemblyName>CopyDirectoryLocationHandler</AssemblyName> | ||
| <TargetFrameworkVersion>v4.5</TargetFrameworkVersion> | ||
| <FileAlignment>512</FileAlignment> | ||
| <SccProjectName> | ||
| </SccProjectName> | ||
| <SccLocalPath> | ||
| </SccLocalPath> | ||
| <SccAuxPath> | ||
| </SccAuxPath> | ||
| <SccProvider> | ||
| </SccProvider> | ||
| </PropertyGroup> | ||
| <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> | ||
| <DebugSymbols>true</DebugSymbols> | ||
| <DebugType>full</DebugType> | ||
| <Optimize>false</Optimize> | ||
| <OutputPath>bin\Debug\</OutputPath> | ||
| <DefineConstants>DEBUG;TRACE</DefineConstants> | ||
| <ErrorReport>prompt</ErrorReport> | ||
| <WarningLevel>4</WarningLevel> | ||
| </PropertyGroup> | ||
| <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> | ||
| <DebugType>pdbonly</DebugType> | ||
| <Optimize>true</Optimize> | ||
| <OutputPath>bin\Release\</OutputPath> | ||
| <DefineConstants>TRACE</DefineConstants> | ||
| <ErrorReport>prompt</ErrorReport> | ||
| <WarningLevel>4</WarningLevel> | ||
| </PropertyGroup> | ||
| <PropertyGroup> | ||
| <UseWindowsForms>true</UseWindowsForms> | ||
| <ImportWindowsDesktopTargets>true</ImportWindowsDesktopTargets> | ||
| <SignAssembly>true</SignAssembly> | ||
| </PropertyGroup> | ||
| <PropertyGroup> | ||
| <AssemblyOriginatorKeyFile>Key.snk</AssemblyOriginatorKeyFile> | ||
| </PropertyGroup> | ||
| <PropertyGroup> | ||
| <RunPostBuildEvent>OnOutputUpdated</RunPostBuildEvent> | ||
| </PropertyGroup> | ||
| <ItemGroup> | ||
| <Reference Include="System" /> | ||
| <Reference Include="System.Core" /> | ||
| <Reference Include="System.Drawing" /> | ||
| <Reference Include="System.Windows.Forms" /> | ||
| <Reference Include="System.Xml.Linq" /> | ||
| <Reference Include="System.Data.DataSetExtensions" /> | ||
| <Reference Include="Microsoft.CSharp" /> | ||
| <Reference Include="System.Data" /> | ||
| <Reference Include="System.Xml" /> | ||
| </ItemGroup> | ||
| <ItemGroup> | ||
| <Compile Include="CopyDirectoryLocationHandler.cs" /> | ||
| <Compile Include="Properties\AssemblyInfo.cs" /> | ||
| <ProjectReference Include="..\..\..\SharpShell\SharpShell.csproj" /> | ||
| </ItemGroup> | ||
| <ItemGroup> | ||
| <None Include="Key.snk" /> | ||
| <PackageReference Include="Microsoft.CSharp" Version="4.7.0" /> | ||
| <PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" /> | ||
| </ItemGroup> | ||
| <ItemGroup> | ||
| <ProjectReference Include="..\..\..\SharpShell\SharpShell.csproj"> | ||
| <Project>{b5d5f670-bfba-4d09-91c6-74bb12b7edd4}</Project> | ||
| <Name>SharpShell</Name> | ||
| </ProjectReference> | ||
| </ItemGroup> | ||
| <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> | ||
| <PropertyGroup> | ||
| <PostBuildEvent> | ||
| </PostBuildEvent> | ||
| </PropertyGroup> | ||
| <!-- To modify your build process, add your task inside one of the targets below and uncomment it. | ||
| Other similar extension points exist, see Microsoft.Common.targets. | ||
| <Target Name="BeforeBuild"> | ||
| </Target> | ||
| <Target Name="AfterBuild"> | ||
| </Target> | ||
| --> | ||
| </Project> | ||
| </Project> |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why is this file smaller? Or is it removed completely?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Seems related to
https://github.com/dwmkerr/apex
https://www.nuget.org/packages/Apex
But file version is 1.6.0, so may be a private build that was never published to nuget, because last nuget is 1.5.0...
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
But is it possible that Apex.WinForms.dll loads Apex.dll dynamically? Or is it truly unused?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Everything certainly seems to function, but the file version is a good point. No clue why Apex.WinForms was never put on nuget