From 6e453a591ce1eb683598889cf06c894545f48ada Mon Sep 17 00:00:00 2001 From: Fabien Bole-Feysot Date: Wed, 8 Mar 2023 15:43:53 +0000 Subject: [PATCH] Updated samples to reference .NET 6 instead of 7 --- .github/workflows/actions.yml | 5 +- .gitlab/.gitlab-ci.yml | 37 +++++------ SamplesDef.json | 66 ++++++++++--------- .../CSharpHelloWorld/HelloWorld.sharpmake.cs | 8 +-- ...n => HelloWorldSolution.vs2022.net6_0.sln} | 10 +-- ...csproj => HelloWorld.vs2022.net6_0.csproj} | 2 +- .../HelloWorld.sharpmake.cs | 15 +++-- ...lloWorldMultiFrameworkSolution.vs2022.sln} | 14 ++-- ... HelloWorldSolution.vs2017.netcore3_1.sln} | 10 +-- ...oj => HelloWorld.vs2017.netcore3_1.csproj} | 4 +- ...=> HelloWorldMultiFramework.vs2022.csproj} | 10 +-- .../HelloWorld.sharpmake.cs | 25 +++++-- .../helloworldlib/HelloWorldLib.vs2022.csproj | 8 +-- .../HelloWorldExe.vs2022.csproj | 14 ++-- 14 files changed, 116 insertions(+), 112 deletions(-) rename samples/CSharpHelloWorld/reference/projects/{HelloWorldSolution.vs2022.net7_0.sln => HelloWorldSolution.vs2022.net6_0.sln} (62%) rename samples/CSharpHelloWorld/reference/projects/helloworld/{HelloWorld.vs2022.net7_0.csproj => HelloWorld.vs2022.net6_0.csproj} (97%) rename samples/NetCore/DotNetCoreFrameworkHelloWorld/reference/projects/{HelloWorldMultiFrameworkSolution.vs2019.sln => HelloWorldMultiFrameworkSolution.vs2022.sln} (59%) rename samples/NetCore/DotNetCoreFrameworkHelloWorld/reference/projects/{HelloWorldSolution.vs2017.netcore2_1.sln => HelloWorldSolution.vs2017.netcore3_1.sln} (61%) rename samples/NetCore/DotNetCoreFrameworkHelloWorld/reference/projects/helloworld/{HelloWorld.vs2017.netcore2_1.csproj => HelloWorld.vs2017.netcore3_1.csproj} (95%) rename samples/NetCore/DotNetCoreFrameworkHelloWorld/reference/projects/helloworldmultiframework/{HelloWorldMultiFramework.vs2019.csproj => HelloWorldMultiFramework.vs2022.csproj} (95%) diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml index a26acd5f6..f359e308f 100644 --- a/.github/workflows/actions.yml +++ b/.github/workflows/actions.yml @@ -207,13 +207,10 @@ jobs: .\RunSample.ps1 -sampleName "HelloXCode" -configuration ${{ matrix.configuration }} -framework ${{ matrix.framework }} -os ${{ matrix.os }} - name: NetCore/DotNetCoreFrameworkHelloWorld ${{ matrix.configuration }} ${{ matrix.os }} - if: runner.os == 'Windows' + if: runner.os == 'Windows' && matrix.os == 'windows-2022' shell: pwsh run: | .\RunSample.ps1 -sampleName "NetCore-DotNetCoreFrameworkHelloWorld" -configuration ${{ matrix.configuration }} -framework ${{ matrix.framework }} -os ${{ matrix.os }} - # not working tests because .netcore 2.1.0 is not available on runner - # .\RunTest.ps1 -exeToRun dotnet -workingDirectory "${env:testFolder}\projects\helloworldmultiframework\output\anycpu\${{ matrix.configuration }}\netcoreapp2.1" -arguments "`"the other name.dll`"" - # .\RunTest.ps1 -exeToRun dotnet -workingDirectory "${env:testFolder}\projects\helloworld\output\anycpu\${{ matrix.configuration }}\netcoreapp2.1" -arguments "`"the other name.dll`"" - name: NetCore/DotNetFrameworkHelloWorld ${{ matrix.configuration }} ${{ matrix.os }} if: runner.os == 'Windows' diff --git a/.gitlab/.gitlab-ci.yml b/.gitlab/.gitlab-ci.yml index 523dad2c7..87d8aa1ec 100644 --- a/.gitlab/.gitlab-ci.yml +++ b/.gitlab/.gitlab-ci.yml @@ -2,7 +2,7 @@ # Disable merge request pipelines, pipelines for merge results and merge trains. include: - template: 'Workflows/Branch-Pipelines.gitlab-ci.yml' - + stages: - build - test @@ -20,7 +20,7 @@ default: DOTNET_SKIP_FIRST_TIME_EXPERIENCE: "true" DOTNET_NOLOGO: "true" DOTNET_CLI_UI_LANGUAGE: "en" - parallel: + parallel: matrix: - configuration: [debug, release] script: @@ -46,7 +46,7 @@ compilation:linux: ############# .unit_test:base: stage: test - parallel: + parallel: matrix: - configuration: [debug, release] script: @@ -106,7 +106,7 @@ functional_test: tags: - square-linux-k8s-compil image: quay.ubisoft.com/tgruntime/tg-ubuntu-cpp:0.6.2-sharpmake - parallel: + parallel: matrix: - configuration: [debug, release] os: [ubuntu] @@ -130,7 +130,7 @@ HelloLinux: stage: test tags: - square_mac - parallel: + parallel: matrix: - configuration: [debug, release] os: [macos-latest] @@ -152,12 +152,12 @@ HelloXCode: ############# .windows_sample_test: stage: test - parallel: + parallel: matrix: - configuration: [debug, release] os: [windows-2019, windows-2022] framework: [net6.0] - rules: + rules: - if: $os == "windows-2019" variables: VS_VERSION_SUFFIX: "Vs2019" @@ -216,10 +216,7 @@ CSharpHelloWorld: variables: testFolder: samples/CSharpHelloWorld script: - - pwsh RunSharpmake.ps1 -workingDirectory ${env:testFolder} -sharpmakeFile "HelloWorld.sharpmake.cs" -framework $framework - # .net7.0 compilation not available on current runners - # - pwsh Compile.ps1 -slnOrPrjFile "HelloWorldSolution.vs2022.net7_0.sln" -configuration $configuration -platform "Any CPU" -WorkingDirectory "${env:testFolder}\projects" -VsVersion $os -compiler "MsBuild" - # - pwsh RunTest.ps1 "${env:testFolder}\projects\helloworld\output\anycpu\$configuration\net7.0\the other name.exe" + - pwsh RunSample.ps1 -sampleName "CSharpHelloWorld" -configuration $configuration -framework $framework -os $os CSharpImports: extends: .windows_sample_test @@ -246,7 +243,7 @@ CSharpWCF: FastBuildSimpleExecutable: extends: .windows_sample_test script: - - pwsh RunSample.ps1 -sampleName FastBuildSimpleExecutable -configuration $configuration -framework $framework -os $os -vsVersionSuffix ${env:VS_VERSION_SUFFIX} + - pwsh RunSample.ps1 -sampleName FastBuildSimpleExecutable -configuration $configuration -framework $framework -os $os -vsVersionSuffix ${env:VS_VERSION_SUFFIX} # Temp disable after Github VM update which updated the NDK and broke it # HelloAndroid: @@ -264,7 +261,7 @@ HelloClangCl: HelloEvents: extends: .windows_sample_test script: - - pwsh RunSample.ps1 -sampleName HelloEvents -configuration $configuration -framework $framework -os $os -vsVersionSuffix ${env:VS_VERSION_SUFFIX} + - pwsh RunSample.ps1 -sampleName HelloEvents -configuration $configuration -framework $framework -os $os -vsVersionSuffix ${env:VS_VERSION_SUFFIX} HelloWorld: extends: .windows_sample_test @@ -273,11 +270,11 @@ HelloWorld: NetCore-DotNetCoreFrameworkHelloWorld: extends: .windows_sample_test + rules: + - if: $os == "windows-2022" + when: on_success script: - pwsh RunSample.ps1 -sampleName "NetCore-DotNetCoreFrameworkHelloWorld" -configuration $configuration -framework $framework -os $os - # not working tests because .netcore 2.1.0 is not available on runner - # - pwsh RunTest.ps1 -exeToRun dotnet -workingDirectory "${env:testFolder}\projects\helloworldmultiframework\output\anycpu\$configuration\netcoreapp2.1" -arguments "`"`"the other name.dll`"`"" - # - pwsh RunTest.ps1 -exeToRun dotnet -workingDirectory "${env:testFolder}\projects\helloworld\output\anycpu\$configuration\netcoreapp2.1" -arguments "`"`"the other name.dll`"`"" NetCore-DotNetFrameworkHelloWorld: extends: .windows_sample_test @@ -303,11 +300,7 @@ NetCore-DotNetOSMultiFrameworksHelloWorld: variables: testFolder: samples\NetCore\DotNetOSMultiFrameworksHelloWorld script: - - pwsh RunSharpmake.ps1 -workingDirectory ${env:testFolder} -sharpmakeFile "HelloWorld.sharpmake.cs" -framework $framework - # .net7.0 compilation not available on current runners - # - pwsh Compile.ps1 -slnOrPrjFile "OSMultiFrameworksHelloWorldSolution.sln" -configuration $configuration -platform "Any CPU" -WorkingDirectory "${env:testFolder}\codebase\temp\solutions" -VsVersion $os -compiler "MsBuild" - # - pwsh RunTest.ps1 "${env:testFolder}\codebase\temp\bin\anycpu_${env:configuration}\net7.0-windows\HelloWorldExe.exe" - # - pwsh RunTest.ps1 "${env:testFolder}\codebase\temp\bin\anycpu_${env:configuration}\net472\HelloWorldExe.exe" + - pwsh RunSample.ps1 -sampleName "NetCore-DotNetOSMultiFrameworksHelloWorld" -configuration $configuration -framework $framework -os $os PackageReferences: extends: .windows_sample_test @@ -341,5 +334,5 @@ vcpkg: variables: testFolder: samples/vcpkg script: - - pwsh RunSample.ps1 -sampleName vcpkg -configuration $configuration -framework $framework -os $os -vsVersionSuffix ${env:VS_VERSION_SUFFIX} + - pwsh RunSample.ps1 -sampleName vcpkg -configuration $configuration -framework $framework -os $os -vsVersionSuffix ${env:VS_VERSION_SUFFIX} diff --git a/SamplesDef.json b/SamplesDef.json index 6e70a9000..b349dc3ea 100644 --- a/SamplesDef.json +++ b/SamplesDef.json @@ -42,7 +42,7 @@ [ "./RunSharpmake.ps1 -workingDirectory {testFolder} -sharpmakeFile \"HelloWorld.sharpmake.cs\" -framework {framework}", "./Compile.ps1 -slnOrPrjFile \"HelloWorldSolution.vs2017.v4_6_1.sln\" -configuration {configuration} -platform \"Any CPU\" -WorkingDirectory \"{testFolder}/projects\" -VsVersion {os} -compiler MsBuild", - "\"./{testFolder}/projects/helloworld/output/anycpu/{configuration}/the other name.exe\"" + "&'./{testFolder}/projects/helloworld/output/anycpu/{configuration}/the other name.exe'" ] }, { @@ -51,8 +51,8 @@ "Commands": [ "./RunSharpmake.ps1 -workingDirectory {testFolder} -sharpmakeFile \"HelloWorld.sharpmake.cs\" -framework {framework}", - "./Compile.ps1 -slnOrPrjFile \"HelloWorldSolution.vs2022.net7_0.sln\" -configuration {configuration} -platform \"Any CPU\" -WorkingDirectory \"{testFolder}/projects\" -VsVersion {os} -compiler MsBuild", - "\"./{testFolder}/projects/helloworld/output/anycpu/{configuration}/net7.0/the other name.exe\"" + "./Compile.ps1 -slnOrPrjFile \"HelloWorldSolution.vs2022.net6_0.sln\" -configuration {configuration} -platform \"Any CPU\" -WorkingDirectory \"{testFolder}/projects\" -VsVersion {os} -compiler MsBuild", + "&'./{testFolder}/projects/helloworld/output/anycpu/{configuration}/net6.0/the other name.exe'" ] }, { @@ -62,7 +62,7 @@ [ "./RunSharpmake.ps1 -workingDirectory {testFolder} -sharpmakeFile \"CSharpImports.sharpmake.cs\" -framework {framework}", "./Compile.ps1 -slnOrPrjFile \"CSharpImportsSolution.vs2019.v4_7_2.sln\" -configuration {configuration} -platform \"Any CPU\" -WorkingDirectory \"{testFolder}/projects\" -VsVersion {os} -compiler MsBuild", - "\"./{testFolder}/projects/csharpimports/output/anycpu/$configuration\the other name.exe\"" + "&'./{testFolder}/projects/csharpimports/output/anycpu/{configuration}/the other name.exe'" ] }, { @@ -81,7 +81,7 @@ [ "./RunSharpmake.ps1 -workingDirectory {testFolder} -sharpmakeFile \"CustomBuildStep.sharpmake.cs\" -framework {framework}", "./Compile.ps1 -slnOrPrjFile \"custombuildstepsolution_vs2017_win64.sln\" -configuration {configuration} -platform \"x64\" -WorkingDirectory \"{testFolder}/projects\" -VsVersion {os} -compiler MsBuild", - "\"./{testFolder}/projects/output/win64/{configuration}/custombuildstep.exe\"" + "&'./{testFolder}/projects/output/win64/{configuration}/custombuildstep.exe'" ] }, { @@ -100,7 +100,7 @@ [ "./RunSharpmake.ps1 -workingDirectory {testFolder} -sharpmakeFile \"FastBuildSimpleExecutable.sharpmake.cs\" -framework {framework}", "./Compile.ps1 -slnOrPrjFile \"fastbuildsample_{VsVersionSuffix}_win64.sln\" -configuration {configuration} -platform \"x64\" -WorkingDirectory \"{testFolder}/projects\" -VsVersion {os} -compiler MsBuild", - "\"./{testFolder}/projects/output/win64/{configuration}/fastbuildsimpleexecutable.exe\"" + "&'./{testFolder}/projects/output/win64/{configuration}/fastbuildsimpleexecutable.exe'" ] }, { @@ -120,13 +120,13 @@ [ "./RunSharpmake.ps1 -workingDirectory {testFolder} -sharpmakeFile \"HelloClangCl.Main.sharpmake.cs\" -framework {framework} -devenvVersion {VsVersionSuffix}", "./Compile.ps1 -slnOrPrjFile \"HelloClangCl_win64_{VsVersionSuffix}.sln\" -configuration \"ClangCl {configuration}\" -platform \"MSBuild\" -WorkingDirectory \"{testFolder}/codebase/temp/solutions\" -VsVersion {os} -compiler MsBuild", - "\"./{testFolder}/codebase/temp/bin/win64_clangcl_{configuration}_msbuild/exe.exe\"", + "&'./{testFolder}/codebase/temp/bin/win64_clangcl_{configuration}_msbuild/exe.exe'", "./Compile.ps1 -slnOrPrjFile \"HelloClangCl_win64_{VsVersionSuffix}.sln\" -configuration \"ClangCl {configuration}\" -platform \"FastBuild\" -WorkingDirectory \"{testFolder}/codebase/temp/solutions\" -VsVersion {os} -compiler MsBuild", - "\"./{testFolder}/codebase/temp/bin/win64_clangcl_{configuration}_fastbuild/exe.exe\"", + "&'./{testFolder}/codebase/temp/bin/win64_clangcl_{configuration}_fastbuild/exe.exe'", "./Compile.ps1 -slnOrPrjFile \"HelloClangCl_win64_{VsVersionSuffix}.sln\" -configuration \"MSVC {configuration}\" -platform \"MSBuild\" -WorkingDirectory \"{testFolder}/codebase/temp/solutions\" -VsVersion {os} -compiler MsBuild", - "\"./{testFolder}/codebase/temp/bin/win64_clangcl_{configuration}_msbuild/exe.exe\"", + "&'./{testFolder}/codebase/temp/bin/win64_clangcl_{configuration}_msbuild/exe.exe'", "./Compile.ps1 -slnOrPrjFile \"HelloClangCl_win64_{VsVersionSuffix}.sln\" -configuration \"MSVC {configuration}\" -platform \"FastBuild\" -WorkingDirectory \"{testFolder}/codebase/temp/solutions\" -VsVersion {os} -compiler MsBuild", - "\"./{testFolder}/codebase/temp/bin/win64_clangcl_{configuration}_fastbuild/exe.exe\"" + "&'./{testFolder}/codebase/temp/bin/win64_clangcl_{configuration}_fastbuild/exe.exe'" ] }, { @@ -136,9 +136,9 @@ [ "./RunSharpmake.ps1 -workingDirectory {testFolder} -sharpmakeFile \"HelloEvents.Main.sharpmake.cs\" -framework {framework}", "./Compile.ps1 -slnOrPrjFile \"HelloEvents_win64_{VsVersionSuffix}.sln\" -configuration {configuration} -platform \"Win64\" -WorkingDirectory \"{testFolder}/codebase/temp/solutions\" -VsVersion {os} -compiler MsBuild", - "\"./{testFolder}/codebase/temp/bin/win64_{configuration}_msbuild/exe/exe.exe\"", + "&'./{testFolder}/codebase/temp/bin/win64_{configuration}_msbuild/exe/exe.exe'", "./Compile.ps1 -slnOrPrjFile \"HelloEvents_win64_{VsVersionSuffix}.sln\" -configuration {configuration}_FastBuild -platform \"Win64\" -WorkingDirectory \"{testFolder}/codebase/temp/solutions\" -VsVersion {os} -compiler MsBuild", - "\"./{testFolder}/codebase/temp/bin/win64_{configuration}_fastbuild/exe/exe.exe\"" + "&'./{testFolder}/codebase/temp/bin/win64_{configuration}_fastbuild/exe/exe.exe'" ] }, { @@ -148,9 +148,9 @@ [ "./RunSharpmake.ps1 -workingDirectory {testFolder} -sharpmakeFile \"HelloWorld.sharpmake.cs\" -framework {framework}", "./Compile.ps1 -slnOrPrjFile \"helloworld_vs2019_win32.sln\" -configuration {configuration} -platform \"Win32\" -WorkingDirectory \"{testFolder}/projects\" -VsVersion {os} -compiler MsBuild", - "\"./{testFolder}/projects/output/win32/{configuration}/helloWorld.exe\"", + "&'./{testFolder}/projects/output/win32/{configuration}/helloWorld.exe'", "./Compile.ps1 -slnOrPrjFile \"helloworld_vs2019_win64.sln\" -configuration {configuration} -platform \"x64\" -WorkingDirectory \"{testFolder}/projects\" -VsVersion {os} -compiler MsBuild", - "\"./{testFolder}/projects/output/win64/{configuration}/helloWorld.exe\"" + "&'./{testFolder}/projects/output/win64/{configuration}/helloWorld.exe'" ] }, { @@ -159,11 +159,13 @@ "Commands": [ "./RunSharpmake.ps1 -workingDirectory {testFolder} -sharpmakeFile \"HelloWorld.sharpmake.cs\" -framework {framework}", - "./Compile.ps1 -slnOrPrjFile \"HelloWorldMultiFrameworkSolution.vs2019.sln\" -configuration {configuration} -platform \"Any CPU\" -WorkingDirectory \"{testFolder}/projects\" -VsVersion {os} -compiler MsBuild", - "./RunProcess.ps1 -exeToRun dotnet -workingDirectory \"{testFolder}/projects/helloworldmultiframework/output/anycpu/{configuration}/netcoreapp3.1\" -arguments \"`\"the other name.dll`\"\"", - "./Compile.ps1 -slnOrPrjFile \"HelloWorldSolution.vs2017.netcore2_1.sln\" -configuration {configuration} -platform \"Any CPU\" -WorkingDirectory \"{testFolder}/projects\" -VsVersion {os} -compiler MsBuild", + "./Compile.ps1 -slnOrPrjFile \"HelloWorldMultiFrameworkSolution.vs2022.sln\" -configuration {configuration} -platform \"Any CPU\" -WorkingDirectory \"{testFolder}/projects\" -VsVersion {os} -compiler MsBuild", + "./RunProcess.ps1 -exeToRun dotnet -workingDirectory \"{testFolder}/projects/helloworldmultiframework/output/anycpu/{configuration}/netcoreapp3.1\" -arguments \"`\"the other name.dll`\"\"", + "./RunProcess.ps1 -exeToRun dotnet -workingDirectory \"{testFolder}/projects/helloworldmultiframework/output/anycpu/{configuration}/net6.0\" -arguments \"`\"the other name.dll`\"\"", + "./Compile.ps1 -slnOrPrjFile \"HelloWorldSolution.vs2017.netcore3_1.sln\" -configuration {configuration} -platform \"Any CPU\" -WorkingDirectory \"{testFolder}/projects\" -VsVersion {os} -compiler MsBuild", + "./RunProcess.ps1 -exeToRun dotnet -workingDirectory \"{testFolder}/projects/helloworld/output/anycpu/{configuration}/netcoreapp3.1\" -arguments \"`\"the other name.dll`\"\"", "./Compile.ps1 -slnOrPrjFile \"HelloWorldSolution.vs2019.netcore3_1.sln\" -configuration {configuration} -platform \"Any CPU\" -WorkingDirectory \"{testFolder}/projects\" -VsVersion {os} -compiler MsBuild", - "./RunProcess.ps1 -exeToRun dotnet -workingDirectory \"{testFolder}/projects/helloworld/output/anycpu/{configuration}/netcoreapp3.1\" -arguments \"`\"the other name.dll`\"\"" + "./RunProcess.ps1 -exeToRun dotnet -workingDirectory \"{testFolder}/projects/helloworld/output/anycpu/{configuration}/netcoreapp3.1\" -arguments \"`\"the other name.dll`\"\"" ] }, { @@ -173,10 +175,10 @@ [ "./RunSharpmake.ps1 -workingDirectory {testFolder} -sharpmakeFile \"HelloWorld.sharpmake.cs\" -framework {framework}", "./Compile.ps1 -slnOrPrjFile \"HelloWorldMultiFrameworkSolution.vs2019.sln\" -configuration {configuration} -platform \"Any CPU\" -WorkingDirectory \"{testFolder}/projects\" -VsVersion {os} -compiler MsBuild", - "\"./{testFolder}/projects/helloworldmultiframework/output/anycpu/{configuration}/net461/the other name.exe\"", - "\"./{testFolder}/projects/helloworldmultiframework/output/anycpu/{configuration}/net472/the other name.exe\"", + "&'./{testFolder}/projects/helloworldmultiframework/output/anycpu/{configuration}/net461/the other name.exe'", + "&'./{testFolder}/projects/helloworldmultiframework/output/anycpu/{configuration}/net472/the other name.exe'", "./Compile.ps1 -slnOrPrjFile \"HelloWorldSolution.vs2019.v4_7_2.sln\" -configuration {configuration} -platform \"Any CPU\" -WorkingDirectory \"{testFolder}/projects\" -VsVersion {os} -compiler MsBuild", - "\"./{testFolder}/projects/projects/helloworld/output/vs2019/{configuration}/the other name.exe\"" + "&'./{testFolder}/projects/helloworld/output/vs2019/{configuration}/the other name.exe'" ] }, { @@ -186,7 +188,7 @@ [ "./RunSharpmake.ps1 -workingDirectory {testFolder} -sharpmakeFile \"HelloWorld.sharpmake.cs\" -framework {framework}", "./Compile.ps1 -slnOrPrjFile \"HelloWorldSolution.vs2017.v4_6_1.sln\" -configuration {configuration} -platform \"Any CPU\" -WorkingDirectory \"{testFolder}/projects\" -VsVersion {os} -compiler MsBuild", - "\"./{testFolder}/projects/helloworld/output/vs2017/{configuration}/the other name.exe\"" + "&'./{testFolder}/projects/helloworld/output/vs2017/{configuration}/the other name.exe'" ] }, { @@ -197,7 +199,7 @@ "./RunSharpmake.ps1 -workingDirectory {testFolder} -sharpmakeFile \"HelloWorld.sharpmake.cs\" -framework {framework}", "./Compile.ps1 -slnOrPrjFile \"HelloWorldMultiFrameworksSolution.vs2019.sln\" -configuration {configuration} -platform \"Any CPU\" -WorkingDirectory \"{testFolder}/projects\" -VsVersion {os} -compiler MsBuild", "./RunProcess.ps1 -exeToRun dotnet -workingDirectory \"{testFolder}/projects/helloworldmultiframeworks/output/anycpu/{configuration}/netcoreapp3.1\" -arguments \"HelloWorldMultiFrameworks.dll\"", - "\"./{testFolder}/projects/helloworldmultiframeworks/output/anycpu/{configuration}/net461/HelloWorldMultiFrameworks.exe\"" + "&'./{testFolder}/projects/helloworldmultiframeworks/output/anycpu/{configuration}/net461/HelloWorldMultiFrameworks.exe'" ] }, { @@ -207,8 +209,8 @@ [ "./RunSharpmake.ps1 -workingDirectory {testFolder} -sharpmakeFile \"HelloWorld.sharpmake.cs\" -framework {framework}", "./Compile.ps1 -slnOrPrjFile \"OSMultiFrameworksHelloWorldSolution.sln\" -configuration {configuration} -platform \"Any CPU\" -WorkingDirectory \"{testFolder}/codebase/temp/solutions\" -VsVersion {os} -compiler MsBuild", - "\"./{testFolder}/codebase/temp/bin/anycpu_{configuration}/net7.0-windows/HelloWorldExe.exe\"", - "\"./{testFolder}/codebase/temp/bin/anycpu_{configuration}/net472-windows/HelloWorldExe.exe\"" + "./RunProcess.ps1 -exeToRun dotnet -workingDirectory \"{testFolder}/codebase/temp/bin/anycpu_{configuration}/net6.0-windows\" -arguments \"HelloWorldExe.dll\"", + "&'./{testFolder}/codebase/temp/bin/anycpu_{configuration}/net472/HelloWorldExe.exe'" ] }, { @@ -219,12 +221,12 @@ "./RunSharpmake.ps1 -workingDirectory {testFolder} -sharpmakeFile \"PackageReferences.sharpmake.cs\" -framework {framework}", "./RunProcess.ps1 -exeToRun nuget -workingDirectory \"{testFolder}/projects\" -arguments \"restore PackageReferenceSolution.vs2017.v4_7_2.sln\"", "./Compile.ps1 -slnOrPrjFile \"PackageReferenceSolution.vs2017.v4_7_2.sln\" -configuration {configuration} -platform \"x64\" -WorkingDirectory \"{testFolder}/projects\" -VsVersion {os} -compiler MsBuild", - "\"./{testFolder}/projects/csharppackagereferences/output/vs2017/{configuration}/PackageReference.exe\"", - "\"./{testFolder}/projects/cpppackagereferences/output/vs2017/{configuration}/cpppackagereferences.exe\"", + "&'./{testFolder}/projects/csharppackagereferences/output/vs2017/{configuration}/PackageReference.exe'", + "&'./{testFolder}/projects/cpppackagereferences/output/vs2017/{configuration}/cpppackagereferences.exe'", "./RunProcess.ps1 -exeToRun nuget -workingDirectory \"{testFolder}/projects\" -arguments \"restore PackageReferenceSolution.vs2019.v4_7_2.sln\"", "./Compile.ps1 -slnOrPrjFile \"PackageReferenceSolution.vs2019.v4_7_2.sln\" -configuration {configuration} -platform \"x64\" -WorkingDirectory \"{testFolder}/projects\" -VsVersion {os} -compiler MsBuild", - "\"./{testFolder}/projects/csharppackagereferences/output/vs2019/{configuration}/PackageReference.exe\"", - "\"./{testFolder}/projects/cpppackagereferences/output/vs2019/{configuration}/cpppackagereferences.exe\"" + "&'./{testFolder}/projects/csharppackagereferences/output/vs2019/{configuration}/PackageReference.exe'", + "&'./{testFolder}/projects/cpppackagereferences/output/vs2019/{configuration}/cpppackagereferences.exe'" ] }, { @@ -244,7 +246,7 @@ [ "./RunSharpmake.ps1 -workingDirectory {testFolder} -sharpmakeFile \"SimpleExeLibDependency.sharpmake.cs\" -framework {framework}", "./Compile.ps1 -slnOrPrjFile \"ExeLibSolutionName_vs2017_win64.sln\" -configuration {configuration} -platform \"x64\" -WorkingDirectory \"{testFolder}/projects\" -VsVersion {os} -compiler MsBuild", - "\"./{testFolder}/projects/output/win64/{configuration}/simpleexeprojectname.exe\"" + "&'./{testFolder}/projects/output/win64/{configuration}/simpleexeprojectname.exe'" ] }, { @@ -255,9 +257,9 @@ "./Extract-vcpkg.ps1 -workingDirectory {testFolder}", "./RunSharpmake.ps1 -workingDirectory {testFolder}/sharpmake -sharpmakeFile \"main.sharpmake.cs\" -framework {framework}", "./Compile.ps1 -slnOrPrjFile \"vcpkgsample_{VsVersionSuffix}.sln\" -configuration {configuration} -platform \"x64\" -WorkingDirectory \"{testFolder}/tmp/projects\" -VsVersion {os} -compiler MsBuild", - "\"./{testFolder}/bin/{configuration}-msbuild/vcpkgsample.exe\"", + "&'./{testFolder}/bin/{configuration}-msbuild/vcpkgsample.exe'", "./Compile.ps1 -slnOrPrjFile \"vcpkgsample_{VsVersionSuffix}.sln\" -configuration {configuration}_FastBuild -platform \"x64\" -WorkingDirectory \"{testFolder}/tmp/projects\" -VsVersion {os} -compiler MsBuild", - "\"./{testFolder}/bin/{configuration}-fastbuild/vcpkgsample.exe\"" + "&'./{testFolder}/bin/{configuration}-fastbuild/vcpkgsample.exe'" ] }, diff --git a/samples/CSharpHelloWorld/HelloWorld.sharpmake.cs b/samples/CSharpHelloWorld/HelloWorld.sharpmake.cs index 7467010b2..3669f7b73 100644 --- a/samples/CSharpHelloWorld/HelloWorld.sharpmake.cs +++ b/samples/CSharpHelloWorld/HelloWorld.sharpmake.cs @@ -1,11 +1,11 @@ // Copyright (c) 2017, 2019, 2021-2022 Ubisoft Entertainment -// +// // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at -// +// // http://www.apache.org/licenses/LICENSE-2.0 -// +// // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -36,7 +36,7 @@ public static Target[] GetDefaultTargets() DevEnv.vs2022, Optimization.Debug | Optimization.Release, OutputType.Dll, - framework: DotNetFramework.net7_0) + framework: DotNetFramework.net6_0) }; } } diff --git a/samples/CSharpHelloWorld/reference/projects/HelloWorldSolution.vs2022.net7_0.sln b/samples/CSharpHelloWorld/reference/projects/HelloWorldSolution.vs2022.net6_0.sln similarity index 62% rename from samples/CSharpHelloWorld/reference/projects/HelloWorldSolution.vs2022.net7_0.sln rename to samples/CSharpHelloWorld/reference/projects/HelloWorldSolution.vs2022.net6_0.sln index 14b1731fc..35eb31732 100644 --- a/samples/CSharpHelloWorld/reference/projects/HelloWorldSolution.vs2022.net7_0.sln +++ b/samples/CSharpHelloWorld/reference/projects/HelloWorldSolution.vs2022.net6_0.sln @@ -1,6 +1,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 17 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HelloWorld", "helloworld\HelloWorld.vs2022.net7_0.csproj", "{1DD745A4-D7A9-3E6B-EE19-9BB041FC1EE0}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HelloWorld", "helloworld\HelloWorld.vs2022.net6_0.csproj", "{1BBCE62D-4AD6-FCA3-CE7F-24AC0932F30C}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -8,10 +8,10 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {1DD745A4-D7A9-3E6B-EE19-9BB041FC1EE0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1DD745A4-D7A9-3E6B-EE19-9BB041FC1EE0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1DD745A4-D7A9-3E6B-EE19-9BB041FC1EE0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1DD745A4-D7A9-3E6B-EE19-9BB041FC1EE0}.Release|Any CPU.Build.0 = Release|Any CPU + {1BBCE62D-4AD6-FCA3-CE7F-24AC0932F30C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {1BBCE62D-4AD6-FCA3-CE7F-24AC0932F30C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {1BBCE62D-4AD6-FCA3-CE7F-24AC0932F30C}.Release|Any CPU.ActiveCfg = Release|Any CPU + {1BBCE62D-4AD6-FCA3-CE7F-24AC0932F30C}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/samples/CSharpHelloWorld/reference/projects/helloworld/HelloWorld.vs2022.net7_0.csproj b/samples/CSharpHelloWorld/reference/projects/helloworld/HelloWorld.vs2022.net6_0.csproj similarity index 97% rename from samples/CSharpHelloWorld/reference/projects/helloworld/HelloWorld.vs2022.net7_0.csproj rename to samples/CSharpHelloWorld/reference/projects/helloworld/HelloWorld.vs2022.net6_0.csproj index 22765ed7c..e931b3090 100644 --- a/samples/CSharpHelloWorld/reference/projects/helloworld/HelloWorld.vs2022.net7_0.csproj +++ b/samples/CSharpHelloWorld/reference/projects/helloworld/HelloWorld.vs2022.net6_0.csproj @@ -7,7 +7,7 @@ Properties HelloWorld the other name - net7.0 + net6.0 512 false false diff --git a/samples/NetCore/DotNetCoreFrameworkHelloWorld/HelloWorld.sharpmake.cs b/samples/NetCore/DotNetCoreFrameworkHelloWorld/HelloWorld.sharpmake.cs index 3b034d08e..7aa07979d 100644 --- a/samples/NetCore/DotNetCoreFrameworkHelloWorld/HelloWorld.sharpmake.cs +++ b/samples/NetCore/DotNetCoreFrameworkHelloWorld/HelloWorld.sharpmake.cs @@ -1,11 +1,11 @@ // Copyright (c) 2020-2021 Ubisoft Entertainment -// +// // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at -// +// // http://www.apache.org/licenses/LICENSE-2.0 -// +// // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -30,7 +30,7 @@ public class HelloWorld : CSharpProject OutputType.Dll, Blob.NoBlob, BuildSystem.MSBuild, - DotNetFramework.netcore2_1), + DotNetFramework.netcore3_1), new Target( Platform.anycpu, DevEnv.vs2019, @@ -61,7 +61,8 @@ public virtual void ConfigureAll(Configuration conf, Target target) conf.ProjectFileName = "[project.Name].[target.DevEnv].[target.Framework]"; conf.ProjectPath = @"[project.RootPath]"; - if (target.Framework.HasFlag(DotNetFramework.netcore3_1)) + // Should be tested on framework, but as Framework is the same for both targets, test on Devenv instead, which is the only way to differentiate both targets. + if (target.DevEnv.HasFlag(DevEnv.vs2017)) { conf.Options.Add(Options.CSharp.UseWpf.Enabled); } @@ -102,12 +103,12 @@ public class HelloWorldMultiFramework : CSharpProject { new Target( Platform.anycpu, - DevEnv.vs2019, + DevEnv.vs2022, Optimization.Debug | Optimization.Release, OutputType.Dll, Blob.NoBlob, BuildSystem.MSBuild, - DotNetFramework.netcore2_1 | DotNetFramework.netcore3_1 + DotNetFramework.netcore3_1 | DotNetFramework.net6_0 ) }; diff --git a/samples/NetCore/DotNetCoreFrameworkHelloWorld/reference/projects/HelloWorldMultiFrameworkSolution.vs2019.sln b/samples/NetCore/DotNetCoreFrameworkHelloWorld/reference/projects/HelloWorldMultiFrameworkSolution.vs2022.sln similarity index 59% rename from samples/NetCore/DotNetCoreFrameworkHelloWorld/reference/projects/HelloWorldMultiFrameworkSolution.vs2019.sln rename to samples/NetCore/DotNetCoreFrameworkHelloWorld/reference/projects/HelloWorldMultiFrameworkSolution.vs2022.sln index d4380f97f..7e8fd6d22 100644 --- a/samples/NetCore/DotNetCoreFrameworkHelloWorld/reference/projects/HelloWorldMultiFrameworkSolution.vs2019.sln +++ b/samples/NetCore/DotNetCoreFrameworkHelloWorld/reference/projects/HelloWorldMultiFrameworkSolution.vs2022.sln @@ -1,8 +1,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.29424.173 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HelloWorldMultiFramework", "helloworldmultiframework\HelloWorldMultiFramework.vs2019.csproj", "{898E2314-FD0E-0054-6BD6-A944C0C1C723}" +# Visual Studio Version 17 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HelloWorldMultiFramework", "helloworldmultiframework\HelloWorldMultiFramework.vs2022.csproj", "{80AE5A14-9413-E05F-3364-DDF235A77910}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -10,10 +8,10 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {898E2314-FD0E-0054-6BD6-A944C0C1C723}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {898E2314-FD0E-0054-6BD6-A944C0C1C723}.Debug|Any CPU.Build.0 = Debug|Any CPU - {898E2314-FD0E-0054-6BD6-A944C0C1C723}.Release|Any CPU.ActiveCfg = Release|Any CPU - {898E2314-FD0E-0054-6BD6-A944C0C1C723}.Release|Any CPU.Build.0 = Release|Any CPU + {80AE5A14-9413-E05F-3364-DDF235A77910}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {80AE5A14-9413-E05F-3364-DDF235A77910}.Debug|Any CPU.Build.0 = Debug|Any CPU + {80AE5A14-9413-E05F-3364-DDF235A77910}.Release|Any CPU.ActiveCfg = Release|Any CPU + {80AE5A14-9413-E05F-3364-DDF235A77910}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/samples/NetCore/DotNetCoreFrameworkHelloWorld/reference/projects/HelloWorldSolution.vs2017.netcore2_1.sln b/samples/NetCore/DotNetCoreFrameworkHelloWorld/reference/projects/HelloWorldSolution.vs2017.netcore3_1.sln similarity index 61% rename from samples/NetCore/DotNetCoreFrameworkHelloWorld/reference/projects/HelloWorldSolution.vs2017.netcore2_1.sln rename to samples/NetCore/DotNetCoreFrameworkHelloWorld/reference/projects/HelloWorldSolution.vs2017.netcore3_1.sln index c92e5f49d..7f2b33953 100644 --- a/samples/NetCore/DotNetCoreFrameworkHelloWorld/reference/projects/HelloWorldSolution.vs2017.netcore2_1.sln +++ b/samples/NetCore/DotNetCoreFrameworkHelloWorld/reference/projects/HelloWorldSolution.vs2017.netcore3_1.sln @@ -1,6 +1,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HelloWorld", "helloworld\HelloWorld.vs2017.netcore2_1.csproj", "{FBDAB658-9F80-4FEA-7DA3-5888504E98FE}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HelloWorld", "helloworld\HelloWorld.vs2017.netcore3_1.csproj", "{43CABEA7-8AD2-3F9E-93E2-55A3363736BD}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -8,10 +8,10 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {FBDAB658-9F80-4FEA-7DA3-5888504E98FE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FBDAB658-9F80-4FEA-7DA3-5888504E98FE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FBDAB658-9F80-4FEA-7DA3-5888504E98FE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FBDAB658-9F80-4FEA-7DA3-5888504E98FE}.Release|Any CPU.Build.0 = Release|Any CPU + {43CABEA7-8AD2-3F9E-93E2-55A3363736BD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {43CABEA7-8AD2-3F9E-93E2-55A3363736BD}.Debug|Any CPU.Build.0 = Debug|Any CPU + {43CABEA7-8AD2-3F9E-93E2-55A3363736BD}.Release|Any CPU.ActiveCfg = Release|Any CPU + {43CABEA7-8AD2-3F9E-93E2-55A3363736BD}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/samples/NetCore/DotNetCoreFrameworkHelloWorld/reference/projects/helloworld/HelloWorld.vs2017.netcore2_1.csproj b/samples/NetCore/DotNetCoreFrameworkHelloWorld/reference/projects/helloworld/HelloWorld.vs2017.netcore3_1.csproj similarity index 95% rename from samples/NetCore/DotNetCoreFrameworkHelloWorld/reference/projects/helloworld/HelloWorld.vs2017.netcore2_1.csproj rename to samples/NetCore/DotNetCoreFrameworkHelloWorld/reference/projects/helloworld/HelloWorld.vs2017.netcore3_1.csproj index d9a66c8c8..13b92d789 100644 --- a/samples/NetCore/DotNetCoreFrameworkHelloWorld/reference/projects/helloworld/HelloWorld.vs2017.netcore2_1.csproj +++ b/samples/NetCore/DotNetCoreFrameworkHelloWorld/reference/projects/helloworld/HelloWorld.vs2017.netcore3_1.csproj @@ -7,10 +7,10 @@ Properties HelloWorld the other name - netcoreapp2.1 + netcoreapp3.1 512 true - true + true AnyCPU diff --git a/samples/NetCore/DotNetCoreFrameworkHelloWorld/reference/projects/helloworldmultiframework/HelloWorldMultiFramework.vs2019.csproj b/samples/NetCore/DotNetCoreFrameworkHelloWorld/reference/projects/helloworldmultiframework/HelloWorldMultiFramework.vs2022.csproj similarity index 95% rename from samples/NetCore/DotNetCoreFrameworkHelloWorld/reference/projects/helloworldmultiframework/HelloWorldMultiFramework.vs2019.csproj rename to samples/NetCore/DotNetCoreFrameworkHelloWorld/reference/projects/helloworldmultiframework/HelloWorldMultiFramework.vs2022.csproj index 418104e96..5e8e48998 100644 --- a/samples/NetCore/DotNetCoreFrameworkHelloWorld/reference/projects/helloworldmultiframework/HelloWorldMultiFramework.vs2019.csproj +++ b/samples/NetCore/DotNetCoreFrameworkHelloWorld/reference/projects/helloworldmultiframework/HelloWorldMultiFramework.vs2022.csproj @@ -7,12 +7,12 @@ Properties HelloWorldMultiFramework the other name - netcoreapp2.1;netcoreapp3.1 + netcoreapp3.1;net6.0 512 false false - + AnyCPU true full @@ -24,7 +24,7 @@ true false - + AnyCPU true full @@ -36,7 +36,7 @@ true false - + AnyCPU false pdbonly @@ -48,7 +48,7 @@ true false - + AnyCPU false pdbonly diff --git a/samples/NetCore/DotNetOSMultiFrameworksHelloWorld/HelloWorld.sharpmake.cs b/samples/NetCore/DotNetOSMultiFrameworksHelloWorld/HelloWorld.sharpmake.cs index a82625ad0..78b6f5f5c 100644 --- a/samples/NetCore/DotNetOSMultiFrameworksHelloWorld/HelloWorld.sharpmake.cs +++ b/samples/NetCore/DotNetOSMultiFrameworksHelloWorld/HelloWorld.sharpmake.cs @@ -1,11 +1,11 @@ // Copyright (c) 2021 Ubisoft Entertainment -// +// // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at -// +// // http://www.apache.org/licenses/LICENSE-2.0 -// +// // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -95,7 +95,7 @@ public static CommonTarget[] GetDefaultTargets(DotNetOS dotNetOS = DotNetOS.Defa Platform.anycpu, DevEnv.vs2022, Optimization.Debug | Optimization.Release, - DotNetFramework.net7_0, + DotNetFramework.net6_0, dotNetOS: dotNetOS ); @@ -174,7 +174,7 @@ public HelloWorldExe() Platform.anycpu, DevEnv.vs2022, Optimization.Debug | Optimization.Release, - DotNetFramework.net7_0, + DotNetFramework.net6_0, dotNetOS: DotNetOS.windows )); } @@ -186,7 +186,20 @@ public override void ConfigureAll(Configuration conf, CommonTarget target) conf.AddPrivateDependency(target.ToDefaultDotNetOSTarget()); if (target.DotNetFramework.IsDotNetCore()) - conf.ReferencesByNuGetPackage.Add("Microsoft.Windows.Compatibility", "7.0.0"); + { + if (target.DotNetFramework.HasFlag(DotNetFramework.netcore3_1)) + { + conf.Options.Add(Options.CSharp.UseWpf.Enabled); + + conf.ReferencesByNuGetPackage.Add("Microsoft.Windows.Compatibility", "3.1.0"); + } + else + { + conf.Options.Add(Options.CSharp.UseWindowsForms.Enabled); + + conf.ReferencesByNuGetPackage.Add("Microsoft.Windows.Compatibility", "6.0.0"); + } + } } } diff --git a/samples/NetCore/DotNetOSMultiFrameworksHelloWorld/reference/codebase/helloworldlib/HelloWorldLib.vs2022.csproj b/samples/NetCore/DotNetOSMultiFrameworksHelloWorld/reference/codebase/helloworldlib/HelloWorldLib.vs2022.csproj index fede3812b..793777baa 100644 --- a/samples/NetCore/DotNetOSMultiFrameworksHelloWorld/reference/codebase/helloworldlib/HelloWorldLib.vs2022.csproj +++ b/samples/NetCore/DotNetOSMultiFrameworksHelloWorld/reference/codebase/helloworldlib/HelloWorldLib.vs2022.csproj @@ -7,7 +7,7 @@ Properties HelloWorldLib HelloWorldLib - net472;net7.0 + net472;net6.0 512 false false @@ -24,7 +24,7 @@ true false - + AnyCPU true full @@ -48,7 +48,7 @@ true false - + AnyCPU false pdbonly @@ -69,7 +69,7 @@ - + diff --git a/samples/NetCore/DotNetOSMultiFrameworksHelloWorld/reference/codebase/helloworldmultiframeworks/HelloWorldExe.vs2022.csproj b/samples/NetCore/DotNetOSMultiFrameworksHelloWorld/reference/codebase/helloworldmultiframeworks/HelloWorldExe.vs2022.csproj index 7364f207f..d23690d2a 100644 --- a/samples/NetCore/DotNetOSMultiFrameworksHelloWorld/reference/codebase/helloworldmultiframeworks/HelloWorldExe.vs2022.csproj +++ b/samples/NetCore/DotNetOSMultiFrameworksHelloWorld/reference/codebase/helloworldmultiframeworks/HelloWorldExe.vs2022.csproj @@ -7,7 +7,7 @@ Properties HelloWorldExe HelloWorldExe - net472;net7.0;net7.0-windows + net472;net6.0;net6.0-windows 512 false false @@ -24,7 +24,7 @@ true false - + AnyCPU true full @@ -36,7 +36,7 @@ true false - + AnyCPU true full @@ -60,7 +60,7 @@ true false - + AnyCPU false pdbonly @@ -72,7 +72,7 @@ true false - + AnyCPU false pdbonly @@ -95,8 +95,8 @@ HelloWorldLib - - + + \ No newline at end of file