diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index beb89212c7c..f6cc9c5c8b7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,67 +1,67 @@ - + https://github.com/dotnet/winforms - ff7679d86eff72ef6c728acab5bfedbec93ab632 + 08e9d68208d5daa3fbb6cac819774873053793d1 - + https://github.com/dotnet/corefx - d341fd37dcb2c22e382adccdc06770cf8f160577 + 2d38da41c8c153e498ea5fbda88c7532389b2f3f - + https://github.com/dotnet/corefx - d341fd37dcb2c22e382adccdc06770cf8f160577 + 2d38da41c8c153e498ea5fbda88c7532389b2f3f - + https://github.com/dotnet/corefx - d341fd37dcb2c22e382adccdc06770cf8f160577 + 2d38da41c8c153e498ea5fbda88c7532389b2f3f - + https://github.com/dotnet/corefx - d341fd37dcb2c22e382adccdc06770cf8f160577 + 2d38da41c8c153e498ea5fbda88c7532389b2f3f - + https://github.com/dotnet/corefx - d341fd37dcb2c22e382adccdc06770cf8f160577 + 2d38da41c8c153e498ea5fbda88c7532389b2f3f - + https://github.com/dotnet/corefx - d341fd37dcb2c22e382adccdc06770cf8f160577 + 2d38da41c8c153e498ea5fbda88c7532389b2f3f - + https://github.com/dotnet/corefx - d341fd37dcb2c22e382adccdc06770cf8f160577 + 2d38da41c8c153e498ea5fbda88c7532389b2f3f - + https://github.com/dotnet/corefx - d341fd37dcb2c22e382adccdc06770cf8f160577 + 2d38da41c8c153e498ea5fbda88c7532389b2f3f - + https://github.com/dotnet/corefx - d341fd37dcb2c22e382adccdc06770cf8f160577 + 2d38da41c8c153e498ea5fbda88c7532389b2f3f - + https://github.com/dotnet/corefx - d341fd37dcb2c22e382adccdc06770cf8f160577 + 2d38da41c8c153e498ea5fbda88c7532389b2f3f - + https://github.com/dotnet/corefx - d341fd37dcb2c22e382adccdc06770cf8f160577 + 2d38da41c8c153e498ea5fbda88c7532389b2f3f - + https://github.com/dotnet/corefx - d341fd37dcb2c22e382adccdc06770cf8f160577 + 2d38da41c8c153e498ea5fbda88c7532389b2f3f - + https://github.com/dotnet/corefx - d341fd37dcb2c22e382adccdc06770cf8f160577 + 2d38da41c8c153e498ea5fbda88c7532389b2f3f - + https://github.com/dotnet/core-setup - 8880d723b63cbca2dcee68870c6b23ffc36d1811 + 0d6763312a2754e45d604ebdc69c8ac7e21a2187 https://github.com/dotnet/arcade @@ -71,29 +71,29 @@ https://github.com/dotnet/arcade 0f5cfb20a355c27bc84cedd049c946b44a7fc1da - + https://github.com/dotnet/corefx - d341fd37dcb2c22e382adccdc06770cf8f160577 + 2d38da41c8c153e498ea5fbda88c7532389b2f3f - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int - 83ab428ae9904012fbf4f109c2a5026793136966 + 933873f081a7f33018814580933425ad6c985f64 - + https://github.com/dotnet/corefx - d341fd37dcb2c22e382adccdc06770cf8f160577 + 2d38da41c8c153e498ea5fbda88c7532389b2f3f - + https://github.com/dotnet/coreclr - 410268b19f7b0b1b1215061f8891a82323ce5955 + d13d1b61de8a28e0d5509273a6ec3de35b1dd258 - + https://github.com/dotnet/coreclr - 410268b19f7b0b1b1215061f8891a82323ce5955 + d13d1b61de8a28e0d5509273a6ec3de35b1dd258 - + https://github.com/dotnet/coreclr - 410268b19f7b0b1b1215061f8891a82323ce5955 + d13d1b61de8a28e0d5509273a6ec3de35b1dd258 https://github.com/dotnet/arcade @@ -107,5 +107,9 @@ https://github.com/dotnet/arcade 0f5cfb20a355c27bc84cedd049c946b44a7fc1da + + https://github.com/dotnet/corefx + 2d38da41c8c153e498ea5fbda88c7532389b2f3f + diff --git a/eng/Versions.props b/eng/Versions.props index 45457627210..2a208d0de70 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -5,39 +5,40 @@ preview1 true 4.0.0.0 - 4.6.0-rc1.19420.10 + 4.7.0-preview1.19459.13 + 4.7.0-preview1.19459.13 - 4.8.1-preview1.19461.5 + 4.8.1-preview1.19461.15 - 3.0.0-rc1.19428.6 - 3.0.0-rc1.19428.6 - 3.0.0-rc1.19428.6 + 3.1.0-preview1.19459.7 + 3.1.0-preview1.19459.7 + 3.1.0-preview1.19459.7 - 3.0.0-rc1-19429-05 - 3.0.0-rc1.19420.10 - 4.6.0-rc1.19420.10 - 4.6.0-rc1.19420.10 - 4.6.0-rc1.19420.10 + 3.1.0-preview1.19459.38 + 3.1.0-preview1.19459.13 + 4.7.0-preview1.19459.13 + 4.7.0-preview1.19459.13 + 4.7.0-preview1.19459.13 - 4.6.0-rc1.19420.10 - 4.6.0-rc1.19420.10 - 4.6.0-rc1.19420.10 - 4.6.0-rc1.19420.10 - 4.6.0-rc1.19420.10 + 4.7.0-preview1.19459.13 + 4.7.0-preview1.19459.13 + 4.7.0-preview1.19459.13 + 4.7.0-preview1.19459.13 + 4.7.0-preview1.19459.13 4.6.0-preview4.19176.11 - 4.6.0-rc1.19420.10 - 4.6.0-rc1.19420.10 - 4.6.0-rc1.19420.10 - 4.6.0-rc1.19420.10 - 4.6.0-rc1.19420.10 + 4.7.0-preview1.19459.13 + 4.7.0-preview1.19459.13 + 4.7.0-preview1.19459.13 + 4.7.0-preview1.19459.13 + 4.7.0-preview1.19459.13 @@ -113,6 +114,6 @@ It is worth reiterating that this package *should not* be consumed to build the product. --> - 5.0.0-alpha1.19420.2 + 4.8.1-preview1.19461.9 diff --git a/eng/WpfArcadeSdk/Sdk/Sdk.props b/eng/WpfArcadeSdk/Sdk/Sdk.props index d5f6c0629be..6a949842e79 100644 --- a/eng/WpfArcadeSdk/Sdk/Sdk.props +++ b/eng/WpfArcadeSdk/Sdk/Sdk.props @@ -69,6 +69,13 @@ --> $(NoWarn);NU1605 + + $(NoWarn);NU5128;NU5313;NU5131 + diff --git a/eng/WpfArcadeSdk/tools/RuntimeFrameworkReference.targets b/eng/WpfArcadeSdk/tools/RuntimeFrameworkReference.targets index 147b9b41d9d..f3f1cb90d19 100644 --- a/eng/WpfArcadeSdk/tools/RuntimeFrameworkReference.targets +++ b/eng/WpfArcadeSdk/tools/RuntimeFrameworkReference.targets @@ -13,7 +13,11 @@ Condition="'$(ManagedCxx)'=='true'"/> + Condition="'$(MicrosoftNETCoreAppVersion)'!='' + And '$(NoTargets)'!='true' + And '$(TargetFrameworkIdentifier)' == '.NETCoreApp' + And ('$(TargetFrameworkVersion)' == 'v3.0' Or '$(TargetFrameworkVersion)' == 'v3.1') + And '$(MSBuildProjectExtension)'!='.vcxproj'"> $(MicrosoftNETCoreAppVersion) @@ -25,7 +29,7 @@ - - + + diff --git a/eng/WpfArcadeSdk/tools/SdkReferences.targets b/eng/WpfArcadeSdk/tools/SdkReferences.targets index 092d75ae234..117216a5b89 100644 --- a/eng/WpfArcadeSdk/tools/SdkReferences.targets +++ b/eng/WpfArcadeSdk/tools/SdkReferences.targets @@ -4,7 +4,10 @@ Version="$(MicrosoftPrivateWinformsVersion)" ExcludeAssets="All" GeneratePathProperty="True" - Condition="'$(MSBuildProjectExtension)'!='.vcxproj' And $(TargetFramework.StartsWith('netcoreapp3')) And '$(NoAutoMicrosoftPrivateWinformsReference)'!='true'"/> + Condition="'$(MSBuildProjectExtension)'!='.vcxproj' + And '$(TargetFrameworkIdentifier)' == '.NETCoreApp' + And ('$(TargetFrameworkVersion)' == 'v3.0' Or '$(TargetFrameworkVersion)' == 'v3.1') + And '$(NoAutoMicrosoftPrivateWinformsReference)'!='true'"/> - - - Microsoft.NetCore.App - - - - + Condition="'@(NetCoreReference)' != '' And '@(Reference)' != ''"> - - - Microsoft.WindowsDesktop.App - - - - + Condition="'@(WindowsDesktopReference)'!='' and '@(Reference)' != ''"> + Condition="'@(MicrosoftPrivateWinFormsReference)'!='' + And '$(TargetFrameworkIdentifier)' == '.NETCoreApp' + And ('$(TargetFrameworkVersion)' == 'v3.0' Or '$(TargetFrameworkVersion)' == 'v3.1') "> diff --git a/eng/WpfArcadeSdk/tools/Wpf.Cpp.targets b/eng/WpfArcadeSdk/tools/Wpf.Cpp.targets index a27a77b7b39..2f1e90464f7 100644 --- a/eng/WpfArcadeSdk/tools/Wpf.Cpp.targets +++ b/eng/WpfArcadeSdk/tools/Wpf.Cpp.targets @@ -326,7 +326,7 @@ using namespace System::Runtime::Versioning; - netcoreapp3.0 + netcoreapp3.1 AnyCPU%3Bx64 ]]> diff --git a/eng/WpfArcadeSdk/tools/WpfProjectReference.targets b/eng/WpfArcadeSdk/tools/WpfProjectReference.targets index e80e7a0dca0..5e4af19c735 100644 --- a/eng/WpfArcadeSdk/tools/WpfProjectReference.targets +++ b/eng/WpfArcadeSdk/tools/WpfProjectReference.targets @@ -5,9 +5,10 @@ ExcludeAssets="All" GeneratePathProperty="True" Condition="'$(MSBuildProjectExtension)'!='.vcxproj' - And $(TargetFramework.StartsWith('netcoreapp3')) - And '$(NoAutoMicrosoftDotNetWpfGitHubPackageReference)'!='true' - And '$(MicrosoftDotNetWpfGitHubPackage)'!=''"/> + And '$(TargetFrameworkIdentifier)' == '.NETCoreApp' + And ('$(TargetFrameworkVersion)' == 'v3.0' Or '$(TargetFrameworkVersion)' == 'v3.1') + And '$(NoAutoMicrosoftDotNetWpfGitHubPackageReference)'!='true' + And '$(MicrosoftDotNetWpfGitHubPackage)'!=''"/> diff --git a/eng/common/performance/performance-setup.sh b/eng/common/performance/performance-setup.sh index 2f2092166e4..4eb755961dc 100755 --- a/eng/common/performance/performance-setup.sh +++ b/eng/common/performance/performance-setup.sh @@ -1,216 +1,216 @@ -#!/usr/bin/env bash - -source_directory=$BUILD_SOURCESDIRECTORY -core_root_directory= -baseline_core_root_directory= -architecture=x64 -framework=netcoreapp5.0 -compilation_mode=tiered -repository=$BUILD_REPOSITORY_NAME -branch=$BUILD_SOURCEBRANCH -commit_sha=$BUILD_SOURCEVERSION -build_number=$BUILD_BUILDNUMBER -internal=false -compare=false -kind="micro" -run_categories="coreclr corefx" -csproj="src\benchmarks\micro\MicroBenchmarks.csproj" -configurations= -run_from_perf_repo=false -use_core_run=true -use_baseline_core_run=true - -while (($# > 0)); do - lowerI="$(echo $1 | awk '{print tolower($0)}')" - case $lowerI in - --sourcedirectory) - source_directory=$2 - shift 2 - ;; - --corerootdirectory) - core_root_directory=$2 - shift 2 - ;; - --baselinecorerootdirectory) - baseline_core_root_directory=$2 - shift 2 - ;; - --architecture) - architecture=$2 - shift 2 - ;; - --framework) - framework=$2 - shift 2 - ;; - --compilationmode) - compilation_mode=$2 - shift 2 - ;; - --repository) - repository=$2 - shift 2 - ;; - --branch) - branch=$2 - shift 2 - ;; - --commitsha) - commit_sha=$2 - shift 2 - ;; - --buildnumber) - build_number=$2 - shift 2 - ;; - --kind) - kind=$2 - shift 2 - ;; - --runcategories) - run_categories=$2 - shift 2 - ;; - --csproj) - csproj=$2 - shift 2 - ;; - --internal) - internal=true - shift 1 - ;; - --compare) - compare=true - shift 1 - ;; - --configurations) - configurations=$2 - shift 2 - ;; - --help) - echo "Common settings:" - echo " --corerootdirectory Directory where Core_Root exists, if running perf testing with --corerun" - echo " --architecture Architecture of the testing being run" - echo " --configurations List of key=value pairs that will be passed to perf testing infrastructure." - echo " ex: --configurations \"CompilationMode=Tiered OptimzationLevel=PGO\"" - echo " --help Print help and exit" - echo "" - echo "Advanced settings:" - echo " --framework The framework to run, if not running in master" - echo " --compliationmode The compilation mode if not passing --configurations" - echo " --sourcedirectory The directory of the sources. Defaults to env:BUILD_SOURCESDIRECTORY" - echo " --repository The name of the repository in the / format. Defaults to env:BUILD_REPOSITORY_NAME" - echo " --branch The name of the branch. Defaults to env:BUILD_SOURCEBRANCH" - echo " --commitsha The commit sha1 to run against. Defaults to env:BUILD_SOURCEVERSION" - echo " --buildnumber The build number currently running. Defaults to env:BUILD_BUILDNUMBER" - echo " --csproj The relative path to the benchmark csproj whose tests should be run. Defaults to src\benchmarks\micro\MicroBenchmarks.csproj" - echo " --kind Related to csproj. The kind of benchmarks that should be run. Defaults to micro" - echo " --runcategories Related to csproj. Categories of benchmarks to run. Defaults to \"coreclr corefx\"" - echo " --internal If the benchmarks are running as an official job." - echo "" - exit 0 - ;; - esac -done - -if [ "$repository" == "dotnet/performance" ] || [ "$repository" == "dotnet-performance" ]; then - run_from_perf_repo=true -fi - -if [ -z "$configurations" ]; then - configurations="CompliationMode=$compilation_mode" -fi - -if [ -z "$core_root_directory" ]; then - use_core_run=false -fi - -if [ -z "$baseline_core_root_directory" ]; then - use_baseline_core_run=false -fi - -payload_directory=$source_directory/Payload -performance_directory=$payload_directory/performance -workitem_directory=$source_directory/workitem -extra_benchmark_dotnet_arguments="--iterationCount 1 --warmupCount 0 --invocationCount 1 --unrollFactor 1 --strategy ColdStart --stopOnFirstError true" -perflab_arguments= -queue=Ubuntu.1804.Amd64.Open -creator=$BUILD_DEFINITIONNAME -helix_source_prefix="pr" - -if [[ "$compare" == true ]]; then - extra_benchmark_dotnet_arguments= - perflab_arguments= - - # No open queues for arm64 - if [[ "$architecture" = "arm64" ]]; then - echo "Compare not available for arm64" - exit 1 - fi - - queue=Ubuntu.1804.Amd64.Tiger.Perf.Open -fi - -if [[ "$internal" == true ]]; then - perflab_arguments="--upload-to-perflab-container" - helix_source_prefix="official" - creator= - extra_benchmark_dotnet_arguments= - - if [[ "$architecture" = "arm64" ]]; then - queue=Ubuntu.1804.Arm64.Perf - else - queue=Ubuntu.1804.Amd64.Tiger.Perf - fi -fi - -common_setup_arguments="--frameworks $framework --queue $queue --build-number $build_number --build-configs $configurations" -setup_arguments="--repository https://github.com/$repository --branch $branch --get-perf-hash --commit-sha $commit_sha $common_setup_arguments" - -if [[ "$run_from_perf_repo" = true ]]; then - payload_directory= - workitem_directory=$source_directory - performance_directory=$workitem_directory - setup_arguments="--perf-hash $commit_sha $common_setup_arguments" -else - git clone --branch master --depth 1 --quiet https://github.com/dotnet/performance $performance_directory - - docs_directory=$performance_directory/docs - mv $docs_directory $workitem_directory -fi - -if [[ "$use_core_run" = true ]]; then - new_core_root=$payload_directory/Core_Root - mv $core_root_directory $new_core_root -fi - -if [[ "$use_baseline_core_run" = true ]]; then - new_baseline_core_root=$payload_directory/Baseline_Core_Root - mv $baseline_core_root_directory $new_baseline_core_root -fi - -ci=true - -_script_dir=$(pwd)/eng/common -. "$_script_dir/pipeline-logging-functions.sh" - -# Make sure all of our variables are available for future steps -Write-PipelineSetVariable -name "UseCoreRun" -value "$use_core_run" -is_multi_job_variable false -Write-PipelineSetVariable -name "UseBaselineCoreRun" -value "$use_baseline_core_run" -is_multi_job_variable false -Write-PipelineSetVariable -name "Architecture" -value "$architecture" -is_multi_job_variable false -Write-PipelineSetVariable -name "PayloadDirectory" -value "$payload_directory" -is_multi_job_variable false -Write-PipelineSetVariable -name "PerformanceDirectory" -value "$performance_directory" -is_multi_job_variable false -Write-PipelineSetVariable -name "WorkItemDirectory" -value "$workitem_directory" -is_multi_job_variable false -Write-PipelineSetVariable -name "Queue" -value "$queue" -is_multi_job_variable false -Write-PipelineSetVariable -name "SetupArguments" -value "$setup_arguments" -is_multi_job_variable false -Write-PipelineSetVariable -name "Python" -value "$python3" -is_multi_job_variable false -Write-PipelineSetVariable -name "PerfLabArguments" -value "$perflab_arguments" -is_multi_job_variable false -Write-PipelineSetVariable -name "ExtraBenchmarkDotNetArguments" -value "$extra_benchmark_dotnet_arguments" -is_multi_job_variable false -Write-PipelineSetVariable -name "BDNCategories" -value "$run_categories" -is_multi_job_variable false -Write-PipelineSetVariable -name "TargetCsproj" -value "$csproj" -is_multi_job_variable false -Write-PipelineSetVariable -name "RunFromPerfRepo" -value "$run_from_perf_repo" -is_multi_job_variable false -Write-PipelineSetVariable -name "Creator" -value "$creator" -is_multi_job_variable false -Write-PipelineSetVariable -name "HelixSourcePrefix" -value "$helix_source_prefix" -is_multi_job_variable false -Write-PipelineSetVariable -name "Kind" -value "$kind" -is_multi_job_variable false -Write-PipelineSetVariable -name "_BuildConfig" -value "$architecture.$kind.$framework" -is_multi_job_variable false -Write-PipelineSetVariable -name "Compare" -value "$compare" -is_multi_job_variable false +#!/usr/bin/env bash + +source_directory=$BUILD_SOURCESDIRECTORY +core_root_directory= +baseline_core_root_directory= +architecture=x64 +framework=netcoreapp5.0 +compilation_mode=tiered +repository=$BUILD_REPOSITORY_NAME +branch=$BUILD_SOURCEBRANCH +commit_sha=$BUILD_SOURCEVERSION +build_number=$BUILD_BUILDNUMBER +internal=false +compare=false +kind="micro" +run_categories="coreclr corefx" +csproj="src\benchmarks\micro\MicroBenchmarks.csproj" +configurations= +run_from_perf_repo=false +use_core_run=true +use_baseline_core_run=true + +while (($# > 0)); do + lowerI="$(echo $1 | awk '{print tolower($0)}')" + case $lowerI in + --sourcedirectory) + source_directory=$2 + shift 2 + ;; + --corerootdirectory) + core_root_directory=$2 + shift 2 + ;; + --baselinecorerootdirectory) + baseline_core_root_directory=$2 + shift 2 + ;; + --architecture) + architecture=$2 + shift 2 + ;; + --framework) + framework=$2 + shift 2 + ;; + --compilationmode) + compilation_mode=$2 + shift 2 + ;; + --repository) + repository=$2 + shift 2 + ;; + --branch) + branch=$2 + shift 2 + ;; + --commitsha) + commit_sha=$2 + shift 2 + ;; + --buildnumber) + build_number=$2 + shift 2 + ;; + --kind) + kind=$2 + shift 2 + ;; + --runcategories) + run_categories=$2 + shift 2 + ;; + --csproj) + csproj=$2 + shift 2 + ;; + --internal) + internal=true + shift 1 + ;; + --compare) + compare=true + shift 1 + ;; + --configurations) + configurations=$2 + shift 2 + ;; + --help) + echo "Common settings:" + echo " --corerootdirectory Directory where Core_Root exists, if running perf testing with --corerun" + echo " --architecture Architecture of the testing being run" + echo " --configurations List of key=value pairs that will be passed to perf testing infrastructure." + echo " ex: --configurations \"CompilationMode=Tiered OptimzationLevel=PGO\"" + echo " --help Print help and exit" + echo "" + echo "Advanced settings:" + echo " --framework The framework to run, if not running in master" + echo " --compliationmode The compilation mode if not passing --configurations" + echo " --sourcedirectory The directory of the sources. Defaults to env:BUILD_SOURCESDIRECTORY" + echo " --repository The name of the repository in the / format. Defaults to env:BUILD_REPOSITORY_NAME" + echo " --branch The name of the branch. Defaults to env:BUILD_SOURCEBRANCH" + echo " --commitsha The commit sha1 to run against. Defaults to env:BUILD_SOURCEVERSION" + echo " --buildnumber The build number currently running. Defaults to env:BUILD_BUILDNUMBER" + echo " --csproj The relative path to the benchmark csproj whose tests should be run. Defaults to src\benchmarks\micro\MicroBenchmarks.csproj" + echo " --kind Related to csproj. The kind of benchmarks that should be run. Defaults to micro" + echo " --runcategories Related to csproj. Categories of benchmarks to run. Defaults to \"coreclr corefx\"" + echo " --internal If the benchmarks are running as an official job." + echo "" + exit 0 + ;; + esac +done + +if [ "$repository" == "dotnet/performance" ] || [ "$repository" == "dotnet-performance" ]; then + run_from_perf_repo=true +fi + +if [ -z "$configurations" ]; then + configurations="CompliationMode=$compilation_mode" +fi + +if [ -z "$core_root_directory" ]; then + use_core_run=false +fi + +if [ -z "$baseline_core_root_directory" ]; then + use_baseline_core_run=false +fi + +payload_directory=$source_directory/Payload +performance_directory=$payload_directory/performance +workitem_directory=$source_directory/workitem +extra_benchmark_dotnet_arguments="--iterationCount 1 --warmupCount 0 --invocationCount 1 --unrollFactor 1 --strategy ColdStart --stopOnFirstError true" +perflab_arguments= +queue=Ubuntu.1804.Amd64.Open +creator=$BUILD_DEFINITIONNAME +helix_source_prefix="pr" + +if [[ "$compare" == true ]]; then + extra_benchmark_dotnet_arguments= + perflab_arguments= + + # No open queues for arm64 + if [[ "$architecture" = "arm64" ]]; then + echo "Compare not available for arm64" + exit 1 + fi + + queue=Ubuntu.1804.Amd64.Tiger.Perf.Open +fi + +if [[ "$internal" == true ]]; then + perflab_arguments="--upload-to-perflab-container" + helix_source_prefix="official" + creator= + extra_benchmark_dotnet_arguments= + + if [[ "$architecture" = "arm64" ]]; then + queue=Ubuntu.1804.Arm64.Perf + else + queue=Ubuntu.1804.Amd64.Tiger.Perf + fi +fi + +common_setup_arguments="--frameworks $framework --queue $queue --build-number $build_number --build-configs $configurations" +setup_arguments="--repository https://github.com/$repository --branch $branch --get-perf-hash --commit-sha $commit_sha $common_setup_arguments" + +if [[ "$run_from_perf_repo" = true ]]; then + payload_directory= + workitem_directory=$source_directory + performance_directory=$workitem_directory + setup_arguments="--perf-hash $commit_sha $common_setup_arguments" +else + git clone --branch master --depth 1 --quiet https://github.com/dotnet/performance $performance_directory + + docs_directory=$performance_directory/docs + mv $docs_directory $workitem_directory +fi + +if [[ "$use_core_run" = true ]]; then + new_core_root=$payload_directory/Core_Root + mv $core_root_directory $new_core_root +fi + +if [[ "$use_baseline_core_run" = true ]]; then + new_baseline_core_root=$payload_directory/Baseline_Core_Root + mv $baseline_core_root_directory $new_baseline_core_root +fi + +ci=true + +_script_dir=$(pwd)/eng/common +. "$_script_dir/pipeline-logging-functions.sh" + +# Make sure all of our variables are available for future steps +Write-PipelineSetVariable -name "UseCoreRun" -value "$use_core_run" -is_multi_job_variable false +Write-PipelineSetVariable -name "UseBaselineCoreRun" -value "$use_baseline_core_run" -is_multi_job_variable false +Write-PipelineSetVariable -name "Architecture" -value "$architecture" -is_multi_job_variable false +Write-PipelineSetVariable -name "PayloadDirectory" -value "$payload_directory" -is_multi_job_variable false +Write-PipelineSetVariable -name "PerformanceDirectory" -value "$performance_directory" -is_multi_job_variable false +Write-PipelineSetVariable -name "WorkItemDirectory" -value "$workitem_directory" -is_multi_job_variable false +Write-PipelineSetVariable -name "Queue" -value "$queue" -is_multi_job_variable false +Write-PipelineSetVariable -name "SetupArguments" -value "$setup_arguments" -is_multi_job_variable false +Write-PipelineSetVariable -name "Python" -value "$python3" -is_multi_job_variable false +Write-PipelineSetVariable -name "PerfLabArguments" -value "$perflab_arguments" -is_multi_job_variable false +Write-PipelineSetVariable -name "ExtraBenchmarkDotNetArguments" -value "$extra_benchmark_dotnet_arguments" -is_multi_job_variable false +Write-PipelineSetVariable -name "BDNCategories" -value "$run_categories" -is_multi_job_variable false +Write-PipelineSetVariable -name "TargetCsproj" -value "$csproj" -is_multi_job_variable false +Write-PipelineSetVariable -name "RunFromPerfRepo" -value "$run_from_perf_repo" -is_multi_job_variable false +Write-PipelineSetVariable -name "Creator" -value "$creator" -is_multi_job_variable false +Write-PipelineSetVariable -name "HelixSourcePrefix" -value "$helix_source_prefix" -is_multi_job_variable false +Write-PipelineSetVariable -name "Kind" -value "$kind" -is_multi_job_variable false +Write-PipelineSetVariable -name "_BuildConfig" -value "$architecture.$kind.$framework" -is_multi_job_variable false +Write-PipelineSetVariable -name "Compare" -value "$compare" -is_multi_job_variable false diff --git a/eng/common/templates/post-build/channels/netcore-release-30.yml b/eng/common/templates/post-build/channels/netcore-release-30.yml index 5a5c28e1b6e..00bd62e46fa 100644 --- a/eng/common/templates/post-build/channels/netcore-release-30.yml +++ b/eng/common/templates/post-build/channels/netcore-release-30.yml @@ -1,6 +1,7 @@ parameters: symbolPublishingAdditionalParameters: '' artifactsPublishingAdditionalParameters: '' + publishInstallersAndChecksums: false stages: - stage: NetCore_Release30_Publish @@ -91,6 +92,7 @@ stages: inputs: filePath: eng\common\sdk-task.ps1 arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet + /p:ArtifactsCategory=$(_DotNetArtifactsCategory) /p:IsStableBuild=$(IsStableBuild) /p:IsInternalBuild=$(IsInternalBuild) /p:RepositoryName=$(Build.Repository.Name) @@ -110,7 +112,12 @@ stages: /p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/' /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts/' - /p:Configuration=Release + /p:Configuration=Release + /p:PublishInstallersAndChecksums=${{ parameters.publishInstallersAndChecksums }} + /p:InstallersTargetStaticFeed=$(InstallersBlobFeedUrl) + /p:InstallersAzureAccountKey=$(dotnetcli-storage-key) + /p:ChecksumsTargetStaticFeed=$(ChecksumsBlobFeedUrl) + /p:ChecksumsAzureAccountKey=$(dotnetclichecksums-storage-key) ${{ parameters.artifactsPublishingAdditionalParameters }} - template: ../../steps/promote-build.yml diff --git a/eng/common/templates/post-build/channels/netcore-release-31.yml b/eng/common/templates/post-build/channels/netcore-release-31.yml index 29452158835..26e02dca473 100644 --- a/eng/common/templates/post-build/channels/netcore-release-31.yml +++ b/eng/common/templates/post-build/channels/netcore-release-31.yml @@ -1,6 +1,7 @@ parameters: symbolPublishingAdditionalParameters: '' artifactsPublishingAdditionalParameters: '' + publishInstallersAndChecksums: false stages: - stage: NetCore_Release31_Publish diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml index e473cadbccf..42b465a0a6f 100644 --- a/eng/common/templates/post-build/post-build.yml +++ b/eng/common/templates/post-build/post-build.yml @@ -132,11 +132,13 @@ stages: parameters: symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} - template: \eng\common\templates\post-build\channels\netcore-release-31.yml parameters: symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} - template: \eng\common\templates\post-build\channels\netcore-internal-30.yml parameters: diff --git a/eng/helixpublish.proj b/eng/helixpublish.proj index 1fd47a3e5f5..d90ded6edd3 100644 --- a/eng/helixpublish.proj +++ b/eng/helixpublish.proj @@ -1,7 +1,7 @@ - netcoreapp3.0 + netcoreapp3.1 true - NU5111 + $(NoWarn);NU5111 diff --git a/packaging/Microsoft.DotNet.Wpf.GitHub/Microsoft.DotNet.Wpf.GitHub.ArchNeutral.csproj b/packaging/Microsoft.DotNet.Wpf.GitHub/Microsoft.DotNet.Wpf.GitHub.ArchNeutral.csproj index d908eccc66c..e405e6d0690 100644 --- a/packaging/Microsoft.DotNet.Wpf.GitHub/Microsoft.DotNet.Wpf.GitHub.ArchNeutral.csproj +++ b/packaging/Microsoft.DotNet.Wpf.GitHub/Microsoft.DotNet.Wpf.GitHub.ArchNeutral.csproj @@ -1,7 +1,7 @@  9a7e395b-e859-40e2-809d-efb72cf3a2ee - netcoreapp3.0 + netcoreapp3.1 AnyCPU;x64 diff --git a/packaging/Microsoft.DotNet.Wpf.GitHub/Microsoft.DotNet.Wpf.GitHub.csproj b/packaging/Microsoft.DotNet.Wpf.GitHub/Microsoft.DotNet.Wpf.GitHub.csproj index 46d1b123c68..c6d38e93244 100644 --- a/packaging/Microsoft.DotNet.Wpf.GitHub/Microsoft.DotNet.Wpf.GitHub.csproj +++ b/packaging/Microsoft.DotNet.Wpf.GitHub/Microsoft.DotNet.Wpf.GitHub.csproj @@ -1,7 +1,7 @@  c847934a-828c-4ebb-a004-b0e97c8313f4 - netcoreapp3.0 + netcoreapp3.1 AnyCPU;x64 diff --git a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/Microsoft.DotNet.Wpf.ProjectTemplates.ArchNeutral.csproj b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/Microsoft.DotNet.Wpf.ProjectTemplates.ArchNeutral.csproj index 3049e925837..7170d81161b 100644 --- a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/Microsoft.DotNet.Wpf.ProjectTemplates.ArchNeutral.csproj +++ b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/Microsoft.DotNet.Wpf.ProjectTemplates.ArchNeutral.csproj @@ -1,10 +1,10 @@  {BFF6C118-3369-43B5-ACA6-D65ED00EEBE0} - netcoreapp3.0 + netcoreapp3.1 AnyCPU;x64 true - 3.0.0 + 3.1.0 diff --git a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfApplication-CSharp/.template.config/template.json b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfApplication-CSharp/.template.config/template.json index 7de4edc5be9..8e08744ef63 100644 --- a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfApplication-CSharp/.template.config/template.json +++ b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfApplication-CSharp/.template.config/template.json @@ -31,10 +31,14 @@ { "choice": "netcoreapp3.0", "description": "Target netcoreapp3.0" + }, + { + "choice": "netcoreapp3.1", + "description": "Target netcoreapp3.1" } ], - "replaces": "netcoreapp3.0", - "defaultValue": "netcoreapp3.0" + "replaces": "netcoreapp3.1", + "defaultValue": "netcoreapp3.1" }, "langVersion": { "type": "parameter", diff --git a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfApplication-CSharp/Company.WpfApplication1.csproj b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfApplication-CSharp/Company.WpfApplication1.csproj index 605a132abdf..259ceecd513 100644 --- a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfApplication-CSharp/Company.WpfApplication1.csproj +++ b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfApplication-CSharp/Company.WpfApplication1.csproj @@ -2,7 +2,7 @@ WinExe - netcoreapp3.0 + netcoreapp3.1 TargetFrameworkOverride Company.WpfApplication1 $(ProjectLanguageVersion) diff --git a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfApplication-VisualBasic/.template.config/template.json b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfApplication-VisualBasic/.template.config/template.json index d0697fd107c..99cddbeb39e 100644 --- a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfApplication-VisualBasic/.template.config/template.json +++ b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfApplication-VisualBasic/.template.config/template.json @@ -7,7 +7,7 @@ "description": "A project for creating a .NET Core WPF Application", "groupIdentity": "Microsoft.Common.WPF", "precedence": "3000", - "identity": "Microsoft.Common.WPF.VisualBasic.3.0", + "identity": "Microsoft.Common.WPF.VisualBasic.3.1", "shortName": "wpf", "tags": { "language": "VB", @@ -31,10 +31,14 @@ { "choice": "netcoreapp3.0", "description": "Target netcoreapp3.0" - } + }, + { + "choice": "netcoreapp3.1", + "description": "Target netcoreapp3.1" + } ], - "replaces": "netcoreapp3.0", - "defaultValue": "netcoreapp3.0" + "replaces": "netcoreapp3.1", + "defaultValue": "netcoreapp3.1" }, "langVersion": { "type": "parameter", diff --git a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfApplication-VisualBasic/Company.WpfApplication1.vbproj b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfApplication-VisualBasic/Company.WpfApplication1.vbproj index fce0f9c89af..844ca6f8412 100644 --- a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfApplication-VisualBasic/Company.WpfApplication1.vbproj +++ b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfApplication-VisualBasic/Company.WpfApplication1.vbproj @@ -2,7 +2,7 @@ WinExe - netcoreapp3.0 + netcoreapp3.1 TargetFrameworkOverride Company.WpfApplication1 $(ProjectLanguageVersion) diff --git a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfClassLibrary-CSharp/.template.config/template.json b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfClassLibrary-CSharp/.template.config/template.json index 59493288a3e..3f1e4720f23 100644 --- a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfClassLibrary-CSharp/.template.config/template.json +++ b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfClassLibrary-CSharp/.template.config/template.json @@ -7,7 +7,7 @@ "description": "A project for creating a class library that targets a .NET Core WPF Application", "groupIdentity": "Microsoft.Common.WPF.Library", "precedence": "3000", - "identity": "Microsoft.Common.WPF.Library.CSharp.3.0", + "identity": "Microsoft.Common.WPF.Library.CSharp.3.1", "shortName": "wpflib", "tags": { "language": "C#", @@ -31,10 +31,14 @@ { "choice": "netcoreapp3.0", "description": "Target netcoreapp3.0" - } + }, + { + "choice": "netcoreapp3.1", + "description": "Target netcoreapp3.1" + } ], - "replaces": "netcoreapp3.0", - "defaultValue": "netcoreapp3.0" + "replaces": "netcoreapp3.1", + "defaultValue": "netcoreapp3.1" }, "langVersion": { "type": "parameter", diff --git a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfClassLibrary-CSharp/Company.ClassLibrary1.csproj b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfClassLibrary-CSharp/Company.ClassLibrary1.csproj index 65ea6278ce5..75ff148fb32 100644 --- a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfClassLibrary-CSharp/Company.ClassLibrary1.csproj +++ b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfClassLibrary-CSharp/Company.ClassLibrary1.csproj @@ -1,7 +1,7 @@ - netcoreapp3.0 + netcoreapp3.1 TargetFrameworkOverride Company.ClassLibrary1 $(ProjectLanguageVersion) diff --git a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfClassLibrary-VisualBasic/.template.config/template.json b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfClassLibrary-VisualBasic/.template.config/template.json index 0d5d9b26320..e842ee2ea04 100644 --- a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfClassLibrary-VisualBasic/.template.config/template.json +++ b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfClassLibrary-VisualBasic/.template.config/template.json @@ -7,7 +7,7 @@ "description": "A project for creating a class library that targets a .NET Core WPF Application", "groupIdentity": "Microsoft.Common.WPF.Library", "precedence": "3000", - "identity": "Microsoft.Common.WPF.Library.VisualBasic.3.0", + "identity": "Microsoft.Common.WPF.Library.VisualBasic.3.1", "shortName": "wpflib", "tags": { "language": "VB", @@ -31,10 +31,14 @@ { "choice": "netcoreapp3.0", "description": "Target netcoreapp3.0" - } + }, + { + "choice": "netcoreapp3.1", + "description": "Target netcoreapp3.1" + } ], - "replaces": "netcoreapp3.0", - "defaultValue": "netcoreapp3.0" + "replaces": "netcoreapp3.1", + "defaultValue": "netcoreapp3.1" }, "langVersion": { "type": "parameter", diff --git a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfClassLibrary-VisualBasic/Company.ClassLibrary1.vbproj b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfClassLibrary-VisualBasic/Company.ClassLibrary1.vbproj index 5222ae5dcde..1fedf26c012 100644 --- a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfClassLibrary-VisualBasic/Company.ClassLibrary1.vbproj +++ b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfClassLibrary-VisualBasic/Company.ClassLibrary1.vbproj @@ -2,7 +2,7 @@ Company.ClassLibrary1 - netcoreapp3.0 + netcoreapp3.1 TargetFrameworkOverride Company.ClassLibrary1 $(ProjectLanguageVersion) diff --git a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfCustomControlLibrary-CSharp/.template.config/template.json b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfCustomControlLibrary-CSharp/.template.config/template.json index e0fbadfac7a..593189faf77 100644 --- a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfCustomControlLibrary-CSharp/.template.config/template.json +++ b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfCustomControlLibrary-CSharp/.template.config/template.json @@ -7,7 +7,7 @@ "description": "A project for creating a custom control library for .NET Core WPF Applications", "groupIdentity": "Microsoft.Common.WPF.CustomControl", "precedence": "3000", - "identity": "Microsoft.Common.WPF.CustomControl.CSharp.3.0", + "identity": "Microsoft.Common.WPF.CustomControl.CSharp.3.1", "shortName": "wpfcustomcontrollib", "tags": { "language": "C#", @@ -31,10 +31,14 @@ { "choice": "netcoreapp3.0", "description": "Target netcoreapp3.0" - } + }, + { + "choice": "netcoreapp3.1", + "description": "Target netcoreapp3.1" + } ], - "replaces": "netcoreapp3.0", - "defaultValue": "netcoreapp3.0" + "replaces": "netcoreapp3.1", + "defaultValue": "netcoreapp3.1" }, "langVersion": { "type": "parameter", diff --git a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfCustomControlLibrary-CSharp/Company.WpfCustomControlLibrary.csproj b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfCustomControlLibrary-CSharp/Company.WpfCustomControlLibrary.csproj index e01c8a1a755..6ed497b8554 100644 --- a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfCustomControlLibrary-CSharp/Company.WpfCustomControlLibrary.csproj +++ b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfCustomControlLibrary-CSharp/Company.WpfCustomControlLibrary.csproj @@ -1,7 +1,7 @@  - netcoreapp3.0 + netcoreapp3.1 TargetFrameworkOverride Company.WpfCustomControlLibrary $(ProjectLanguageVersion) diff --git a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfCustomControlLibrary-VisualBasic/.template.config/template.json b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfCustomControlLibrary-VisualBasic/.template.config/template.json index a9d1c4b8a0b..6a912186e0d 100644 --- a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfCustomControlLibrary-VisualBasic/.template.config/template.json +++ b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfCustomControlLibrary-VisualBasic/.template.config/template.json @@ -7,7 +7,7 @@ "description": "A project for creating a custom control library for .NET Core WPF Applications", "groupIdentity": "Microsoft.Common.WPF.CustomControl", "precedence": "3000", - "identity": "Microsoft.Common.WPF.CustomControl.VisualBasic.3.0", + "identity": "Microsoft.Common.WPF.CustomControl.VisualBasic.3.1", "shortName": "wpfcustomcontrollib", "tags": { "language": "VB", @@ -31,10 +31,14 @@ { "choice": "netcoreapp3.0", "description": "Target netcoreapp3.0" - } + }, + { + "choice": "netcoreapp3.1", + "description": "Target netcoreapp3.1" + } ], - "replaces": "netcoreapp3.0", - "defaultValue": "netcoreapp3.0" + "replaces": "netcoreapp3.1", + "defaultValue": "netcoreapp3.1" }, "langVersion": { "type": "parameter", diff --git a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfCustomControlLibrary-VisualBasic/Company.WpfCustomControlLibrary.vbproj b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfCustomControlLibrary-VisualBasic/Company.WpfCustomControlLibrary.vbproj index c8e6eb5a00b..b05675b0c3a 100644 --- a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfCustomControlLibrary-VisualBasic/Company.WpfCustomControlLibrary.vbproj +++ b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfCustomControlLibrary-VisualBasic/Company.WpfCustomControlLibrary.vbproj @@ -1,7 +1,7 @@  - netcoreapp3.0 + netcoreapp3.1 TargetFrameworkOverride Company.WpfCustomControlLibrary $(ProjectLanguageVersion) diff --git a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfUserControlLibrary-CSharp/.template.config/template.json b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfUserControlLibrary-CSharp/.template.config/template.json index bba6d5bafd4..02f14af0199 100644 --- a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfUserControlLibrary-CSharp/.template.config/template.json +++ b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfUserControlLibrary-CSharp/.template.config/template.json @@ -7,7 +7,7 @@ "description": "A project for creating a user control library for .NET Core WPF Applications", "groupIdentity": "Microsoft.Common.WPF.Control", "precedence": "3000", - "identity": "Microsoft.Common.WPF.Control.CSharp.3.0", + "identity": "Microsoft.Common.WPF.Control.CSharp.3.1", "shortName": "wpfusercontrollib", "tags": { "language": "C#", @@ -31,10 +31,14 @@ { "choice": "netcoreapp3.0", "description": "Target netcoreapp3.0" - } + }, + { + "choice": "netcoreapp3.1", + "description": "Target netcoreapp3.1" + } ], - "replaces": "netcoreapp3.0", - "defaultValue": "netcoreapp3.0" + "replaces": "netcoreapp3.1", + "defaultValue": "netcoreapp3.1" }, "langVersion": { "type": "parameter", diff --git a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfUserControlLibrary-CSharp/Company.WpfControlLibrary.csproj b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfUserControlLibrary-CSharp/Company.WpfControlLibrary.csproj index fc46449e179..5d9a64ade91 100644 --- a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfUserControlLibrary-CSharp/Company.WpfControlLibrary.csproj +++ b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfUserControlLibrary-CSharp/Company.WpfControlLibrary.csproj @@ -1,7 +1,7 @@  - netcoreapp3.0 + netcoreapp3.1 TargetFrameworkOverride Company.WpfControlLibrary $(ProjectLanguageVersion) diff --git a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfUserControlLibrary-VisualBasic/.template.config/template.json b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfUserControlLibrary-VisualBasic/.template.config/template.json index b1553d1f87c..c454f15fda4 100644 --- a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfUserControlLibrary-VisualBasic/.template.config/template.json +++ b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfUserControlLibrary-VisualBasic/.template.config/template.json @@ -7,7 +7,7 @@ "description": "A project for creating a user control library for .NET Core WPF Applications", "groupIdentity": "Microsoft.Common.WPF.Control", "precedence": "3000", - "identity": "Microsoft.Common.WPF.Control.VisualBasic.3.0", + "identity": "Microsoft.Common.WPF.Control.VisualBasic.3.1", "shortName": "wpfusercontrollib", "tags": { "language": "VB", @@ -31,10 +31,14 @@ { "choice": "netcoreapp3.0", "description": "Target netcoreapp3.0" - } + }, + { + "choice": "netcoreapp3.1", + "description": "Target netcoreapp3.1" + } ], - "replaces": "netcoreapp3.0", - "defaultValue": "netcoreapp3.0" + "replaces": "netcoreapp3.1", + "defaultValue": "netcoreapp3.1" }, "langVersion": { "type": "parameter", diff --git a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfUserControlLibrary-VisualBasic/Company.WpfControlLibrary.vbproj b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfUserControlLibrary-VisualBasic/Company.WpfControlLibrary.vbproj index e90867c207e..a5edc69accb 100644 --- a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfUserControlLibrary-VisualBasic/Company.WpfControlLibrary.vbproj +++ b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfUserControlLibrary-VisualBasic/Company.WpfControlLibrary.vbproj @@ -1,7 +1,7 @@  - netcoreapp3.0 + netcoreapp3.1 TargetFrameworkOverride Company.WpfControlLibrary $(ProjectLanguageVersion) diff --git a/packaging/Microsoft.NET.Sdk.WindowsDesktop/Microsoft.NET.Sdk.WindowsDesktop.ArchNeutral.csproj b/packaging/Microsoft.NET.Sdk.WindowsDesktop/Microsoft.NET.Sdk.WindowsDesktop.ArchNeutral.csproj index 9ff025d8cee..28ff1c5c704 100644 --- a/packaging/Microsoft.NET.Sdk.WindowsDesktop/Microsoft.NET.Sdk.WindowsDesktop.ArchNeutral.csproj +++ b/packaging/Microsoft.NET.Sdk.WindowsDesktop/Microsoft.NET.Sdk.WindowsDesktop.ArchNeutral.csproj @@ -1,10 +1,10 @@  {440d06b8-e3de-4c0d-ad25-cd4f43d836e1} - netcoreapp3.0 + netcoreapp3.1 AnyCPU;x64 true - 3.0.0 + 3.1.0 diff --git a/src/Microsoft.DotNet.Wpf/cycle-breakers/PresentationFramework/PresentationFramework-PresentationUI-api-cycle.csproj b/src/Microsoft.DotNet.Wpf/cycle-breakers/PresentationFramework/PresentationFramework-PresentationUI-api-cycle.csproj index c46dac96075..b91c8a951fa 100644 --- a/src/Microsoft.DotNet.Wpf/cycle-breakers/PresentationFramework/PresentationFramework-PresentationUI-api-cycle.csproj +++ b/src/Microsoft.DotNet.Wpf/cycle-breakers/PresentationFramework/PresentationFramework-PresentationUI-api-cycle.csproj @@ -10,7 +10,7 @@ - netcoreapp3.0 + netcoreapp3.1 false diff --git a/src/Microsoft.DotNet.Wpf/cycle-breakers/PresentationFramework/PresentationFramework-ReachFramework-impl-cycle.csproj b/src/Microsoft.DotNet.Wpf/cycle-breakers/PresentationFramework/PresentationFramework-ReachFramework-impl-cycle.csproj index 879efd82be3..825164252ca 100644 --- a/src/Microsoft.DotNet.Wpf/cycle-breakers/PresentationFramework/PresentationFramework-ReachFramework-impl-cycle.csproj +++ b/src/Microsoft.DotNet.Wpf/cycle-breakers/PresentationFramework/PresentationFramework-ReachFramework-impl-cycle.csproj @@ -13,7 +13,7 @@ - netcoreapp3.0 + netcoreapp3.1 false diff --git a/src/Microsoft.DotNet.Wpf/cycle-breakers/PresentationFramework/PresentationFramework-System.Printing-api-cycle.csproj b/src/Microsoft.DotNet.Wpf/cycle-breakers/PresentationFramework/PresentationFramework-System.Printing-api-cycle.csproj index dd645037801..661a7e70163 100644 --- a/src/Microsoft.DotNet.Wpf/cycle-breakers/PresentationFramework/PresentationFramework-System.Printing-api-cycle.csproj +++ b/src/Microsoft.DotNet.Wpf/cycle-breakers/PresentationFramework/PresentationFramework-System.Printing-api-cycle.csproj @@ -11,7 +11,7 @@ - netcoreapp3.0 + netcoreapp3.1 false diff --git a/src/Microsoft.DotNet.Wpf/cycle-breakers/PresentationFramework/PresentationFramework-System.Printing-impl-cycle.csproj b/src/Microsoft.DotNet.Wpf/cycle-breakers/PresentationFramework/PresentationFramework-System.Printing-impl-cycle.csproj index 9b6c8d2c9e3..326a3c5bb29 100644 --- a/src/Microsoft.DotNet.Wpf/cycle-breakers/PresentationFramework/PresentationFramework-System.Printing-impl-cycle.csproj +++ b/src/Microsoft.DotNet.Wpf/cycle-breakers/PresentationFramework/PresentationFramework-System.Printing-impl-cycle.csproj @@ -13,7 +13,7 @@ - netcoreapp3.0 + netcoreapp3.1 false diff --git a/src/Microsoft.DotNet.Wpf/cycle-breakers/PresentationUI/PresentationUI-PresentationFramework-impl-cycle.csproj b/src/Microsoft.DotNet.Wpf/cycle-breakers/PresentationUI/PresentationUI-PresentationFramework-impl-cycle.csproj index 4fe9c0cf899..6cb86624a83 100644 --- a/src/Microsoft.DotNet.Wpf/cycle-breakers/PresentationUI/PresentationUI-PresentationFramework-impl-cycle.csproj +++ b/src/Microsoft.DotNet.Wpf/cycle-breakers/PresentationUI/PresentationUI-PresentationFramework-impl-cycle.csproj @@ -12,7 +12,7 @@ - netcoreapp3.0 + netcoreapp3.1 false diff --git a/src/Microsoft.DotNet.Wpf/cycle-breakers/ReachFramework/ReachFramework-PresentationFramework-api-cycle.csproj b/src/Microsoft.DotNet.Wpf/cycle-breakers/ReachFramework/ReachFramework-PresentationFramework-api-cycle.csproj index 1cde2597520..fbd15b8f7e2 100644 --- a/src/Microsoft.DotNet.Wpf/cycle-breakers/ReachFramework/ReachFramework-PresentationFramework-api-cycle.csproj +++ b/src/Microsoft.DotNet.Wpf/cycle-breakers/ReachFramework/ReachFramework-PresentationFramework-api-cycle.csproj @@ -10,7 +10,7 @@ - netcoreapp3.0 + netcoreapp3.1 false diff --git a/src/Microsoft.DotNet.Wpf/cycle-breakers/ReachFramework/ReachFramework-System.Printing-api-cycle.csproj b/src/Microsoft.DotNet.Wpf/cycle-breakers/ReachFramework/ReachFramework-System.Printing-api-cycle.csproj index 64c365841cd..0dff55bd0ec 100644 --- a/src/Microsoft.DotNet.Wpf/cycle-breakers/ReachFramework/ReachFramework-System.Printing-api-cycle.csproj +++ b/src/Microsoft.DotNet.Wpf/cycle-breakers/ReachFramework/ReachFramework-System.Printing-api-cycle.csproj @@ -10,7 +10,7 @@ - netcoreapp3.0 + netcoreapp3.1 false diff --git a/src/Microsoft.DotNet.Wpf/cycle-breakers/System.Printing/System.Printing-PresentationFramework-api-cycle.csproj b/src/Microsoft.DotNet.Wpf/cycle-breakers/System.Printing/System.Printing-PresentationFramework-api-cycle.csproj index b122a3181fa..d9e69581a7a 100644 --- a/src/Microsoft.DotNet.Wpf/cycle-breakers/System.Printing/System.Printing-PresentationFramework-api-cycle.csproj +++ b/src/Microsoft.DotNet.Wpf/cycle-breakers/System.Printing/System.Printing-PresentationFramework-api-cycle.csproj @@ -10,7 +10,7 @@ - netcoreapp3.0 + netcoreapp3.1 false diff --git a/src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/DirectWriteForwarder.vcxproj b/src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/DirectWriteForwarder.vcxproj index a152ce23e40..45a4d1e7803 100644 --- a/src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/DirectWriteForwarder.vcxproj +++ b/src/Microsoft.DotNet.Wpf/src/DirectWriteForwarder/DirectWriteForwarder.vcxproj @@ -27,9 +27,9 @@ - - netcoreapp3.0 + netcoreapp3.1 .NETCoreApp + v3.1 diff --git a/src/Microsoft.DotNet.Wpf/src/Extensions/PresentationFramework-SystemCore/PresentationFramework-SystemCore.csproj b/src/Microsoft.DotNet.Wpf/src/Extensions/PresentationFramework-SystemCore/PresentationFramework-SystemCore.csproj index ae90fb22271..d74129c1ae3 100644 --- a/src/Microsoft.DotNet.Wpf/src/Extensions/PresentationFramework-SystemCore/PresentationFramework-SystemCore.csproj +++ b/src/Microsoft.DotNet.Wpf/src/Extensions/PresentationFramework-SystemCore/PresentationFramework-SystemCore.csproj @@ -1,6 +1,6 @@  - netcoreapp3.0 + netcoreapp3.1 AnyCPU;x64 false false diff --git a/src/Microsoft.DotNet.Wpf/src/Extensions/PresentationFramework-SystemData/PresentationFramework-SystemData.csproj b/src/Microsoft.DotNet.Wpf/src/Extensions/PresentationFramework-SystemData/PresentationFramework-SystemData.csproj index fca66dfba37..b130cd99203 100644 --- a/src/Microsoft.DotNet.Wpf/src/Extensions/PresentationFramework-SystemData/PresentationFramework-SystemData.csproj +++ b/src/Microsoft.DotNet.Wpf/src/Extensions/PresentationFramework-SystemData/PresentationFramework-SystemData.csproj @@ -1,6 +1,6 @@  - netcoreapp3.0 + netcoreapp3.1 AnyCPU;x64 false false diff --git a/src/Microsoft.DotNet.Wpf/src/Extensions/PresentationFramework-SystemDrawing/PresentationFramework-SystemDrawing.csproj b/src/Microsoft.DotNet.Wpf/src/Extensions/PresentationFramework-SystemDrawing/PresentationFramework-SystemDrawing.csproj index 6b6616680ab..56f2e8ba9ab 100644 --- a/src/Microsoft.DotNet.Wpf/src/Extensions/PresentationFramework-SystemDrawing/PresentationFramework-SystemDrawing.csproj +++ b/src/Microsoft.DotNet.Wpf/src/Extensions/PresentationFramework-SystemDrawing/PresentationFramework-SystemDrawing.csproj @@ -1,6 +1,6 @@  - netcoreapp3.0 + netcoreapp3.1 AnyCPU;x64 false false diff --git a/src/Microsoft.DotNet.Wpf/src/Extensions/PresentationFramework-SystemXml/PresentationFramework-SystemXml.csproj b/src/Microsoft.DotNet.Wpf/src/Extensions/PresentationFramework-SystemXml/PresentationFramework-SystemXml.csproj index 63b23198ed4..2ea28f37c63 100644 --- a/src/Microsoft.DotNet.Wpf/src/Extensions/PresentationFramework-SystemXml/PresentationFramework-SystemXml.csproj +++ b/src/Microsoft.DotNet.Wpf/src/Extensions/PresentationFramework-SystemXml/PresentationFramework-SystemXml.csproj @@ -1,6 +1,6 @@  - netcoreapp3.0 + netcoreapp3.1 AnyCPU;x64 false false diff --git a/src/Microsoft.DotNet.Wpf/src/Extensions/PresentationFramework-SystemXmlLinq/PresentationFramework-SystemXmlLinq.csproj b/src/Microsoft.DotNet.Wpf/src/Extensions/PresentationFramework-SystemXmlLinq/PresentationFramework-SystemXmlLinq.csproj index 922c1cfd2b5..dd7442553e6 100644 --- a/src/Microsoft.DotNet.Wpf/src/Extensions/PresentationFramework-SystemXmlLinq/PresentationFramework-SystemXmlLinq.csproj +++ b/src/Microsoft.DotNet.Wpf/src/Extensions/PresentationFramework-SystemXmlLinq/PresentationFramework-SystemXmlLinq.csproj @@ -1,6 +1,6 @@  - netcoreapp3.0 + netcoreapp3.1 AnyCPU;x64 false false diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/PresentationCore.csproj b/src/Microsoft.DotNet.Wpf/src/PresentationCore/PresentationCore.csproj index c01546b7fe3..2207505cef1 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/PresentationCore.csproj +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/PresentationCore.csproj @@ -13,7 +13,7 @@ - netcoreapp3.0 + netcoreapp3.1 false diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/ref/PresentationCore-ref.csproj b/src/Microsoft.DotNet.Wpf/src/PresentationCore/ref/PresentationCore-ref.csproj index 73dcdc1175f..cec007893bf 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/ref/PresentationCore-ref.csproj +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/ref/PresentationCore-ref.csproj @@ -11,7 +11,7 @@ MS.Internal.PresentationCore None AnyCPU;x64 - netcoreapp3.0 + netcoreapp3.1 diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/PresentationFramework.csproj b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/PresentationFramework.csproj index 11a38c78048..42007b1fc43 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/PresentationFramework.csproj +++ b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/PresentationFramework.csproj @@ -12,7 +12,7 @@ - netcoreapp3.0 + netcoreapp3.1 false diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/ref/PresentationFramework-ref.csproj b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/ref/PresentationFramework-ref.csproj index c8d3e701836..8951cf51c62 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/ref/PresentationFramework-ref.csproj +++ b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/ref/PresentationFramework-ref.csproj @@ -11,7 +11,7 @@ None AnyCPU;x64 false - netcoreapp3.0 + netcoreapp3.1 diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationUI/PresentationUI.csproj b/src/Microsoft.DotNet.Wpf/src/PresentationUI/PresentationUI.csproj index 032075f6949..6df095d4764 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationUI/PresentationUI.csproj +++ b/src/Microsoft.DotNet.Wpf/src/PresentationUI/PresentationUI.csproj @@ -2,7 +2,7 @@ - netcoreapp3.0 + netcoreapp3.1 AnyCPU;x64 false @@ -222,6 +222,7 @@ + - netcoreapp3.0 + netcoreapp3.1 .NETCoreApp + v3.1 diff --git a/src/Microsoft.DotNet.Wpf/src/System.Printing/ref/System.Printing-ref.csproj b/src/Microsoft.DotNet.Wpf/src/System.Printing/ref/System.Printing-ref.csproj index a0d92a2a7e1..fda32172884 100644 --- a/src/Microsoft.DotNet.Wpf/src/System.Printing/ref/System.Printing-ref.csproj +++ b/src/Microsoft.DotNet.Wpf/src/System.Printing/ref/System.Printing-ref.csproj @@ -10,7 +10,7 @@ - netcoreapp3.0 + netcoreapp3.1 false diff --git a/src/Microsoft.DotNet.Wpf/src/System.Windows.Controls.Ribbon/System.Windows.Controls.Ribbon.csproj b/src/Microsoft.DotNet.Wpf/src/System.Windows.Controls.Ribbon/System.Windows.Controls.Ribbon.csproj index 63112772439..aeba6b7d741 100644 --- a/src/Microsoft.DotNet.Wpf/src/System.Windows.Controls.Ribbon/System.Windows.Controls.Ribbon.csproj +++ b/src/Microsoft.DotNet.Wpf/src/System.Windows.Controls.Ribbon/System.Windows.Controls.Ribbon.csproj @@ -2,7 +2,7 @@ - netcoreapp3.0 + netcoreapp3.1 AnyCPU;x64 false $(DefineConstants);RIBBON_IN_FRAMEWORK diff --git a/src/Microsoft.DotNet.Wpf/src/System.Windows.Controls.Ribbon/ref/System.Windows.Controls.Ribbon-ref.csproj b/src/Microsoft.DotNet.Wpf/src/System.Windows.Controls.Ribbon/ref/System.Windows.Controls.Ribbon-ref.csproj index 91a7a7afeeb..b67c3d9fb46 100644 --- a/src/Microsoft.DotNet.Wpf/src/System.Windows.Controls.Ribbon/ref/System.Windows.Controls.Ribbon-ref.csproj +++ b/src/Microsoft.DotNet.Wpf/src/System.Windows.Controls.Ribbon/ref/System.Windows.Controls.Ribbon-ref.csproj @@ -4,7 +4,7 @@ System.Windows.Controls.Ribbon System.Windows.Controls.Ribbon-ref $(TargetGroup)-$(PackageId)/ - netcoreapp3.0 + netcoreapp3.1 AnyCPU;x64 $(DefineConstants);RIBBON_IN_FRAMEWORK $(NoWarn);0618 diff --git a/src/Microsoft.DotNet.Wpf/src/System.Windows.Input.Manipulations/System.Windows.Input.Manipulations.csproj b/src/Microsoft.DotNet.Wpf/src/System.Windows.Input.Manipulations/System.Windows.Input.Manipulations.csproj index cad812beaca..86da9d5d804 100644 --- a/src/Microsoft.DotNet.Wpf/src/System.Windows.Input.Manipulations/System.Windows.Input.Manipulations.csproj +++ b/src/Microsoft.DotNet.Wpf/src/System.Windows.Input.Manipulations/System.Windows.Input.Manipulations.csproj @@ -1,6 +1,6 @@  - netcoreapp3.0 + netcoreapp3.1 false AnyCPU;x64 diff --git a/src/Microsoft.DotNet.Wpf/src/System.Windows.Input.Manipulations/ref/System.Windows.Input.Manipulations-ref.csproj b/src/Microsoft.DotNet.Wpf/src/System.Windows.Input.Manipulations/ref/System.Windows.Input.Manipulations-ref.csproj index dfcb8b174fc..cb0614c1603 100644 --- a/src/Microsoft.DotNet.Wpf/src/System.Windows.Input.Manipulations/ref/System.Windows.Input.Manipulations-ref.csproj +++ b/src/Microsoft.DotNet.Wpf/src/System.Windows.Input.Manipulations/ref/System.Windows.Input.Manipulations-ref.csproj @@ -3,7 +3,7 @@ System.Windows.Input.Manipulations System.Windows.Input.Manipulations-ref $(TargetGroup)-$(PackageId)/ - netcoreapp3.0 + netcoreapp3.1 AnyCPU;x64 diff --git a/src/Microsoft.DotNet.Wpf/src/System.Windows.Presentation/System.Windows.Presentation.csproj b/src/Microsoft.DotNet.Wpf/src/System.Windows.Presentation/System.Windows.Presentation.csproj index c29c3a78fc6..f46a3018065 100644 --- a/src/Microsoft.DotNet.Wpf/src/System.Windows.Presentation/System.Windows.Presentation.csproj +++ b/src/Microsoft.DotNet.Wpf/src/System.Windows.Presentation/System.Windows.Presentation.csproj @@ -1,6 +1,6 @@  - netcoreapp3.0 + netcoreapp3.1 AnyCPU;x64 false false diff --git a/src/Microsoft.DotNet.Wpf/src/System.Windows.Presentation/ref/System.Windows.Presentation-ref.csproj b/src/Microsoft.DotNet.Wpf/src/System.Windows.Presentation/ref/System.Windows.Presentation-ref.csproj index 39e70697b1c..f7925a39a70 100644 --- a/src/Microsoft.DotNet.Wpf/src/System.Windows.Presentation/ref/System.Windows.Presentation-ref.csproj +++ b/src/Microsoft.DotNet.Wpf/src/System.Windows.Presentation/ref/System.Windows.Presentation-ref.csproj @@ -3,7 +3,7 @@ System.Windows.Presentation System.Windows.Presentation-ref $(TargetGroup)-$(PackageId)/ - netcoreapp3.0 + netcoreapp3.1 AnyCPU;x64 false diff --git a/src/Microsoft.DotNet.Wpf/src/System.Xaml/System.Xaml.csproj b/src/Microsoft.DotNet.Wpf/src/System.Xaml/System.Xaml.csproj index cf991d26a39..9dd0349dc70 100644 --- a/src/Microsoft.DotNet.Wpf/src/System.Xaml/System.Xaml.csproj +++ b/src/Microsoft.DotNet.Wpf/src/System.Xaml/System.Xaml.csproj @@ -2,7 +2,7 @@ {9AC36357-34B7-40A1-95CA-FE9F46D089A7} System.Xaml - netcoreapp3.0 + netcoreapp3.1 AnyCPU;x64 $(NoWarn);0618;NU5125;0618 $(DefineConstants);OLDRESOURCES;SYSTEM_XAML diff --git a/src/Microsoft.DotNet.Wpf/src/System.Xaml/ref/System.Xaml-ref.csproj b/src/Microsoft.DotNet.Wpf/src/System.Xaml/ref/System.Xaml-ref.csproj index 637e4ca0dc2..0fcb69c7e4a 100644 --- a/src/Microsoft.DotNet.Wpf/src/System.Xaml/ref/System.Xaml-ref.csproj +++ b/src/Microsoft.DotNet.Wpf/src/System.Xaml/ref/System.Xaml-ref.csproj @@ -3,7 +3,7 @@ System.Xaml System.Xaml-ref $(TargetGroup)-$(PackageId)/ - netcoreapp3.0 + netcoreapp3.1 AnyCPU;x64 $(NoWarn);0618;NU5125;0618 $(DefineConstants);OLDRESOURCES;SYSTEM_XAML diff --git a/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Aero/PresentationFramework.Aero.csproj b/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Aero/PresentationFramework.Aero.csproj index 0649c381b6c..385988d8908 100644 --- a/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Aero/PresentationFramework.Aero.csproj +++ b/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Aero/PresentationFramework.Aero.csproj @@ -3,7 +3,7 @@ - netcoreapp3.0 + netcoreapp3.1 None AnyCPU;x64 false diff --git a/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Aero/ref/PresentationFramework.Aero-ref.csproj b/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Aero/ref/PresentationFramework.Aero-ref.csproj index d10a09dbfa1..7a418dce0ce 100644 --- a/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Aero/ref/PresentationFramework.Aero-ref.csproj +++ b/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Aero/ref/PresentationFramework.Aero-ref.csproj @@ -5,7 +5,7 @@ PresentationFramework.Aero PresentationFramework.Aero-ref $(TargetGroup)-$(PackageId)/ - netcoreapp3.0 + netcoreapp3.1 None AnyCPU;x64 false diff --git a/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Aero2/PresentationFramework.Aero2.csproj b/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Aero2/PresentationFramework.Aero2.csproj index f4dd676b2a4..93d1cc129e2 100644 --- a/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Aero2/PresentationFramework.Aero2.csproj +++ b/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Aero2/PresentationFramework.Aero2.csproj @@ -3,7 +3,7 @@ - netcoreapp3.0 + netcoreapp3.1 None AnyCPU;x64 false diff --git a/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Aero2/ref/PresentationFramework.Aero2-ref.csproj b/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Aero2/ref/PresentationFramework.Aero2-ref.csproj index c9e737ff831..4a6779d3812 100644 --- a/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Aero2/ref/PresentationFramework.Aero2-ref.csproj +++ b/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Aero2/ref/PresentationFramework.Aero2-ref.csproj @@ -5,7 +5,7 @@ PresentationFramework.Aero2 PresentationFramework.Aero2-ref $(TargetGroup)-$(PackageId)/ - netcoreapp3.0 + netcoreapp3.1 None AnyCPU;x64 false diff --git a/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.AeroLite/PresentationFramework.AeroLite.csproj b/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.AeroLite/PresentationFramework.AeroLite.csproj index 6ca129e39d3..a7c2a669ce6 100644 --- a/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.AeroLite/PresentationFramework.AeroLite.csproj +++ b/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.AeroLite/PresentationFramework.AeroLite.csproj @@ -3,7 +3,7 @@ - netcoreapp3.0 + netcoreapp3.1 None AnyCPU;x64 false diff --git a/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.AeroLite/ref/PresentationFramework.AeroLite-ref.csproj b/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.AeroLite/ref/PresentationFramework.AeroLite-ref.csproj index 04b2056feab..ff52b26042e 100644 --- a/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.AeroLite/ref/PresentationFramework.AeroLite-ref.csproj +++ b/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.AeroLite/ref/PresentationFramework.AeroLite-ref.csproj @@ -5,7 +5,7 @@ PresentationFramework.AeroLite PresentationFramework.AeroLite-ref $(TargetGroup)-$(PackageId)/ - netcoreapp3.0 + netcoreapp3.1 None AnyCPU;x64 false diff --git a/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Classic/PresentationFramework.Classic.csproj b/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Classic/PresentationFramework.Classic.csproj index 17bee77fe98..aa833a2152c 100644 --- a/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Classic/PresentationFramework.Classic.csproj +++ b/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Classic/PresentationFramework.Classic.csproj @@ -3,7 +3,7 @@ - netcoreapp3.0 + netcoreapp3.1 None AnyCPU;x64 false diff --git a/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Classic/ref/PresentationFramework.Classic-ref.csproj b/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Classic/ref/PresentationFramework.Classic-ref.csproj index a7089b72649..68776516e5e 100644 --- a/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Classic/ref/PresentationFramework.Classic-ref.csproj +++ b/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Classic/ref/PresentationFramework.Classic-ref.csproj @@ -5,7 +5,7 @@ PresentationFramework.Classic PresentationFramework.Classic-ref $(TargetGroup)-$(PackageId)/ - netcoreapp3.0 + netcoreapp3.1 None AnyCPU;x64 false diff --git a/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Luna/PresentationFramework.Luna.csproj b/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Luna/PresentationFramework.Luna.csproj index 6a0e5663775..b746c5264ac 100644 --- a/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Luna/PresentationFramework.Luna.csproj +++ b/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Luna/PresentationFramework.Luna.csproj @@ -3,7 +3,7 @@ - netcoreapp3.0 + netcoreapp3.1 None AnyCPU;x64 false diff --git a/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Luna/ref/PresentationFramework.Luna-ref.csproj b/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Luna/ref/PresentationFramework.Luna-ref.csproj index c57a57f01a7..605aded8d93 100644 --- a/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Luna/ref/PresentationFramework.Luna-ref.csproj +++ b/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Luna/ref/PresentationFramework.Luna-ref.csproj @@ -5,7 +5,7 @@ PresentationFramework.Luna PresentationFramework.Luna-ref $(TargetGroup)-$(PackageId)/ - netcoreapp3.0 + netcoreapp3.1 None AnyCPU;x64 false diff --git a/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Royale/PresentationFramework.Royale.csproj b/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Royale/PresentationFramework.Royale.csproj index f0e2aaf48cc..41b7358e707 100644 --- a/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Royale/PresentationFramework.Royale.csproj +++ b/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Royale/PresentationFramework.Royale.csproj @@ -3,7 +3,7 @@ - netcoreapp3.0 + netcoreapp3.1 None AnyCPU;x64 false diff --git a/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Royale/ref/PresentationFramework.Royale-ref.csproj b/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Royale/ref/PresentationFramework.Royale-ref.csproj index 929270b4cd6..d72380c475c 100644 --- a/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Royale/ref/PresentationFramework.Royale-ref.csproj +++ b/src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Royale/ref/PresentationFramework.Royale-ref.csproj @@ -5,7 +5,7 @@ PresentationFramework.Royale PresentationFramework.Royale-ref $(TargetGroup)-$(PackageId)/ - netcoreapp3.0 + netcoreapp3.1 None AnyCPU;x64 false diff --git a/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/UIAutomationClient.csproj b/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/UIAutomationClient.csproj index 5cbf4a564d9..7d2fa009a1d 100644 --- a/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/UIAutomationClient.csproj +++ b/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/UIAutomationClient.csproj @@ -7,7 +7,7 @@ $(NoWarn);0618;CA1821 - netcoreapp3.0 + netcoreapp3.1 false false diff --git a/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/ref/UIAutomationClient-ref.csproj b/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/ref/UIAutomationClient-ref.csproj index 4fa610d41cc..17fa3a40d1f 100644 --- a/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/ref/UIAutomationClient-ref.csproj +++ b/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/ref/UIAutomationClient-ref.csproj @@ -7,7 +7,7 @@ true $(DefineConstants);UIAUTOMATIONCLIENT $(NoWarn);0618;CA1821 - netcoreapp3.0 + netcoreapp3.1 false diff --git a/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClientSideProviders/UIAutomationClientSideProviders.csproj b/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClientSideProviders/UIAutomationClientSideProviders.csproj index 419e7001702..b003248f812 100644 --- a/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClientSideProviders/UIAutomationClientSideProviders.csproj +++ b/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClientSideProviders/UIAutomationClientSideProviders.csproj @@ -7,7 +7,7 @@ true - netcoreapp3.0 + netcoreapp3.1 false false diff --git a/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClientSideProviders/ref/UIAutomationClientSideProviders-ref.csproj b/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClientSideProviders/ref/UIAutomationClientSideProviders-ref.csproj index dd65b688744..78295bbff07 100644 --- a/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClientSideProviders/ref/UIAutomationClientSideProviders-ref.csproj +++ b/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClientSideProviders/ref/UIAutomationClientSideProviders-ref.csproj @@ -7,7 +7,7 @@ $(DefineConstants);UIAUTOMATIONCLIENTSIDEPROVIDERS $(NoWarn);0618 true - netcoreapp3.0 + netcoreapp3.1 false diff --git a/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationProvider/UIAutomationProvider.csproj b/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationProvider/UIAutomationProvider.csproj index dcc2ca6a212..7417b149b51 100644 --- a/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationProvider/UIAutomationProvider.csproj +++ b/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationProvider/UIAutomationProvider.csproj @@ -9,7 +9,7 @@ - netcoreapp3.0 + netcoreapp3.1 false diff --git a/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationProvider/ref/UIAutomationProvider-ref.csproj b/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationProvider/ref/UIAutomationProvider-ref.csproj index 68544cffb2e..5bc8368895c 100644 --- a/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationProvider/ref/UIAutomationProvider-ref.csproj +++ b/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationProvider/ref/UIAutomationProvider-ref.csproj @@ -9,7 +9,7 @@ MS.Internal.Automation SRID AnyCPU;x64 - netcoreapp3.0 + netcoreapp3.1 diff --git a/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationTypes/UIAutomationTypes.csproj b/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationTypes/UIAutomationTypes.csproj index e692e42ea86..96eb4a6b2e5 100644 --- a/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationTypes/UIAutomationTypes.csproj +++ b/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationTypes/UIAutomationTypes.csproj @@ -9,7 +9,7 @@ - netcoreapp3.0 + netcoreapp3.1 false diff --git a/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationTypes/ref/UIAutomationTypes-ref.csproj b/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationTypes/ref/UIAutomationTypes-ref.csproj index a620c77dc86..fbbaa8e1370 100644 --- a/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationTypes/ref/UIAutomationTypes-ref.csproj +++ b/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationTypes/ref/UIAutomationTypes-ref.csproj @@ -7,7 +7,7 @@ $(DefineConstants);UIAUTOMATIONTYPES $(NoWarn);0618 false - netcoreapp3.0 + netcoreapp3.1 AnyCPU;x64 diff --git a/src/Microsoft.DotNet.Wpf/src/WindowsBase/WindowsBase.csproj b/src/Microsoft.DotNet.Wpf/src/WindowsBase/WindowsBase.csproj index 871caa101d6..f3cab56604a 100644 --- a/src/Microsoft.DotNet.Wpf/src/WindowsBase/WindowsBase.csproj +++ b/src/Microsoft.DotNet.Wpf/src/WindowsBase/WindowsBase.csproj @@ -7,7 +7,7 @@ $(NoWarn);0618 false {FA69991B-9696-42D0-A5C7-F5E73F0DEE9E} - netcoreapp3.0 + netcoreapp3.1 AnyCPU;x64 diff --git a/src/Microsoft.DotNet.Wpf/src/WindowsBase/ref/WindowsBase-ref.csproj b/src/Microsoft.DotNet.Wpf/src/WindowsBase/ref/WindowsBase-ref.csproj index 43a890dea5b..4ae29b1aea4 100644 --- a/src/Microsoft.DotNet.Wpf/src/WindowsBase/ref/WindowsBase-ref.csproj +++ b/src/Microsoft.DotNet.Wpf/src/WindowsBase/ref/WindowsBase-ref.csproj @@ -7,7 +7,7 @@ $(DefineConstants);WeakEventTelemetry $(NoWarn);0618 false - netcoreapp3.0 + netcoreapp3.1 AnyCPU;x64 diff --git a/src/Microsoft.DotNet.Wpf/src/WindowsFormsIntegration/WindowsFormsIntegration.csproj b/src/Microsoft.DotNet.Wpf/src/WindowsFormsIntegration/WindowsFormsIntegration.csproj index 2e6d8365d24..e531c3490dd 100644 --- a/src/Microsoft.DotNet.Wpf/src/WindowsFormsIntegration/WindowsFormsIntegration.csproj +++ b/src/Microsoft.DotNet.Wpf/src/WindowsFormsIntegration/WindowsFormsIntegration.csproj @@ -6,7 +6,7 @@ None - netcoreapp3.0 + netcoreapp3.1 false false diff --git a/src/Microsoft.DotNet.Wpf/src/WindowsFormsIntegration/ref/WindowsFormsIntegration-ref.csproj b/src/Microsoft.DotNet.Wpf/src/WindowsFormsIntegration/ref/WindowsFormsIntegration-ref.csproj index 59f0e0e4a0e..d58d7a8c6cd 100644 --- a/src/Microsoft.DotNet.Wpf/src/WindowsFormsIntegration/ref/WindowsFormsIntegration-ref.csproj +++ b/src/Microsoft.DotNet.Wpf/src/WindowsFormsIntegration/ref/WindowsFormsIntegration-ref.csproj @@ -7,7 +7,7 @@ $(DefineConstants);WINDOWSFORMSINTEGRATION $(NoWarn);0618 None - netcoreapp3.0 + netcoreapp3.1 false diff --git a/src/Microsoft.DotNet.Wpf/test/MultiTargeting.props b/src/Microsoft.DotNet.Wpf/test/MultiTargeting.props index f2482461c39..9186ff4663e 100644 --- a/src/Microsoft.DotNet.Wpf/test/MultiTargeting.props +++ b/src/Microsoft.DotNet.Wpf/test/MultiTargeting.props @@ -1,6 +1,6 @@ - netcoreapp3.0 + netcoreapp3.1 @@ -20,6 +20,8 @@ $(DefineConstants);NET472 $(DefineConstants);NETCOREAPP3_0 + $(DefineConstants);NETCOREAPP3_1 + @@ -62,4 +64,4 @@ - \ No newline at end of file +