-
Notifications
You must be signed in to change notification settings - Fork 114
Remove .NET Framework as a target framework #1669
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
Merged
Merged
Changes from all commits
Commits
Show all changes
26 commits
Select commit
Hold shift + click to select a range
66ace18
Remove net462 as a target framework from all projects
APErebus 3b078e7
Tweak build process and clean up Calamari.Testing
APErebus cca0c16
Fix sbom
APErebus d99464f
Ignore win7-x86 rids
APErebus 0f4da35
Clean up the buildable projects
APErebus c5fda4f
Fix compile
APErebus 6a9ffee
Build the test project
APErebus f6d3bf1
Fix consolidation tests
APErebus 2dad47c
Update LangVersion to default for all projects
APErebus 0e17a0d
Change Calamari.Common to .NET 8.0 (from netstandard)
APErebus 0831b61
Change remaining projects to .NET 8 from netstandard
APErebus 242747c
Remove test attribute
APErebus 5bf9a9c
Try and fix build issue
APErebus 36625cc
Remove unused field
APErebus 71908d1
Add ability to publish individual project
APErebus e600ddd
Merge branch 'main' into ap/remove-netfx
APErebus b374e98
Fix bad merge
APErebus b318e5d
Fix bad merge
APErebus aa72a73
Merge branch 'main' into ap/remove-netfx
APErebus 0e2b947
Merge branch 'main' into ap/remove-netfx
APErebus e267a82
Merge branch 'main' into ap/remove-netfx
APErebus 56c5353
Fix consolidated libraries not packing
APErebus 629a213
Fix consolidation
APErebus de8126a
Merge branch 'main' into ap/remove-netfx
APErebus 3dc4cc2
Make shim publish depend on the CalamariProjectsGetCalamariFlavourPro…
APErebus c393257
Change to only build a single project at a time
APErebus 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
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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 |
|---|---|---|
|
|
@@ -5,9 +5,10 @@ | |
| <TreatWarningsAsErrors>true</TreatWarningsAsErrors> | ||
| <IsPackable>false</IsPackable> | ||
| <OutputType>Exe</OutputType> | ||
| <TargetFrameworks>net462;net8.0</TargetFrameworks> | ||
| <RuntimeIdentifiers>win-x64;linux-x64;osx-x64;linux-arm;linux-arm64</RuntimeIdentifiers> | ||
| <LangVersion>8.0</LangVersion> | ||
| <TargetFramework>net8.0</TargetFramework> | ||
| <RuntimeIdentifiers>win-x64</RuntimeIdentifiers> | ||
|
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This project is only build for windows. I'm not sure why this has all the other runtime identifiers? |
||
| <LangVersion>default</LangVersion> | ||
| <TreatWarningsAsErrors>true</TreatWarningsAsErrors> | ||
| </PropertyGroup> | ||
|
|
||
|
|
@@ -26,11 +27,7 @@ | |
| <ProjectReference Include="..\Calamari.CloudAccounts\Calamari.CloudAccounts.csproj" /> | ||
| </ItemGroup> | ||
|
|
||
| <ItemGroup Condition="'$(TargetFramework)' == 'net462'"> | ||
| <PackageReference Include="Microsoft.Web.Deployment" Version="4.0.5"/> | ||
| </ItemGroup> | ||
|
|
||
| <ItemGroup Condition="'$(IsWindowsNetCoreBuild)' == 'true'"> | ||
| <ItemGroup> | ||
| <Content Include="netcoreshim/*.*"> | ||
| <LinkBase>netcoreshim</LinkBase> | ||
| <Pack>true</Pack> | ||
|
|
@@ -56,13 +53,13 @@ | |
|
|
||
| <Target Name="GetNetCoreShimFiles"> | ||
| <ItemGroup> | ||
| <NetCoreShimFiles Include="$(MSBuildProjectDirectory)/netcoreshim/netcoreshim.zip" Condition="'$(IsWindowsNetCoreBuild)' == 'true'"/> | ||
| <NetCoreShimFiles Include="$(MSBuildProjectDirectory)/netcoreshim/netcoreshim.zip"/> | ||
| </ItemGroup> | ||
| </Target> | ||
| <Target Name="CopyNetCoreShimFilesAfterBuild" AfterTargets="Build" DependsOnTargets="GetNetCoreShimFiles" Condition="'$(IsWindowsNetCoreBuild)' == 'true'" > | ||
| <Unzip SourceFiles="@(NetCoreShimFiles)" DestinationFolder="$(OutputPath)/netcoreshim" /> | ||
| <Target Name="CopyNetCoreShimFilesAfterBuild" AfterTargets="Build" DependsOnTargets="GetNetCoreShimFiles"> | ||
| <Unzip SourceFiles="@(NetCoreShimFiles)" DestinationFolder="$(OutDir)/netcoreshim" /> | ||
| </Target> | ||
| <Target Name="CopyNetCoreShimFilesAfterPublish" AfterTargets="Publish" DependsOnTargets="GetNetCoreShimFiles" Condition="'$(IsWindowsNetCoreBuild)' == 'true'" > | ||
| <Target Name="CopyNetCoreShimFilesAfterPublish" AfterTargets="Publish" DependsOnTargets="GetNetCoreShimFiles"> | ||
| <Unzip SourceFiles="@(NetCoreShimFiles)" DestinationFolder="$(PublishDir)/netcoreshim" /> | ||
| </Target> | ||
|
|
||
|
|
@@ -73,11 +70,11 @@ | |
| <DotnetScriptFiles Include="$(MSBuildProjectDirectory)/../Calamari.Scripting/DotnetScript/dotnet-script.*.zip"/> | ||
| </ItemGroup> | ||
| </Target> | ||
| <Target Name="CopyDotnetScriptFilesAfterBuild" AfterTargets="Build" DependsOnTargets="GetToolFiles"> | ||
| <Unzip SourceFiles="@(DotnetScriptFiles)" DestinationFolder="$(OutputPath)/" /> | ||
| </Target> | ||
|
|
||
| <Target Name="CopyDotnetScriptFilesAfterPublish" AfterTargets="Publish" DependsOnTargets="GetToolFiles"> | ||
| <Unzip SourceFiles="@(DotnetScriptFiles)" DestinationFolder="$(PublishDir)/" /> | ||
| </Target> | ||
| <Target Name="CopyDotnetScriptFilesAfterBuild" AfterTargets="Build" DependsOnTargets="GetToolFiles"> | ||
| <Unzip SourceFiles="@(DotnetScriptFiles)" DestinationFolder="$(OutputPath)/" /> | ||
| </Target> | ||
| <Target Name="CopyDotnetScriptFilesAfterPublish" AfterTargets="Publish" DependsOnTargets="GetToolFiles"> | ||
| <Unzip SourceFiles="@(DotnetScriptFiles)" DestinationFolder="$(PublishDir)/" /> | ||
| </Target> | ||
| </Project> | ||
This file contains hidden or 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
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.
Uh oh!
There was an error while loading. Please reload this page.