diff --git a/.github/actions/download-artifact/action.yml b/.github/actions/download-artifact/action.yml index c1cb9347..d23bc854 100644 --- a/.github/actions/download-artifact/action.yml +++ b/.github/actions/download-artifact/action.yml @@ -4,6 +4,9 @@ inputs: UET_ARTIFACT_NAME: description: "The known name of the artifact." required: true + UET_FRAMEWORK_TARGET: + description: "The .NET framework identifier." + required: true runs: using: 'composite' steps: @@ -42,21 +45,21 @@ runs: uses: actions/download-artifact@v4 with: name: shim-win - path: UET/uet.shim/bin/Release/net8.0/win-x64/publish/ + path: UET/uet.shim/bin/Release/${{ inputs.UET_FRAMEWORK_TARGET }}/win-x64/publish/ merge-multiple: true - name: Download Pass 1 Win if: ${{ inputs.UET_ARTIFACT_NAME == 'pass-1-win' }} uses: actions/download-artifact@v4 with: name: pass-1-win - path: UET/uet/bin/Release/net8.0/win-x64/publish/ + path: UET/uet/bin/Release/${{ inputs.UET_FRAMEWORK_TARGET }}/win-x64/publish/ merge-multiple: true - name: Download Pass 2 Win if: ${{ inputs.UET_ARTIFACT_NAME == 'pass-2-win' }} uses: actions/download-artifact@v4 with: name: pass-2-win - path: UET/uet/bin/Release/net8.0/win-x64/publish/ + path: UET/uet/bin/Release/${{ inputs.UET_FRAMEWORK_TARGET }}/win-x64/publish/ merge-multiple: true - name: Download UEFS Mac @@ -71,21 +74,21 @@ runs: uses: actions/download-artifact@v4 with: name: shim-mac - path: UET/uet.shim/bin/Release/net8.0/osx-arm64/publish/ + path: UET/uet.shim/bin/Release/${{ inputs.UET_FRAMEWORK_TARGET }}/osx-arm64/publish/ merge-multiple: true - name: Download Pass 1 Mac if: ${{ inputs.UET_ARTIFACT_NAME == 'pass-1-mac' }} uses: actions/download-artifact@v4 with: name: pass-1-mac - path: UET/uet/bin/Release/net8.0/osx-arm64/publish/ + path: UET/uet/bin/Release/${{ inputs.UET_FRAMEWORK_TARGET }}/osx-arm64/publish/ merge-multiple: true - name: Download Pass 2 Mac if: ${{ inputs.UET_ARTIFACT_NAME == 'pass-2-mac' }} uses: actions/download-artifact@v4 with: name: pass-2-mac - path: UET/uet/bin/Release/net8.0/osx-arm64/publish/ + path: UET/uet/bin/Release/${{ inputs.UET_FRAMEWORK_TARGET }}/osx-arm64/publish/ merge-multiple: true - name: Download Libs Win diff --git a/.github/actions/upload-artifact/action.yml b/.github/actions/upload-artifact/action.yml index d3d860f9..d7b08722 100644 --- a/.github/actions/upload-artifact/action.yml +++ b/.github/actions/upload-artifact/action.yml @@ -5,7 +5,7 @@ inputs: description: "The known name of the artifact." required: true UET_FRAMEWORK_TARGET: - description: "The target framework." + description: "The .NET framework identifier." required: true runs: using: 'composite' @@ -49,8 +49,8 @@ runs: name: uefs-win if-no-files-found: error path: | - UET/Redpoint.Uefs.Client/bin/Release/net8.0/win-x64/publish/uefs.exe - UET/Redpoint.Uefs.Daemon/bin/Release/net8.0/win-x64/publish/uefs-daemon.exe + UET/Redpoint.Uefs.Client/bin/Release/${{ inputs.UET_FRAMEWORK_TARGET }}/win-x64/publish/uefs.exe + UET/Redpoint.Uefs.Daemon/bin/Release/${{ inputs.UET_FRAMEWORK_TARGET }}/win-x64/publish/uefs-daemon.exe - name: Upload Shim Win if: ${{ inputs.UET_ARTIFACT_NAME == 'shim-win' }} uses: actions/upload-artifact@v4 @@ -58,7 +58,7 @@ runs: name: shim-win if-no-files-found: error path: | - UET/uet.shim/bin/Release/net8.0/win-x64/publish/uet.exe + UET/uet.shim/bin/Release/${{ inputs.UET_FRAMEWORK_TARGET }}/win-x64/publish/uet.exe - name: Upload Pass 1 Win if: ${{ inputs.UET_ARTIFACT_NAME == 'pass-1-win' }} uses: actions/upload-artifact@v4 @@ -66,7 +66,7 @@ runs: name: pass-1-win if-no-files-found: error path: | - UET/uet/bin/Release/net8.0/win-x64/publish/uet.exe + UET/uet/bin/Release/${{ inputs.UET_FRAMEWORK_TARGET }}/win-x64/publish/uet.exe - name: Upload Pass 2 Win if: ${{ inputs.UET_ARTIFACT_NAME == 'pass-2-win' }} uses: actions/upload-artifact@v4 @@ -74,7 +74,7 @@ runs: name: pass-2-win if-no-files-found: error path: | - UET/uet/bin/Release/net8.0/win-x64/publish/uet.exe + UET/uet/bin/Release/${{ inputs.UET_FRAMEWORK_TARGET }}/win-x64/publish/uet.exe - name: Upload UEFS Mac if: ${{ inputs.UET_ARTIFACT_NAME == 'uefs-mac' }} @@ -83,8 +83,8 @@ runs: name: uefs-mac if-no-files-found: error path: | - UET/Redpoint.Uefs.Client/bin/Release/net8.0/osx-arm64/publish/uefs - UET/Redpoint.Uefs.Daemon/bin/Release/net8.0/osx-arm64/publish/uefs-daemon + UET/Redpoint.Uefs.Client/bin/Release/${{ inputs.UET_FRAMEWORK_TARGET }}/osx-arm64/publish/uefs + UET/Redpoint.Uefs.Daemon/bin/Release/${{ inputs.UET_FRAMEWORK_TARGET }}/osx-arm64/publish/uefs-daemon - name: Upload Shim Mac if: ${{ inputs.UET_ARTIFACT_NAME == 'shim-mac' }} uses: actions/upload-artifact@v4 @@ -92,7 +92,7 @@ runs: name: shim-mac if-no-files-found: error path: | - UET/uet.shim/bin/Release/net8.0/osx-arm64/publish/uet + UET/uet.shim/bin/Release/${{ inputs.UET_FRAMEWORK_TARGET }}/osx-arm64/publish/uet - name: Upload Pass 1 Mac if: ${{ inputs.UET_ARTIFACT_NAME == 'pass-1-mac' }} uses: actions/upload-artifact@v4 @@ -100,7 +100,7 @@ runs: name: pass-1-mac if-no-files-found: error path: | - UET/uet/bin/Release/net8.0/osx-arm64/publish/uet + UET/uet/bin/Release/${{ inputs.UET_FRAMEWORK_TARGET }}/osx-arm64/publish/uet - name: Upload Pass 2 Mac if: ${{ inputs.UET_ARTIFACT_NAME == 'pass-2-mac' }} uses: actions/upload-artifact@v4 @@ -108,7 +108,7 @@ runs: name: pass-2-mac if-no-files-found: error path: | - UET/uet/bin/Release/net8.0/osx-arm64/publish/uet + UET/uet/bin/Release/${{ inputs.UET_FRAMEWORK_TARGET }}/osx-arm64/publish/uet - name: Upload Libs Win if: ${{ inputs.UET_ARTIFACT_NAME == 'libs-win' }} diff --git a/.github/workflows/uet.yml b/.github/workflows/uet.yml index 067b36d4..08c4bc82 100644 --- a/.github/workflows/uet.yml +++ b/.github/workflows/uet.yml @@ -152,12 +152,12 @@ jobs: run: | sudo apt-get update sudo apt-get install -y clang zlib1g-dev dotnet-sdk-8.0 - dotnet publish /p:TargetFramework=net8.0 -c Release -r linux-x64 UET/Redpoint.StringEnum.TrimTests/Redpoint.StringEnum.TrimTests.csproj + dotnet publish /p:TargetFramework=${{ env.UET_FRAMEWORK_TARGET }} -c Release -r linux-x64 UET/Redpoint.StringEnum.TrimTests/Redpoint.StringEnum.TrimTests.csproj if ($LastExitCode -ne 0) { Write-Host "dotnet build (Redpoint.StringEnum.TrimTests.csproj) failed with exit code $LastExitCode" exit $LastExitCode } - UET/Redpoint.StringEnum.TrimTests/bin/Release/net8.0/linux-x64/publish/Redpoint.StringEnum.TrimTests + UET/Redpoint.StringEnum.TrimTests/bin/Release/${{ env.UET_FRAMEWORK_TARGET }}/linux-x64/publish/Redpoint.StringEnum.TrimTests if ($LastExitCode -ne 0) { Write-Host "Redpoint.StringEnum.TrimTests failed with exit code $LastExitCode" exit $LastExitCode @@ -185,10 +185,12 @@ jobs: uses: ./.github/actions/download-artifact with: UET_ARTIFACT_NAME: autodiscovery + UET_FRAMEWORK_TARGET: ${{ env.UET_FRAMEWORK_TARGET }} - name: Download Mac Logging uses: ./.github/actions/download-artifact with: UET_ARTIFACT_NAME: mac-logging + UET_FRAMEWORK_TARGET: ${{ env.UET_FRAMEWORK_TARGET }} - name: Build UEFS Client shell: pwsh run: | @@ -245,10 +247,12 @@ jobs: uses: ./.github/actions/download-artifact with: UET_ARTIFACT_NAME: autodiscovery + UET_FRAMEWORK_TARGET: ${{ env.UET_FRAMEWORK_TARGET }} - name: Download Mac Logging uses: ./.github/actions/download-artifact with: UET_ARTIFACT_NAME: mac-logging + UET_FRAMEWORK_TARGET: ${{ env.UET_FRAMEWORK_TARGET }} - name: Build UEFS Client shell: pwsh run: | @@ -264,7 +268,7 @@ jobs: UET/Redpoint.Uefs.Client/Redpoint.Uefs.Client.csproj if ($LastExitCode -ne 0) { exit $LastExitCode } # Ensure the thing we built will actually run... - ./UET/Redpoint.Uefs.Client/bin/Release/net8.0/osx-arm64/publish/uefs --help + ./UET/Redpoint.Uefs.Client/bin/Release/${{ env.UET_FRAMEWORK_TARGET }}/osx-arm64/publish/uefs --help if ($LastExitCode -ne 0) { exit $LastExitCode } - name: Build UEFS Daemon shell: pwsh @@ -308,10 +312,12 @@ jobs: uses: ./.github/actions/download-artifact with: UET_ARTIFACT_NAME: autodiscovery + UET_FRAMEWORK_TARGET: ${{ env.UET_FRAMEWORK_TARGET }} - name: Download Mac Logging uses: ./.github/actions/download-artifact with: UET_ARTIFACT_NAME: mac-logging + UET_FRAMEWORK_TARGET: ${{ env.UET_FRAMEWORK_TARGET }} - name: Build UET Shim shell: pwsh run: | @@ -354,10 +360,12 @@ jobs: uses: ./.github/actions/download-artifact with: UET_ARTIFACT_NAME: autodiscovery + UET_FRAMEWORK_TARGET: ${{ env.UET_FRAMEWORK_TARGET }} - name: Download Mac Logging uses: ./.github/actions/download-artifact with: UET_ARTIFACT_NAME: mac-logging + UET_FRAMEWORK_TARGET: ${{ env.UET_FRAMEWORK_TARGET }} - name: Build UET Shim shell: pwsh run: | @@ -400,10 +408,12 @@ jobs: uses: ./.github/actions/download-artifact with: UET_ARTIFACT_NAME: autodiscovery + UET_FRAMEWORK_TARGET: ${{ env.UET_FRAMEWORK_TARGET }} - name: Download Mac Logging uses: ./.github/actions/download-artifact with: UET_ARTIFACT_NAME: mac-logging + UET_FRAMEWORK_TARGET: ${{ env.UET_FRAMEWORK_TARGET }} - name: Build UET Pass 1 shell: pwsh run: | @@ -446,10 +456,12 @@ jobs: uses: ./.github/actions/download-artifact with: UET_ARTIFACT_NAME: autodiscovery + UET_FRAMEWORK_TARGET: ${{ env.UET_FRAMEWORK_TARGET }} - name: Download Mac Logging uses: ./.github/actions/download-artifact with: UET_ARTIFACT_NAME: mac-logging + UET_FRAMEWORK_TARGET: ${{ env.UET_FRAMEWORK_TARGET }} - name: Build UET Pass 1 shell: pwsh run: | @@ -465,7 +477,7 @@ jobs: UET/uet/uet.csproj if ($LastExitCode -ne 0) { exit $LastExitCode } # Ensure the thing we built will actually run... - ./UET/uet/bin/Release/net8.0/osx-arm64/publish/uet --help + ./UET/uet/bin/Release/${{ env.UET_FRAMEWORK_TARGET }}/osx-arm64/publish/uet --help if ($LastExitCode -ne 0) { exit $LastExitCode } - name: Upload Binaries uses: ./.github/actions/upload-artifact @@ -495,10 +507,12 @@ jobs: uses: ./.github/actions/download-artifact with: UET_ARTIFACT_NAME: autodiscovery + UET_FRAMEWORK_TARGET: ${{ env.UET_FRAMEWORK_TARGET }} - name: Download Mac Logging uses: ./.github/actions/download-artifact with: UET_ARTIFACT_NAME: mac-logging + UET_FRAMEWORK_TARGET: ${{ env.UET_FRAMEWORK_TARGET }} - name: Install WinFsp shell: pwsh run: | @@ -516,7 +530,7 @@ jobs: foreach ($Item in (Get-ChildItem UET -Filter *.Tests)) { if (Test-Path "$($Item.FullName)/$($Item.Name).csproj") { Write-Host "============ STARTING: $($Item.Name) ============" - dotnet test --logger:"console" --logger:"trx;LogFileName=$($Item.Name).test-result.trx" --results-directory "$((Get-Location).Path)\TestResults" "$($Item.FullName)/bin/Release/net8.0/$($Item.Name).dll" + dotnet test --logger:"console" --logger:"trx;LogFileName=$($Item.Name).test-result.trx" --results-directory "$((Get-Location).Path)\TestResults" "$($Item.FullName)/bin/Release/${{ env.UET_FRAMEWORK_TARGET }}/$($Item.Name).dll" if ($LastExitCode -ne 0) { Write-Host "============ FAILED: $($Item.Name) ============" exit $LastExitCode @@ -559,10 +573,12 @@ jobs: uses: ./.github/actions/download-artifact with: UET_ARTIFACT_NAME: autodiscovery + UET_FRAMEWORK_TARGET: ${{ env.UET_FRAMEWORK_TARGET }} - name: Download Mac Logging uses: ./.github/actions/download-artifact with: UET_ARTIFACT_NAME: mac-logging + UET_FRAMEWORK_TARGET: ${{ env.UET_FRAMEWORK_TARGET }} - name: Build and Test Libraries on macOS run: | set -e @@ -593,18 +609,22 @@ jobs: uses: ./.github/actions/download-artifact with: UET_ARTIFACT_NAME: autodiscovery + UET_FRAMEWORK_TARGET: ${{ env.UET_FRAMEWORK_TARGET }} - name: Download Mac Logging uses: ./.github/actions/download-artifact with: UET_ARTIFACT_NAME: mac-logging + UET_FRAMEWORK_TARGET: ${{ env.UET_FRAMEWORK_TARGET }} - name: Download Windows Pass 1 uses: ./.github/actions/download-artifact with: UET_ARTIFACT_NAME: pass-1-win + UET_FRAMEWORK_TARGET: ${{ env.UET_FRAMEWORK_TARGET }} - name: Download macOS Pass 1 uses: ./.github/actions/download-artifact with: UET_ARTIFACT_NAME: pass-1-mac + UET_FRAMEWORK_TARGET: ${{ env.UET_FRAMEWORK_TARGET }} - name: Build UET Pass 2 shell: pwsh run: | @@ -650,18 +670,22 @@ jobs: uses: ./.github/actions/download-artifact with: UET_ARTIFACT_NAME: autodiscovery + UET_FRAMEWORK_TARGET: ${{ env.UET_FRAMEWORK_TARGET }} - name: Download Mac Logging uses: ./.github/actions/download-artifact with: UET_ARTIFACT_NAME: mac-logging + UET_FRAMEWORK_TARGET: ${{ env.UET_FRAMEWORK_TARGET }} - name: Download Windows Pass 1 uses: ./.github/actions/download-artifact with: UET_ARTIFACT_NAME: pass-1-win + UET_FRAMEWORK_TARGET: ${{ env.UET_FRAMEWORK_TARGET }} - name: Download macOS Pass 1 uses: ./.github/actions/download-artifact with: UET_ARTIFACT_NAME: pass-1-mac + UET_FRAMEWORK_TARGET: ${{ env.UET_FRAMEWORK_TARGET }} - name: Build UET Pass 2 shell: pwsh run: | @@ -678,7 +702,7 @@ jobs: UET/uet/uet.csproj if ($LastExitCode -ne 0) { exit $LastExitCode } # Ensure the thing we built will actually run... - ./UET/uet/bin/Release/net8.0/osx-arm64/publish/uet --help + ./UET/uet/bin/Release/${{ env.UET_FRAMEWORK_TARGET }}/osx-arm64/publish/uet --help if ($LastExitCode -ne 0) { exit $LastExitCode } - name: Upload Binaries uses: ./.github/actions/upload-artifact @@ -715,6 +739,7 @@ jobs: uses: ./.github/actions/download-artifact with: UET_ARTIFACT_NAME: libs-win + UET_FRAMEWORK_TARGET: ${{ env.UET_FRAMEWORK_TARGET }} - name: Publish Packages shell: pwsh env: @@ -756,45 +781,52 @@ jobs: uses: ./.github/actions/download-artifact with: UET_ARTIFACT_NAME: uefs-win + UET_FRAMEWORK_TARGET: ${{ env.UET_FRAMEWORK_TARGET }} - name: Download Windows Shim uses: ./.github/actions/download-artifact with: UET_ARTIFACT_NAME: shim-win + UET_FRAMEWORK_TARGET: ${{ env.UET_FRAMEWORK_TARGET }} - name: Download Windows Pass 2 uses: ./.github/actions/download-artifact with: UET_ARTIFACT_NAME: pass-2-win + UET_FRAMEWORK_TARGET: ${{ env.UET_FRAMEWORK_TARGET }} - name: Download macOS UEFS uses: ./.github/actions/download-artifact with: UET_ARTIFACT_NAME: uefs-mac + UET_FRAMEWORK_TARGET: ${{ env.UET_FRAMEWORK_TARGET }} - name: Download macOS Shim uses: ./.github/actions/download-artifact with: UET_ARTIFACT_NAME: shim-mac + UET_FRAMEWORK_TARGET: ${{ env.UET_FRAMEWORK_TARGET }} - name: Download macOS Pass 2 uses: ./.github/actions/download-artifact with: UET_ARTIFACT_NAME: pass-2-mac + UET_FRAMEWORK_TARGET: ${{ env.UET_FRAMEWORK_TARGET }} - name: Download package.version uses: ./.github/actions/download-artifact with: UET_ARTIFACT_NAME: timestamp + UET_FRAMEWORK_TARGET: ${{ env.UET_FRAMEWORK_TARGET }} - name: Publish to GitHub shell: pwsh env: UET_GITHUB_RELEASES_PAT: ${{ secrets.UET_GITHUB_RELEASES_PAT }} run: | - UET/uet/bin/Release/net8.0/win-x64/publish/uet.exe internal create-github-release ` + UET/uet/bin/Release/${{ env.UET_FRAMEWORK_TARGET }}/win-x64/publish/uet.exe internal create-github-release ` --version ${env:UET_PACKAGE_VERSION} ` - --file "uet.exe=UET for Windows=UET/uet/bin/Release/net8.0/win-x64/publish/uet.exe" ` - --file "uefs.exe=UEFS Client for Windows=UET/Redpoint.Uefs.Client/bin/Release/net8.0/win-x64/publish/uefs.exe" ` - --file "uefs-daemon.exe=UEFS Daemon for Windows=UET/Redpoint.Uefs.Daemon/bin/Release/net8.0/win-x64/publish/uefs-daemon.exe" ` - --file "uet.shim.exe=UET Shim for Windows=UET/uet.shim/bin/Release/net8.0/win-x64/publish/uet.exe" ` - --file "uet=UET for macOS=UET/uet/bin/Release/net8.0/osx-arm64/publish/uet" ` - --file "uefs=UEFS Client for macOS=UET/Redpoint.Uefs.Client/bin/Release/net8.0/osx-arm64/publish/uefs" ` - --file "uefs-daemon=UEFS Daemon for macOS=UET/Redpoint.Uefs.Daemon/bin/Release/net8.0/osx-arm64/publish/uefs-daemon" ` - --file "uet.shim=UET Shim for macOS=UET/uet.shim/bin/Release/net8.0/osx-arm64/publish/uet" ` + --file "uet.exe=UET for Windows=UET/uet/bin/Release/${{ env.UET_FRAMEWORK_TARGET }}/win-x64/publish/uet.exe" ` + --file "uefs.exe=UEFS Client for Windows=UET/Redpoint.Uefs.Client/bin/Release/${{ env.UET_FRAMEWORK_TARGET }}/win-x64/publish/uefs.exe" ` + --file "uefs-daemon.exe=UEFS Daemon for Windows=UET/Redpoint.Uefs.Daemon/bin/Release/${{ env.UET_FRAMEWORK_TARGET }}/win-x64/publish/uefs-daemon.exe" ` + --file "uet.shim.exe=UET Shim for Windows=UET/uet.shim/bin/Release/${{ env.UET_FRAMEWORK_TARGET }}/win-x64/publish/uet.exe" ` + --file "uet=UET for macOS=UET/uet/bin/Release/${{ env.UET_FRAMEWORK_TARGET }}/osx-arm64/publish/uet" ` + --file "uefs=UEFS Client for macOS=UET/Redpoint.Uefs.Client/bin/Release/${{ env.UET_FRAMEWORK_TARGET }}/osx-arm64/publish/uefs" ` + --file "uefs-daemon=UEFS Daemon for macOS=UET/Redpoint.Uefs.Daemon/bin/Release/${{ env.UET_FRAMEWORK_TARGET }}/osx-arm64/publish/uefs-daemon" ` + --file "uet.shim=UET Shim for macOS=UET/uet.shim/bin/Release/${{ env.UET_FRAMEWORK_TARGET }}/osx-arm64/publish/uet" ` --file "package.version=Version File=package.version" if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE } @@ -828,6 +860,7 @@ jobs: uses: ./.github/actions/download-artifact with: UET_ARTIFACT_NAME: uefs-win + UET_FRAMEWORK_TARGET: ${{ env.UET_FRAMEWORK_TARGET }} - name: Log in to the Container registry uses: docker/login-action@65b78e6e13532edd9afa3aa52ac7964289d1a9c1 with: @@ -838,5 +871,5 @@ jobs: shell: pwsh run: | docker buildx create --name img-builder --use --platform windows/amd64 - docker buildx build --platform windows/amd64 --output=type=registry -f UET/Lib/Uefs/Kubernetes/Dockerfile -t "ghcr.io/redpointgames/uet/uefs:${env:UET_PACKAGE_VERSION}" . - docker buildx build --platform windows/amd64 --output=type=registry -f UET/Lib/Uefs/Kubernetes/Dockerfile -t "ghcr.io/redpointgames/uet/uefs:latest" . + docker buildx build --platform windows/amd64 --output=type=registry -f UET/Lib/Uefs/Kubernetes/Dockerfile -t "ghcr.io/redpointgames/uet/uefs:${env:UET_PACKAGE_VERSION}" --build-arg UET_TARGET_FRAMEWORK=${{ env.UET_FRAMEWORK_TARGET }} . + docker buildx build --platform windows/amd64 --output=type=registry -f UET/Lib/Uefs/Kubernetes/Dockerfile -t "ghcr.io/redpointgames/uet/uefs:latest" --build-arg UET_TARGET_FRAMEWORK=${{ env.UET_FRAMEWORK_TARGET }} . diff --git a/UET/.editorconfig b/UET/.editorconfig index b43b7700..123abbd2 100644 --- a/UET/.editorconfig +++ b/UET/.editorconfig @@ -69,9 +69,9 @@ dotnet_remove_unnecessary_suppression_exclusions = none #### C# Coding Conventions #### # var preferences -csharp_style_var_elsewhere = false:silent -csharp_style_var_for_built_in_types = false:silent -csharp_style_var_when_type_is_apparent = false:silent +csharp_style_var_elsewhere = true:silent +csharp_style_var_for_built_in_types = true:silent +csharp_style_var_when_type_is_apparent = true:silent # Expression-bodied members csharp_style_expression_bodied_accessors = true:silent @@ -219,6 +219,7 @@ dotnet_naming_style.begins_with_underscore.capitalization = camel_case csharp_style_namespace_declarations = block_scoped:silent csharp_style_prefer_method_group_conversion = true:silent csharp_style_prefer_top_level_statements = true:silent + [*.{cs,vb}] dotnet_style_operator_placement_when_wrapping = beginning_of_line tab_width = 4 @@ -238,4 +239,36 @@ dotnet_style_prefer_inferred_tuple_names = true:suggestion dotnet_style_prefer_inferred_anonymous_type_member_names = true:suggestion dotnet_style_prefer_compound_assignment = true:suggestion dotnet_style_prefer_simplified_interpolation = true:suggestion -dotnet_style_namespace_match_folder = true:suggestion \ No newline at end of file +dotnet_style_namespace_match_folder = true:suggestion + +# Rules that were added in the latest code analyzers that we aren't compliant with (yet) +csharp_style_implicit_object_creation_when_type_is_apparent = true:suggestion +csharp_style_prefer_primary_constructors = false:suggestion +dotnet_style_prefer_collection_expression = true:suggestion +dotnet_diagnostic.IDE0004.severity = suggestion +dotnet_diagnostic.IDE0005.severity = suggestion +dotnet_diagnostic.IDE0007.severity = suggestion +dotnet_diagnostic.IDE0010.severity = suggestion +dotnet_diagnostic.IDE0028.severity = suggestion +dotnet_diagnostic.IDE0039.severity = suggestion +dotnet_diagnostic.IDE0044.severity = suggestion +dotnet_diagnostic.IDE0051.severity = suggestion +dotnet_diagnostic.IDE0052.severity = suggestion +dotnet_diagnostic.IDE0055.severity = suggestion +dotnet_diagnostic.IDE0058.severity = suggestion +dotnet_diagnostic.IDE0072.severity = suggestion +dotnet_diagnostic.IDE0100.severity = suggestion +dotnet_diagnostic.IDE0180.severity = suggestion +dotnet_diagnostic.IDE0230.severity = suggestion +dotnet_diagnostic.IDE0250.severity = suggestion +dotnet_diagnostic.IDE0251.severity = suggestion +dotnet_diagnostic.IDE0305.severity = suggestion +dotnet_diagnostic.CA1514.severity = suggestion +dotnet_diagnostic.CA1515.severity = suggestion +dotnet_diagnostic.CA1859.severity = suggestion +dotnet_diagnostic.CA2007.severity = suggestion +dotnet_diagnostic.CA2022.severity = suggestion +dotnet_diagnostic.CA2263.severity = suggestion + +# Turn off "non-incremental generators not allowed" +dotnet_diagnostic.RS1035.severity = none \ No newline at end of file diff --git a/UET/Lib/Common.Build.props b/UET/Lib/Common.Build.props index 45f4d69b..b4b683d7 100644 --- a/UET/Lib/Common.Build.props +++ b/UET/Lib/Common.Build.props @@ -1,5 +1,7 @@ + + None $(MSBuildThisFileDirectory)../Redpoint.Logging.Mac/bin;$(MSBuildThisFileDirectory)../Redpoint.AutoDiscovery/bin/$(Configuration) @@ -19,18 +21,17 @@ true true true + true + $(NoWarn);CS1591;CS1573 - SYSLIB1224 + $(NoWarn);SYSLIB1224 - - - enable enable diff --git a/UET/Lib/CsWin32.Build.props b/UET/Lib/CsWin32.Build.props index 36f6e22b..ba05e0b4 100644 --- a/UET/Lib/CsWin32.Build.props +++ b/UET/Lib/CsWin32.Build.props @@ -3,7 +3,7 @@ true - CS9195 + $(NoWarn);CS9195 diff --git a/UET/Lib/Framework.Build.props b/UET/Lib/Framework.Build.props index 4afb2c0d..6ccdfc70 100644 --- a/UET/Lib/Framework.Build.props +++ b/UET/Lib/Framework.Build.props @@ -2,6 +2,11 @@ net8.0 + + + net8.0;net48 + + 8.* \ No newline at end of file diff --git a/UET/Lib/Redpoint.ThirdParty.B2Net/Redpoint.ThirdParty.B2Net.csproj b/UET/Lib/Redpoint.ThirdParty.B2Net/Redpoint.ThirdParty.B2Net.csproj index 557eec0a..d102bb91 100644 --- a/UET/Lib/Redpoint.ThirdParty.B2Net/Redpoint.ThirdParty.B2Net.csproj +++ b/UET/Lib/Redpoint.ThirdParty.B2Net/Redpoint.ThirdParty.B2Net.csproj @@ -10,7 +10,7 @@ true B2Net false - 1591 + $(NoWarn);1591 latest false diff --git a/UET/Lib/Redpoint.ThirdParty.DiscUtils/Redpoint.ThirdParty.DiscUtils.csproj b/UET/Lib/Redpoint.ThirdParty.DiscUtils/Redpoint.ThirdParty.DiscUtils.csproj index 61263814..34b208e7 100644 --- a/UET/Lib/Redpoint.ThirdParty.DiscUtils/Redpoint.ThirdParty.DiscUtils.csproj +++ b/UET/Lib/Redpoint.ThirdParty.DiscUtils/Redpoint.ThirdParty.DiscUtils.csproj @@ -5,7 +5,7 @@ enable disable false - 1701;1702;1591 + $(NoWarn);1701;1702;1591 true true true diff --git a/UET/Lib/Redpoint.ThirdParty.Docker.Registry.DotNet/Redpoint.ThirdParty.Docker.Registry.DotNet.csproj b/UET/Lib/Redpoint.ThirdParty.Docker.Registry.DotNet/Redpoint.ThirdParty.Docker.Registry.DotNet.csproj index d59e5052..5ec87594 100644 --- a/UET/Lib/Redpoint.ThirdParty.Docker.Registry.DotNet/Redpoint.ThirdParty.Docker.Registry.DotNet.csproj +++ b/UET/Lib/Redpoint.ThirdParty.Docker.Registry.DotNet/Redpoint.ThirdParty.Docker.Registry.DotNet.csproj @@ -5,7 +5,7 @@ enable disable false - 1701;1702;1591 + $(NoWarn);1701;1702;1591 true true true @@ -27,7 +27,7 @@ - + diff --git a/UET/Lib/Redpoint.ThirdParty.Microsoft.Extensions.Logging.Console/Redpoint.ThirdParty.Microsoft.Extensions.Logging.Console.csproj b/UET/Lib/Redpoint.ThirdParty.Microsoft.Extensions.Logging.Console/Redpoint.ThirdParty.Microsoft.Extensions.Logging.Console.csproj index 6e7e3a2e..91e77091 100644 --- a/UET/Lib/Redpoint.ThirdParty.Microsoft.Extensions.Logging.Console/Redpoint.ThirdParty.Microsoft.Extensions.Logging.Console.csproj +++ b/UET/Lib/Redpoint.ThirdParty.Microsoft.Extensions.Logging.Console/Redpoint.ThirdParty.Microsoft.Extensions.Logging.Console.csproj @@ -12,7 +12,7 @@ Microsoft.Extensions.Logging.Console Redpoint.ThirdParty.Microsoft.Extensions.Logging.Console enable - 1591 + $(NoWarn);1591 latest false @@ -30,11 +30,11 @@ - - - - - + + + + + diff --git a/UET/Lib/Redpoint.ThirdParty.SharpSnmp/Redpoint.ThirdParty.SharpSnmp.csproj b/UET/Lib/Redpoint.ThirdParty.SharpSnmp/Redpoint.ThirdParty.SharpSnmp.csproj index 4b0c7d9c..802408a8 100644 --- a/UET/Lib/Redpoint.ThirdParty.SharpSnmp/Redpoint.ThirdParty.SharpSnmp.csproj +++ b/UET/Lib/Redpoint.ThirdParty.SharpSnmp/Redpoint.ThirdParty.SharpSnmp.csproj @@ -4,9 +4,8 @@ Lextm.SharpSnmpLib - net8.0 true - S5547;S907;S1133;S101;S1135 + $(NoWarn);S5547;S907;S1133;S101;S1135 diff --git a/UET/Lib/Redpoint.ThirdParty.WinFsp/Redpoint.ThirdParty.WinFsp.csproj b/UET/Lib/Redpoint.ThirdParty.WinFsp/Redpoint.ThirdParty.WinFsp.csproj index 5b7c8c3c..61400998 100644 --- a/UET/Lib/Redpoint.ThirdParty.WinFsp/Redpoint.ThirdParty.WinFsp.csproj +++ b/UET/Lib/Redpoint.ThirdParty.WinFsp/Redpoint.ThirdParty.WinFsp.csproj @@ -5,7 +5,7 @@ disable disable true - 1591 + $(NoWarn);1591 true true true diff --git a/UET/Lib/Redpoint.ThirdParty.ZoneTree/Redpoint.ThirdParty.ZoneTree.csproj b/UET/Lib/Redpoint.ThirdParty.ZoneTree/Redpoint.ThirdParty.ZoneTree.csproj index 851157eb..3af08cf9 100644 --- a/UET/Lib/Redpoint.ThirdParty.ZoneTree/Redpoint.ThirdParty.ZoneTree.csproj +++ b/UET/Lib/Redpoint.ThirdParty.ZoneTree/Redpoint.ThirdParty.ZoneTree.csproj @@ -6,7 +6,6 @@ true true en-US - net8.0 https://github.com/koculu/ZoneTree false enable @@ -66,7 +65,7 @@ - + diff --git a/UET/Lib/Uefs/Kubernetes/Dockerfile b/UET/Lib/Uefs/Kubernetes/Dockerfile index 527334ce..1f21c007 100644 --- a/UET/Lib/Uefs/Kubernetes/Dockerfile +++ b/UET/Lib/Uefs/Kubernetes/Dockerfile @@ -1,8 +1,8 @@ FROM mcr.microsoft.com/oss/kubernetes/windows-host-process-containers-base-image:v1.0.0 ADD UET/Lib/Uefs/Kubernetes/run-service.ps1 ./run-service.ps1 -ADD UET/Redpoint.Uefs.Daemon/bin/Release/net8.0/win-x64/publish/uefs-daemon.exe ./uefs-daemon.exe -ADD UET/Redpoint.Uefs.Client/bin/Release/net8.0/win-x64/publish/uefs.exe ./uefs.exe +ADD UET/Redpoint.Uefs.Daemon/bin/Release/${UET_TARGET_FRAMEWORK}/win-x64/publish/uefs-daemon.exe ./uefs-daemon.exe +ADD UET/Redpoint.Uefs.Client/bin/Release/${UET_TARGET_FRAMEWORK}/win-x64/publish/uefs.exe ./uefs.exe ENV PATH="C:\Windows\system32;C:\Windows;C:\WINDOWS\System32\WindowsPowerShell\v1.0\;" diff --git a/UET/Lib/XunitTesting.Build.props b/UET/Lib/XunitTesting.Build.props index 849e3893..f9db5820 100644 --- a/UET/Lib/XunitTesting.Build.props +++ b/UET/Lib/XunitTesting.Build.props @@ -1,7 +1,8 @@ + + - net8.0 enable enable None @@ -14,22 +15,21 @@ - + - + - - + + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all - - + diff --git a/UET/Redpoint.AutoDiscovery/Redpoint.AutoDiscovery.csproj b/UET/Redpoint.AutoDiscovery/Redpoint.AutoDiscovery.csproj index f2d525d6..31a715f5 100644 --- a/UET/Redpoint.AutoDiscovery/Redpoint.AutoDiscovery.csproj +++ b/UET/Redpoint.AutoDiscovery/Redpoint.AutoDiscovery.csproj @@ -8,8 +8,8 @@ - - + + diff --git a/UET/Redpoint.CommandLine/Redpoint.CommandLine.csproj b/UET/Redpoint.CommandLine/Redpoint.CommandLine.csproj index c2adb755..e79a7d2b 100644 --- a/UET/Redpoint.CommandLine/Redpoint.CommandLine.csproj +++ b/UET/Redpoint.CommandLine/Redpoint.CommandLine.csproj @@ -9,7 +9,7 @@ - + diff --git a/UET/Redpoint.Git.GitHub/Redpoint.Git.GitHub.csproj b/UET/Redpoint.Git.GitHub/Redpoint.Git.GitHub.csproj index 31f3141b..d05cfb48 100644 --- a/UET/Redpoint.Git.GitHub/Redpoint.Git.GitHub.csproj +++ b/UET/Redpoint.Git.GitHub/Redpoint.Git.GitHub.csproj @@ -9,7 +9,7 @@ - + diff --git a/UET/Redpoint.Git.Managed.PerformanceProfiling/Redpoint.Git.Managed.PerformanceProfiling.csproj b/UET/Redpoint.Git.Managed.PerformanceProfiling/Redpoint.Git.Managed.PerformanceProfiling.csproj index 41967601..c743ed0b 100644 --- a/UET/Redpoint.Git.Managed.PerformanceProfiling/Redpoint.Git.Managed.PerformanceProfiling.csproj +++ b/UET/Redpoint.Git.Managed.PerformanceProfiling/Redpoint.Git.Managed.PerformanceProfiling.csproj @@ -1,14 +1,15 @@  + + Exe - net8.0 enable enable - + diff --git a/UET/Redpoint.Git.Managed.Tests/ExecutionEngineTests.cs b/UET/Redpoint.Git.Managed.Tests/ExecutionEngineTests.cs index 68bc87c2..76098928 100644 --- a/UET/Redpoint.Git.Managed.Tests/ExecutionEngineTests.cs +++ b/UET/Redpoint.Git.Managed.Tests/ExecutionEngineTests.cs @@ -73,7 +73,7 @@ public async Task CanRetrieveLooseAndPackedObjects() } }); Assert.True( - await s.WaitAsync(5000, CancellationToken.None).ConfigureAwait(false), + await s.WaitAsync(5000, CancellationToken.None).ConfigureAwait(true), "Expected Git operation to complete within 5 seconds"); } } diff --git a/UET/Redpoint.Git.Managed/Redpoint.Git.Managed.csproj b/UET/Redpoint.Git.Managed/Redpoint.Git.Managed.csproj index 39f133f9..aa45f8d3 100644 --- a/UET/Redpoint.Git.Managed/Redpoint.Git.Managed.csproj +++ b/UET/Redpoint.Git.Managed/Redpoint.Git.Managed.csproj @@ -4,7 +4,7 @@ - + diff --git a/UET/Redpoint.GrpcPipes.Abstractions/Redpoint.GrpcPipes.Abstractions.csproj b/UET/Redpoint.GrpcPipes.Abstractions/Redpoint.GrpcPipes.Abstractions.csproj index 29ef751c..44160b27 100644 --- a/UET/Redpoint.GrpcPipes.Abstractions/Redpoint.GrpcPipes.Abstractions.csproj +++ b/UET/Redpoint.GrpcPipes.Abstractions/Redpoint.GrpcPipes.Abstractions.csproj @@ -9,8 +9,8 @@ - - + + diff --git a/UET/Redpoint.GrpcPipes.Tests/Redpoint.GrpcPipes.Tests.csproj b/UET/Redpoint.GrpcPipes.Tests/Redpoint.GrpcPipes.Tests.csproj index eeafd4d7..cf77641b 100644 --- a/UET/Redpoint.GrpcPipes.Tests/Redpoint.GrpcPipes.Tests.csproj +++ b/UET/Redpoint.GrpcPipes.Tests/Redpoint.GrpcPipes.Tests.csproj @@ -1,7 +1,6 @@ - net8.0 enable enable diff --git a/UET/Redpoint.GrpcPipes.Transport.Abstractions/Redpoint.GrpcPipes.Transport.Abstractions.csproj b/UET/Redpoint.GrpcPipes.Transport.Abstractions/Redpoint.GrpcPipes.Transport.Abstractions.csproj index fa71b7ae..a60a0f1a 100644 --- a/UET/Redpoint.GrpcPipes.Transport.Abstractions/Redpoint.GrpcPipes.Transport.Abstractions.csproj +++ b/UET/Redpoint.GrpcPipes.Transport.Abstractions/Redpoint.GrpcPipes.Transport.Abstractions.csproj @@ -1,7 +1,8 @@  + + - net8.0 enable enable diff --git a/UET/Redpoint.GrpcPipes.Transport.Tcp/Redpoint.GrpcPipes.Transport.Tcp.csproj b/UET/Redpoint.GrpcPipes.Transport.Tcp/Redpoint.GrpcPipes.Transport.Tcp.csproj index 31c81915..51046adf 100644 --- a/UET/Redpoint.GrpcPipes.Transport.Tcp/Redpoint.GrpcPipes.Transport.Tcp.csproj +++ b/UET/Redpoint.GrpcPipes.Transport.Tcp/Redpoint.GrpcPipes.Transport.Tcp.csproj @@ -17,13 +17,13 @@ - - - + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/UET/Redpoint.GrpcPipes/Redpoint.GrpcPipes.csproj b/UET/Redpoint.GrpcPipes/Redpoint.GrpcPipes.csproj index af422df3..ce77ae41 100644 --- a/UET/Redpoint.GrpcPipes/Redpoint.GrpcPipes.csproj +++ b/UET/Redpoint.GrpcPipes/Redpoint.GrpcPipes.csproj @@ -9,9 +9,9 @@ - - - + + + diff --git a/UET/Redpoint.Lexer.SourceGenerator/Redpoint.Lexer.SourceGenerator.csproj b/UET/Redpoint.Lexer.SourceGenerator/Redpoint.Lexer.SourceGenerator.csproj index 54c209cf..93fd69c3 100644 --- a/UET/Redpoint.Lexer.SourceGenerator/Redpoint.Lexer.SourceGenerator.csproj +++ b/UET/Redpoint.Lexer.SourceGenerator/Redpoint.Lexer.SourceGenerator.csproj @@ -14,21 +14,24 @@ enable enable true + false + false + false false - NU5128 + $(NoWarn);NU5128 - + - + diff --git a/UET/Redpoint.Logging.File/Redpoint.Logging.File.csproj b/UET/Redpoint.Logging.File/Redpoint.Logging.File.csproj index de0a5c01..ebd01f0b 100644 --- a/UET/Redpoint.Logging.File/Redpoint.Logging.File.csproj +++ b/UET/Redpoint.Logging.File/Redpoint.Logging.File.csproj @@ -3,8 +3,8 @@ - - + + diff --git a/UET/Redpoint.Logging.Mac/Redpoint.Logging.Mac.csproj b/UET/Redpoint.Logging.Mac/Redpoint.Logging.Mac.csproj index 32f0ab30..43a7a3be 100644 --- a/UET/Redpoint.Logging.Mac/Redpoint.Logging.Mac.csproj +++ b/UET/Redpoint.Logging.Mac/Redpoint.Logging.Mac.csproj @@ -17,10 +17,11 @@ - + - - + + + diff --git a/UET/Redpoint.Logging.SingleLine/Redpoint.Logging.SingleLine.csproj b/UET/Redpoint.Logging.SingleLine/Redpoint.Logging.SingleLine.csproj index cabf44ec..713e8d81 100644 --- a/UET/Redpoint.Logging.SingleLine/Redpoint.Logging.SingleLine.csproj +++ b/UET/Redpoint.Logging.SingleLine/Redpoint.Logging.SingleLine.csproj @@ -4,9 +4,9 @@ - + - + diff --git a/UET/Redpoint.Logging/Redpoint.Logging.csproj b/UET/Redpoint.Logging/Redpoint.Logging.csproj index a1165097..b39fa03f 100644 --- a/UET/Redpoint.Logging/Redpoint.Logging.csproj +++ b/UET/Redpoint.Logging/Redpoint.Logging.csproj @@ -3,7 +3,7 @@ - + diff --git a/UET/Redpoint.MSBuildResolution/Redpoint.MSBuildResolution.csproj b/UET/Redpoint.MSBuildResolution/Redpoint.MSBuildResolution.csproj index 200260ce..84ffc591 100644 --- a/UET/Redpoint.MSBuildResolution/Redpoint.MSBuildResolution.csproj +++ b/UET/Redpoint.MSBuildResolution/Redpoint.MSBuildResolution.csproj @@ -3,7 +3,7 @@ - + diff --git a/UET/Redpoint.PathResolution.Tests/PathResolutionTests.cs b/UET/Redpoint.PathResolution.Tests/PathResolutionTests.cs index 18dd19cf..eba4d863 100644 --- a/UET/Redpoint.PathResolution.Tests/PathResolutionTests.cs +++ b/UET/Redpoint.PathResolution.Tests/PathResolutionTests.cs @@ -11,7 +11,7 @@ public async Task CanResolveCmd() if (OperatingSystem.IsWindows()) { var expectedPath = Path.Combine(Environment.GetEnvironmentVariable("SYSTEMROOT")!, "system32", "cmd.exe"); - var resolvedPath = await new DefaultPathResolver().ResolveBinaryPath("cmd").ConfigureAwait(false); + var resolvedPath = await new DefaultPathResolver().ResolveBinaryPath("cmd").ConfigureAwait(true); Assert.Equal(expectedPath, resolvedPath, ignoreCase: true); } else @@ -27,7 +27,7 @@ public async Task CanResolvePowerShell() if (OperatingSystem.IsWindows()) { var expectedPath = Path.Combine(Environment.GetEnvironmentVariable("SYSTEMROOT")!, "system32", "WindowsPowerShell", "v1.0", "powershell.exe"); - var resolvedPath = await new DefaultPathResolver().ResolveBinaryPath("powershell").ConfigureAwait(false); + var resolvedPath = await new DefaultPathResolver().ResolveBinaryPath("powershell").ConfigureAwait(true); Assert.Equal(expectedPath, resolvedPath, ignoreCase: true); } else diff --git a/UET/Redpoint.PathResolution/Redpoint.PathResolution.csproj b/UET/Redpoint.PathResolution/Redpoint.PathResolution.csproj index f0faaa06..a2f61ed3 100644 --- a/UET/Redpoint.PathResolution/Redpoint.PathResolution.csproj +++ b/UET/Redpoint.PathResolution/Redpoint.PathResolution.csproj @@ -9,7 +9,7 @@ - + diff --git a/UET/Redpoint.ProcessExecution/Redpoint.ProcessExecution.csproj b/UET/Redpoint.ProcessExecution/Redpoint.ProcessExecution.csproj index a2164ac8..22849b04 100644 --- a/UET/Redpoint.ProcessExecution/Redpoint.ProcessExecution.csproj +++ b/UET/Redpoint.ProcessExecution/Redpoint.ProcessExecution.csproj @@ -9,8 +9,8 @@ - - + + diff --git a/UET/Redpoint.ProcessTree/Redpoint.ProcessTree.csproj b/UET/Redpoint.ProcessTree/Redpoint.ProcessTree.csproj index 6eb407d4..8ead998c 100644 --- a/UET/Redpoint.ProcessTree/Redpoint.ProcessTree.csproj +++ b/UET/Redpoint.ProcessTree/Redpoint.ProcessTree.csproj @@ -13,7 +13,7 @@ - + diff --git a/UET/Redpoint.ProgressMonitor/Redpoint.ProgressMonitor.csproj b/UET/Redpoint.ProgressMonitor/Redpoint.ProgressMonitor.csproj index d6bc1907..052d8f21 100644 --- a/UET/Redpoint.ProgressMonitor/Redpoint.ProgressMonitor.csproj +++ b/UET/Redpoint.ProgressMonitor/Redpoint.ProgressMonitor.csproj @@ -3,7 +3,7 @@ - net8.0;net48 + $(RedpointTargetFrameworks) disable enable latest @@ -16,7 +16,7 @@ - + diff --git a/UET/Redpoint.Reservation/Redpoint.Reservation.csproj b/UET/Redpoint.Reservation/Redpoint.Reservation.csproj index 2f0ead95..86b82b05 100644 --- a/UET/Redpoint.Reservation/Redpoint.Reservation.csproj +++ b/UET/Redpoint.Reservation/Redpoint.Reservation.csproj @@ -9,8 +9,8 @@ - - + + diff --git a/UET/Redpoint.Rfs.WinFsp/Redpoint.Rfs.WinFsp.csproj b/UET/Redpoint.Rfs.WinFsp/Redpoint.Rfs.WinFsp.csproj index a1e4da51..981ed700 100644 --- a/UET/Redpoint.Rfs.WinFsp/Redpoint.Rfs.WinFsp.csproj +++ b/UET/Redpoint.Rfs.WinFsp/Redpoint.Rfs.WinFsp.csproj @@ -11,9 +11,9 @@ - - - + + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/UET/Redpoint.RuntimeJson.SourceGenerator/Redpoint.RuntimeJson.SourceGenerator.csproj b/UET/Redpoint.RuntimeJson.SourceGenerator/Redpoint.RuntimeJson.SourceGenerator.csproj index 27b845d2..a878b0a3 100644 --- a/UET/Redpoint.RuntimeJson.SourceGenerator/Redpoint.RuntimeJson.SourceGenerator.csproj +++ b/UET/Redpoint.RuntimeJson.SourceGenerator/Redpoint.RuntimeJson.SourceGenerator.csproj @@ -8,11 +8,14 @@ enable enable true + false + false + false - + diff --git a/UET/Redpoint.ServiceControl/Redpoint.ServiceControl.csproj b/UET/Redpoint.ServiceControl/Redpoint.ServiceControl.csproj index d6af185e..ed945cd0 100644 --- a/UET/Redpoint.ServiceControl/Redpoint.ServiceControl.csproj +++ b/UET/Redpoint.ServiceControl/Redpoint.ServiceControl.csproj @@ -3,7 +3,7 @@ - + diff --git a/UET/Redpoint.Tasks/Redpoint.Tasks.csproj b/UET/Redpoint.Tasks/Redpoint.Tasks.csproj index 133566db..b136347d 100644 --- a/UET/Redpoint.Tasks/Redpoint.Tasks.csproj +++ b/UET/Redpoint.Tasks/Redpoint.Tasks.csproj @@ -3,8 +3,8 @@ - - + + diff --git a/UET/Redpoint.Uefs.Commands/Redpoint.Uefs.Commands.csproj b/UET/Redpoint.Uefs.Commands/Redpoint.Uefs.Commands.csproj index 251f6dcf..1b6ef6ca 100644 --- a/UET/Redpoint.Uefs.Commands/Redpoint.Uefs.Commands.csproj +++ b/UET/Redpoint.Uefs.Commands/Redpoint.Uefs.Commands.csproj @@ -3,7 +3,7 @@ - + diff --git a/UET/Redpoint.Uefs.Daemon.Integration.Docker/Redpoint.Uefs.Daemon.Integration.Docker.csproj b/UET/Redpoint.Uefs.Daemon.Integration.Docker/Redpoint.Uefs.Daemon.Integration.Docker.csproj index 1a932fcd..9fe3812f 100644 --- a/UET/Redpoint.Uefs.Daemon.Integration.Docker/Redpoint.Uefs.Daemon.Integration.Docker.csproj +++ b/UET/Redpoint.Uefs.Daemon.Integration.Docker/Redpoint.Uefs.Daemon.Integration.Docker.csproj @@ -3,7 +3,7 @@ - + diff --git a/UET/Redpoint.Uefs.Daemon.Integration.Kubernetes/Redpoint.Uefs.Daemon.Integration.Kubernetes.csproj b/UET/Redpoint.Uefs.Daemon.Integration.Kubernetes/Redpoint.Uefs.Daemon.Integration.Kubernetes.csproj index b88cc7f5..6f7178fa 100644 --- a/UET/Redpoint.Uefs.Daemon.Integration.Kubernetes/Redpoint.Uefs.Daemon.Integration.Kubernetes.csproj +++ b/UET/Redpoint.Uefs.Daemon.Integration.Kubernetes/Redpoint.Uefs.Daemon.Integration.Kubernetes.csproj @@ -15,7 +15,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/UET/Redpoint.Uefs.Daemon.PackageFs/Redpoint.Uefs.Daemon.PackageFs.csproj b/UET/Redpoint.Uefs.Daemon.PackageFs/Redpoint.Uefs.Daemon.PackageFs.csproj index c3ea94c8..15767eea 100644 --- a/UET/Redpoint.Uefs.Daemon.PackageFs/Redpoint.Uefs.Daemon.PackageFs.csproj +++ b/UET/Redpoint.Uefs.Daemon.PackageFs/Redpoint.Uefs.Daemon.PackageFs.csproj @@ -9,8 +9,8 @@ - - + + diff --git a/UET/Redpoint.Uefs.Daemon.PackageStorage/Redpoint.Uefs.Daemon.PackageStorage.csproj b/UET/Redpoint.Uefs.Daemon.PackageStorage/Redpoint.Uefs.Daemon.PackageStorage.csproj index c2e22d08..5e4d3c15 100644 --- a/UET/Redpoint.Uefs.Daemon.PackageStorage/Redpoint.Uefs.Daemon.PackageStorage.csproj +++ b/UET/Redpoint.Uefs.Daemon.PackageStorage/Redpoint.Uefs.Daemon.PackageStorage.csproj @@ -3,7 +3,7 @@ - + diff --git a/UET/Redpoint.Uefs.Daemon.RemoteStorage/Redpoint.Uefs.Daemon.RemoteStorage.csproj b/UET/Redpoint.Uefs.Daemon.RemoteStorage/Redpoint.Uefs.Daemon.RemoteStorage.csproj index 546d61f2..8ef7f49b 100644 --- a/UET/Redpoint.Uefs.Daemon.RemoteStorage/Redpoint.Uefs.Daemon.RemoteStorage.csproj +++ b/UET/Redpoint.Uefs.Daemon.RemoteStorage/Redpoint.Uefs.Daemon.RemoteStorage.csproj @@ -3,7 +3,7 @@ - + diff --git a/UET/Redpoint.Uefs.Daemon.Transactional.Executors/Redpoint.Uefs.Daemon.Transactional.Executors.csproj b/UET/Redpoint.Uefs.Daemon.Transactional.Executors/Redpoint.Uefs.Daemon.Transactional.Executors.csproj index 31622189..8408b0bb 100644 --- a/UET/Redpoint.Uefs.Daemon.Transactional.Executors/Redpoint.Uefs.Daemon.Transactional.Executors.csproj +++ b/UET/Redpoint.Uefs.Daemon.Transactional.Executors/Redpoint.Uefs.Daemon.Transactional.Executors.csproj @@ -3,7 +3,7 @@ - + diff --git a/UET/Redpoint.Uefs.Daemon.Transactional/Redpoint.Uefs.Daemon.Transactional.csproj b/UET/Redpoint.Uefs.Daemon.Transactional/Redpoint.Uefs.Daemon.Transactional.csproj index 875ef8c2..fbfdaa56 100644 --- a/UET/Redpoint.Uefs.Daemon.Transactional/Redpoint.Uefs.Daemon.Transactional.csproj +++ b/UET/Redpoint.Uefs.Daemon.Transactional/Redpoint.Uefs.Daemon.Transactional.csproj @@ -3,7 +3,7 @@ - + diff --git a/UET/Redpoint.Uefs.Daemon/Redpoint.Uefs.Daemon.csproj b/UET/Redpoint.Uefs.Daemon/Redpoint.Uefs.Daemon.csproj index d2b01c1e..2b30b1ff 100644 --- a/UET/Redpoint.Uefs.Daemon/Redpoint.Uefs.Daemon.csproj +++ b/UET/Redpoint.Uefs.Daemon/Redpoint.Uefs.Daemon.csproj @@ -14,9 +14,9 @@ - - - + + + diff --git a/UET/Redpoint.Uefs.Protocol/Redpoint.Uefs.Protocol.csproj b/UET/Redpoint.Uefs.Protocol/Redpoint.Uefs.Protocol.csproj index 8aeba385..1ab7af77 100644 --- a/UET/Redpoint.Uefs.Protocol/Redpoint.Uefs.Protocol.csproj +++ b/UET/Redpoint.Uefs.Protocol/Redpoint.Uefs.Protocol.csproj @@ -13,7 +13,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/UET/Redpoint.Uet.Automation/Redpoint.Uet.Automation.csproj b/UET/Redpoint.Uet.Automation/Redpoint.Uet.Automation.csproj index 589c1380..6ec777fd 100644 --- a/UET/Redpoint.Uet.Automation/Redpoint.Uet.Automation.csproj +++ b/UET/Redpoint.Uet.Automation/Redpoint.Uet.Automation.csproj @@ -8,11 +8,11 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/UET/Redpoint.Uet.BuildGraph/Redpoint.Uet.BuildGraph.csproj b/UET/Redpoint.Uet.BuildGraph/Redpoint.Uet.BuildGraph.csproj index 6228cf49..2f691472 100644 --- a/UET/Redpoint.Uet.BuildGraph/Redpoint.Uet.BuildGraph.csproj +++ b/UET/Redpoint.Uet.BuildGraph/Redpoint.Uet.BuildGraph.csproj @@ -3,7 +3,7 @@ - + diff --git a/UET/Redpoint.Uet.BuildPipeline.Providers.Deployment/Redpoint.Uet.BuildPipeline.Providers.Deployment.csproj b/UET/Redpoint.Uet.BuildPipeline.Providers.Deployment/Redpoint.Uet.BuildPipeline.Providers.Deployment.csproj index 01910fdd..832b5d3f 100644 --- a/UET/Redpoint.Uet.BuildPipeline.Providers.Deployment/Redpoint.Uet.BuildPipeline.Providers.Deployment.csproj +++ b/UET/Redpoint.Uet.BuildPipeline.Providers.Deployment/Redpoint.Uet.BuildPipeline.Providers.Deployment.csproj @@ -8,7 +8,7 @@ - + diff --git a/UET/Redpoint.Uet.BuildPipeline.Providers.Prepare/Redpoint.Uet.BuildPipeline.Providers.Prepare.csproj b/UET/Redpoint.Uet.BuildPipeline.Providers.Prepare/Redpoint.Uet.BuildPipeline.Providers.Prepare.csproj index a46addc9..525b7b8c 100644 --- a/UET/Redpoint.Uet.BuildPipeline.Providers.Prepare/Redpoint.Uet.BuildPipeline.Providers.Prepare.csproj +++ b/UET/Redpoint.Uet.BuildPipeline.Providers.Prepare/Redpoint.Uet.BuildPipeline.Providers.Prepare.csproj @@ -8,8 +8,8 @@ - - + + diff --git a/UET/Redpoint.Uet.BuildPipeline.Providers.Test/Redpoint.Uet.BuildPipeline.Providers.Test.csproj b/UET/Redpoint.Uet.BuildPipeline.Providers.Test/Redpoint.Uet.BuildPipeline.Providers.Test.csproj index fc3ca5e8..baecc617 100644 --- a/UET/Redpoint.Uet.BuildPipeline.Providers.Test/Redpoint.Uet.BuildPipeline.Providers.Test.csproj +++ b/UET/Redpoint.Uet.BuildPipeline.Providers.Test/Redpoint.Uet.BuildPipeline.Providers.Test.csproj @@ -16,8 +16,8 @@ - - + + diff --git a/UET/Redpoint.Uet.BuildPipeline/Executors/BuildEngineSpecification.cs b/UET/Redpoint.Uet.BuildPipeline/Executors/BuildEngineSpecification.cs index 106710a1..129cfb95 100644 --- a/UET/Redpoint.Uet.BuildPipeline/Executors/BuildEngineSpecification.cs +++ b/UET/Redpoint.Uet.BuildPipeline/Executors/BuildEngineSpecification.cs @@ -69,7 +69,7 @@ public static BuildEngineSpecification ForGitCommitWithZips( } /// - /// These values are parsed in . + /// These values are parsed in `UET.Commands.EngineSpec.EngineSpec.TryParseEngine`. /// public string ToReparsableString() { diff --git a/UET/Redpoint.Uet.Configuration/Redpoint.Uet.Configuration.csproj b/UET/Redpoint.Uet.Configuration/Redpoint.Uet.Configuration.csproj index 1924fbfc..5e924340 100644 --- a/UET/Redpoint.Uet.Configuration/Redpoint.Uet.Configuration.csproj +++ b/UET/Redpoint.Uet.Configuration/Redpoint.Uet.Configuration.csproj @@ -8,7 +8,7 @@ - + diff --git a/UET/Redpoint.Uet.Core/Redpoint.Uet.Core.csproj b/UET/Redpoint.Uet.Core/Redpoint.Uet.Core.csproj index b1585be2..b4242833 100644 --- a/UET/Redpoint.Uet.Core/Redpoint.Uet.Core.csproj +++ b/UET/Redpoint.Uet.Core/Redpoint.Uet.Core.csproj @@ -3,10 +3,10 @@ - + - + diff --git a/UET/Redpoint.Uet.Uat/Redpoint.Uet.Uat.csproj b/UET/Redpoint.Uet.Uat/Redpoint.Uet.Uat.csproj index 80c96db9..d6d36a1b 100644 --- a/UET/Redpoint.Uet.Uat/Redpoint.Uet.Uat.csproj +++ b/UET/Redpoint.Uet.Uat/Redpoint.Uet.Uat.csproj @@ -5,7 +5,7 @@ - + diff --git a/UET/Redpoint.Uet.Workspace/Redpoint.Uet.Workspace.csproj b/UET/Redpoint.Uet.Workspace/Redpoint.Uet.Workspace.csproj index 08e7e4d4..48d5c1d6 100644 --- a/UET/Redpoint.Uet.Workspace/Redpoint.Uet.Workspace.csproj +++ b/UET/Redpoint.Uet.Workspace/Redpoint.Uet.Workspace.csproj @@ -12,7 +12,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/UET/Redpoint.Unreal.Serialization.SourceGenerator/Redpoint.Unreal.Serialization.SourceGenerator.csproj b/UET/Redpoint.Unreal.Serialization.SourceGenerator/Redpoint.Unreal.Serialization.SourceGenerator.csproj index f92ab8ea..4e96f2dc 100644 --- a/UET/Redpoint.Unreal.Serialization.SourceGenerator/Redpoint.Unreal.Serialization.SourceGenerator.csproj +++ b/UET/Redpoint.Unreal.Serialization.SourceGenerator/Redpoint.Unreal.Serialization.SourceGenerator.csproj @@ -8,11 +8,14 @@ enable enable true + false + false + false - + diff --git a/UET/Redpoint.Unreal.Serialization.Tests/Redpoint.Unreal.Serialization.Tests.csproj b/UET/Redpoint.Unreal.Serialization.Tests/Redpoint.Unreal.Serialization.Tests.csproj index a73aaad8..c34ddeca 100644 --- a/UET/Redpoint.Unreal.Serialization.Tests/Redpoint.Unreal.Serialization.Tests.csproj +++ b/UET/Redpoint.Unreal.Serialization.Tests/Redpoint.Unreal.Serialization.Tests.csproj @@ -1,4 +1,4 @@ - + diff --git a/UET/Redpoint.Unreal.TcpMessaging/Redpoint.Unreal.TcpMessaging.csproj b/UET/Redpoint.Unreal.TcpMessaging/Redpoint.Unreal.TcpMessaging.csproj index 8cc5970d..db281318 100644 --- a/UET/Redpoint.Unreal.TcpMessaging/Redpoint.Unreal.TcpMessaging.csproj +++ b/UET/Redpoint.Unreal.TcpMessaging/Redpoint.Unreal.TcpMessaging.csproj @@ -3,7 +3,7 @@ - + diff --git a/UET/Redpoint.Vfs.Driver.WinFsp/Redpoint.Vfs.Driver.WinFsp.csproj b/UET/Redpoint.Vfs.Driver.WinFsp/Redpoint.Vfs.Driver.WinFsp.csproj index 713440d9..4996096f 100644 --- a/UET/Redpoint.Vfs.Driver.WinFsp/Redpoint.Vfs.Driver.WinFsp.csproj +++ b/UET/Redpoint.Vfs.Driver.WinFsp/Redpoint.Vfs.Driver.WinFsp.csproj @@ -13,8 +13,8 @@ - - + + diff --git a/UET/Redpoint.Vfs.Layer.Folder/Redpoint.Vfs.Layer.Folder.csproj b/UET/Redpoint.Vfs.Layer.Folder/Redpoint.Vfs.Layer.Folder.csproj index e60eeb96..3b8a576f 100644 --- a/UET/Redpoint.Vfs.Layer.Folder/Redpoint.Vfs.Layer.Folder.csproj +++ b/UET/Redpoint.Vfs.Layer.Folder/Redpoint.Vfs.Layer.Folder.csproj @@ -9,8 +9,8 @@ - - + + diff --git a/UET/Redpoint.Vfs.Layer.Scratch/Redpoint.Vfs.Layer.Scratch.csproj b/UET/Redpoint.Vfs.Layer.Scratch/Redpoint.Vfs.Layer.Scratch.csproj index 5a4ab3eb..12ad8d2c 100644 --- a/UET/Redpoint.Vfs.Layer.Scratch/Redpoint.Vfs.Layer.Scratch.csproj +++ b/UET/Redpoint.Vfs.Layer.Scratch/Redpoint.Vfs.Layer.Scratch.csproj @@ -9,10 +9,10 @@ - - - - + + + + diff --git a/UET/Redpoint.Vfs.LocalIo/Redpoint.Vfs.LocalIo.csproj b/UET/Redpoint.Vfs.LocalIo/Redpoint.Vfs.LocalIo.csproj index 496e1c07..ea852c00 100644 --- a/UET/Redpoint.Vfs.LocalIo/Redpoint.Vfs.LocalIo.csproj +++ b/UET/Redpoint.Vfs.LocalIo/Redpoint.Vfs.LocalIo.csproj @@ -13,8 +13,8 @@ - - + + diff --git a/UET/Redpoint.Windows.HandleManagement/Redpoint.Windows.HandleManagement.csproj b/UET/Redpoint.Windows.HandleManagement/Redpoint.Windows.HandleManagement.csproj index 6875737d..dfa09afa 100644 --- a/UET/Redpoint.Windows.HandleManagement/Redpoint.Windows.HandleManagement.csproj +++ b/UET/Redpoint.Windows.HandleManagement/Redpoint.Windows.HandleManagement.csproj @@ -11,7 +11,7 @@ true - CS9195 + $(NoWarn);CS9195 diff --git a/UET/Redpoint.XunitFramework/Redpoint.XunitFramework.csproj b/UET/Redpoint.XunitFramework/Redpoint.XunitFramework.csproj index a2856aa8..b89b6c76 100644 --- a/UET/Redpoint.XunitFramework/Redpoint.XunitFramework.csproj +++ b/UET/Redpoint.XunitFramework/Redpoint.XunitFramework.csproj @@ -1,7 +1,8 @@ + + - net8.0 enable enable @@ -15,8 +16,8 @@ - - + + diff --git a/UET/uet.shim/uet.shim.csproj b/UET/uet.shim/uet.shim.csproj index 3fcba7bc..c5561fe2 100644 --- a/UET/uet.shim/uet.shim.csproj +++ b/UET/uet.shim/uet.shim.csproj @@ -24,7 +24,7 @@ - + diff --git a/UET/uet/UET.csproj b/UET/uet/UET.csproj index 1ed70f8a..ad3059d7 100644 --- a/UET/uet/UET.csproj +++ b/UET/uet/UET.csproj @@ -28,9 +28,9 @@ - + - + all runtime; build; native; contentfiles; analyzers; buildtransitive