From c8b661e46fe28214207c2e673b832aa9e9f0e96e Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Tue, 1 Aug 2023 15:17:00 +0200 Subject: [PATCH 1/4] Remove dead code from wcf repository - .gitmirrorall, DotnetCLIVersion.txt, _._, harvest.targets, Configurations.props, archgroups.props, configurationgroups.props, DefaultGenApiDocIds.txt, LicenseHeader.txt, osgroups.props, properties.props, TargetFramework.props, Configurations.props and targetgroups.props were all used by dotnet/buildtools tooling that has been removed more than five years ago from this repository. - uwp.targets, Publishing.props aren't used anymore (Publishing.props isn't necessary anymore as Arcade defaults to version 3). - build.ps1/build.sh code was copied from runtime and doesn't apply to this repository. - project files: IsBuilding, IsHarvesting are dead properties. PackageReference to Microsoft.NETFramework.ReferenceAssemblies is added automatically by the SDK. Use EnableDefaultItems=false instead of removing Compile items and resources. Remove outdated comment. --- .gitmirrorall | 1 - DotnetCLIVersion.txt | 1 - eng/BlockReflectionAttribute.cs | 15 -- eng/Publishing.props | 6 - eng/TargetFramework.props | 64 ----- eng/_._ | 0 eng/build.ps1 | 85 +----- eng/build.sh | 2 +- eng/harvest.targets | 47 ---- eng/uwp.targets | 16 -- .../tests/Common/Unit/Configurations.props | 11 - .../CertificateGenerator.csproj | 1 - .../src/System.ServiceModel.NetTcp.csproj | 2 - .../src/System.ServiceModel.Primitives.csproj | 4 - .../System.Web.Services.Description.csproj | 17 +- ...util.xmlserializer.IntegrationTests.csproj | 1 - tools-local/DefaultGenApiDocIds.txt | 44 ---- tools-local/LicenseHeader.txt | 7 - tools-local/archgroups.props | 10 - tools-local/configurationgroups.props | 7 - tools-local/osgroups.props | 39 --- tools-local/properties.props | 50 ---- tools-local/targetgroups.props | 241 ------------------ 23 files changed, 9 insertions(+), 662 deletions(-) delete mode 100644 .gitmirrorall delete mode 100644 DotnetCLIVersion.txt delete mode 100644 eng/BlockReflectionAttribute.cs delete mode 100644 eng/Publishing.props delete mode 100644 eng/TargetFramework.props delete mode 100644 eng/_._ delete mode 100644 eng/harvest.targets delete mode 100644 eng/uwp.targets delete mode 100644 src/System.Private.ServiceModel/tests/Common/Unit/Configurations.props delete mode 100644 tools-local/DefaultGenApiDocIds.txt delete mode 100644 tools-local/LicenseHeader.txt delete mode 100644 tools-local/archgroups.props delete mode 100644 tools-local/configurationgroups.props delete mode 100644 tools-local/osgroups.props delete mode 100644 tools-local/properties.props delete mode 100644 tools-local/targetgroups.props diff --git a/.gitmirrorall b/.gitmirrorall deleted file mode 100644 index 9ee5c57b991..00000000000 --- a/.gitmirrorall +++ /dev/null @@ -1 +0,0 @@ -This folder will be mirrored by the Git-TFS Mirror recursively. \ No newline at end of file diff --git a/DotnetCLIVersion.txt b/DotnetCLIVersion.txt deleted file mode 100644 index eca07e4c1a8..00000000000 --- a/DotnetCLIVersion.txt +++ /dev/null @@ -1 +0,0 @@ -2.1.2 diff --git a/eng/BlockReflectionAttribute.cs b/eng/BlockReflectionAttribute.cs deleted file mode 100644 index 5e9573e76d6..00000000000 --- a/eng/BlockReflectionAttribute.cs +++ /dev/null @@ -1,15 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. -// See the LICENSE file in the project root for more information. - -// Defining __BlockReflectionAttribute indicates that the .NET Native toolchain should remove metadata for all non-public APIs. -// This reduces size and disables private reflection on those APIs. -// The attribute can also be applied to individual public APIs to similarly block them. - -using System; - -namespace System.Runtime.CompilerServices -{ - [AttributeUsage(AttributeTargets.All)] - internal class __BlockReflectionAttribute : Attribute { } -} diff --git a/eng/Publishing.props b/eng/Publishing.props deleted file mode 100644 index 797de4ea1de..00000000000 --- a/eng/Publishing.props +++ /dev/null @@ -1,6 +0,0 @@ - - - - 3 - - \ No newline at end of file diff --git a/eng/TargetFramework.props b/eng/TargetFramework.props deleted file mode 100644 index f68ad00843b..00000000000 --- a/eng/TargetFramework.props +++ /dev/null @@ -1,64 +0,0 @@ - - - - <_targetFrameworkIdentifier>$(TargetFramework.TrimEnd('.0123456789')) - <_targetFrameworkVersion>$(TargetFramework.Substring($(_targetFrameworkIdentifier.Length))) - - - - - .NETCore - v5.0 - UAP - - - 10.0.17763.0 - $([System.Version]::Parse('$(_targetFrameworkVersion)')).0 - 10.0.15063.0 - $([System.Version]::Parse('$(_targetFrameworkVersion)')).0 - - - true - true - 6.2.8 - - - - - .NETPortable - v0.0 - - Profile78 - Profile7 - - - true - - - - $(_targetFrameworkIdentifier) - v$(_targetFrameworkVersion) - - v$(_targetFrameworkVersion[0]).0 - v$(_targetFrameworkVersion[0]).$(_targetFrameworkVersion[1]) - v$(_targetFrameworkVersion[0]).$(_targetFrameworkVersion[1]).$(_targetFrameworkVersion[2]) - - true - - - - - - true - - - diff --git a/eng/_._ b/eng/_._ deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/eng/build.ps1 b/eng/build.ps1 index d64062b43aa..84f7b598d39 100644 --- a/eng/build.ps1 +++ b/eng/build.ps1 @@ -3,26 +3,17 @@ Param( [switch][Alias('h')]$help, [switch][Alias('b')]$build, [switch][Alias('t')]$test, - [switch]$buildtests, [string][Alias('c')]$configuration = "Debug", - [string][Alias('f')]$framework, - [string]$vs, [string]$os, - [switch]$allconfigurations, [switch]$coverage, [string]$testscope, [string]$arch, - [string]$subsetCategory, - [string]$subset, - [string]$runtimeConfiguration, [string]$librariesConfiguration, [Parameter(ValueFromRemainingArguments=$true)][String[]]$properties ) function Get-Help() { Write-Host "Common settings:" - Write-Host " -subset Build a subset, print available subsets with -subset help" - Write-Host " -subsetCategory Build a subsetCategory, print available subsetCategories with -subset help" Write-Host " -os Build operating system: Windows_NT or Unix" Write-Host " -arch Build platform: x86, x64, arm or arm64" Write-Host " -configuration Build configuration: Debug or Release (short: -c)" @@ -34,7 +25,6 @@ function Get-Help() { Write-Host "Actions (defaults to -restore -build):" Write-Host " -restore Restore dependencies (short: -r)" Write-Host " -build Build all source projects (short: -b)" - Write-Host " -buildtests Build all test projects" Write-Host " -rebuild Rebuild all source projects" Write-Host " -test Run all unit tests (short: -t)" Write-Host " -pack Package build outputs into NuGet packages" @@ -44,11 +34,8 @@ function Get-Help() { Write-Host "" Write-Host "Libraries settings:" - Write-Host " -vs Open the solution with VS for Test Explorer support. Path or solution name (ie -vs Microsoft.CSharp)" - Write-Host " -framework Build framework: netcoreapp or netfx (short: -f)" Write-Host " -coverage Collect code coverage when testing" Write-Host " -testscope Scope tests, allowed values: innerloop, outerloop, all" - Write-Host " -allconfigurations Build packages for all build configurations" Write-Host "" Write-Host "Command-line arguments not listed above are passed thru to msbuild." @@ -60,50 +47,8 @@ if ($help -or (($null -ne $properties) -and ($properties.Contains('/help') -or $ exit 0 } -$subsetCategory = $subsetCategory.ToLowerInvariant() - -# VS Test Explorer support for libraries -if ($vs) { - . $PSScriptRoot\common\tools.ps1 - - # Microsoft.DotNet.CoreSetup.sln is special - hosting tests are currently meant to run on the - # bootstrapped .NET Core, not on the live-built runtime. - if ([System.IO.Path]::GetFileName($vs) -ieq "Microsoft.DotNet.CoreSetup.sln") { - if (-Not (Test-Path $vs)) { - $vs = Join-Path "$PSScriptRoot\..\src\installer" $vs - } - - # This tells .NET Core to use the bootstrapped runtime to run the tests - $env:DOTNET_ROOT=InitializeDotNetCli -install:$false - } - else { - if (-Not (Test-Path $vs)) { - $vs = Join-Path "$PSScriptRoot\..\src\libraries" $vs | Join-Path -ChildPath "$vs.sln" - } - - $archTestHost = if ($arch) { $arch } else { "x64" } - - # This tells .NET Core to use the same dotnet.exe that build scripts use - $env:DOTNET_ROOT="$PSScriptRoot\..\artifacts\bin\testhost\netcoreapp5.0-Windows_NT-$configuration-$archTestHost"; - } - - # This tells MSBuild to load the SDK from the directory of the bootstrapped SDK - $env:DOTNET_MSBUILD_SDK_RESOLVER_CLI_DIR=InitializeDotNetCli -install:$false - - # This tells .NET Core not to go looking for .NET Core in other places - $env:DOTNET_MULTILEVEL_LOOKUP=0; - - # Put our local dotnet.exe on PATH first so Visual Studio knows which one to use - $env:PATH=($env:DOTNET_ROOT + ";" + $env:PATH); - - # Launch Visual Studio with the locally defined environment variables - Invoke-Item "$vs" - - exit 0 -} - # Check if an action is passed in -$actions = "r","restore","b","build","buildtests","rebuild","t","test","pack","sign","publish","clean" +$actions = "r","restore","b","build","rebuild","t","test","pack","sign","publish","clean" $actionPassedIn = @(Compare-Object -ReferenceObject @($PSBoundParameters.Keys) -DifferenceObject $actions -ExcludeDifferent -IncludeEqual).Length -ne 0 if ($null -ne $properties -and $actionPassedIn -ne $true) { $actionPassedIn = @(Compare-Object -ReferenceObject $properties -DifferenceObject $actions.ForEach({ "-" + $_ }) -ExcludeDifferent -IncludeEqual).Length -ne 0 @@ -113,37 +58,17 @@ if (!$actionPassedIn) { $arguments = "-restore -build" } -$possibleDirToBuild = if($properties.Length -gt 0) { $properties[0]; } else { $null } - -if ($null -ne $possibleDirToBuild -and $subsetCategory -eq "libraries") { - $dtb = $possibleDirToBuild.TrimEnd('\') - if (Test-Path $dtb) { - $properties[0] = "/p:DirectoryToBuild=$(Resolve-Path $dtb)" - } - else { - $dtb = Join-Path "$PSSCriptRoot\..\src\libraries" $dtb - if (Test-Path $dtb) { - $properties[0] = "/p:DirectoryToBuild=$(Resolve-Path $dtb)" - } - } -} - foreach ($argument in $PSBoundParameters.Keys) { switch($argument) { "build" { $arguments += " -build" } - "buildtests" { if ($build -eq $true) { $arguments += " /p:BuildTests=true" } else { $arguments += " -build /p:BuildTests=only" } } "test" { $arguments += " -test" } - "configuration" { $configuration = (Get-Culture).TextInfo.ToTitleCase($($PSBoundParameters[$argument])); $arguments += " /p:ConfigurationGroup=$configuration -configuration $configuration" } - "runtimeConfiguration" { $arguments += " /p:RuntimeConfiguration=$((Get-Culture).TextInfo.ToTitleCase($($PSBoundParameters[$argument])))" } - # This should be removed after we have finalized our ci build pipeline. - "framework" { if ($PSBoundParameters[$argument].ToLowerInvariant() -eq 'netcoreapp') { $arguments += " /p:TargetGroup=netcoreapp5.0" } else { if ($PSBoundParameters[$argument].ToLowerInvariant() -eq 'netfx') { $arguments += " /p:TargetGroup=net472" } else { $arguments += " /p:TargetGroup=$($PSBoundParameters[$argument].ToLowerInvariant())"}}} - "os" { $arguments += " /p:OSGroup=$($PSBoundParameters[$argument])" } - "allconfigurations" { $arguments += " /p:BuildAllConfigurations=true" } - "arch" { $arguments += " /p:ArchGroup=$($PSBoundParameters[$argument]) /p:TargetArchitecture=$($PSBoundParameters[$argument])" } + "configuration" { $configuration = (Get-Culture).TextInfo.ToTitleCase($($PSBoundParameters[$argument])); $arguments += " -configuration $configuration" } + "os" { $arguments += " /p:TargetOS=$($PSBoundParameters[$argument])" } + "arch" { $arguments += " /p:TargetArchitecture=$($PSBoundParameters[$argument])" } "properties" { $arguments += " " + $properties } - "testscope" + "testscope" { if ($testscope -eq "outerloop" -or $testscope -eq "all") { $arguments += " /p:IntegrationTest=true" } if ($testscope -eq "wcf") { $arguments += " -projects System.ServiceModel.sln /p:IntegrationTest=true" } diff --git a/eng/build.sh b/eng/build.sh index 3299870129c..5b04e96f760 100755 --- a/eng/build.sh +++ b/eng/build.sh @@ -67,7 +67,7 @@ while [[ $# > 0 ]]; do exit 1 ;; esac - arguments="$arguments /p:ConfigurationGroup=$val -configuration $val" + arguments="$arguments -configuration $val" shift 2 ;; diff --git a/eng/harvest.targets b/eng/harvest.targets deleted file mode 100644 index efab91798f7..00000000000 --- a/eng/harvest.targets +++ /dev/null @@ -1,47 +0,0 @@ - - - - - $(RepoRoot)\src\harvest\harvest.csproj - true - $(TargetsForTfmSpecificBuildOutput);AddHarvestedFilesToPackage - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_harvestedItems Include="$(_pathToHarvest)\lib\$(TargetFramework)\*.*" PackagePath="lib\$(TargetFramework)" /> - <_harvestedItems Include="$(_pathToHarvest)\ref\$(TargetFramework)\*.*" PackagePath="ref\$(TargetFramework)" /> - - - - - diff --git a/eng/uwp.targets b/eng/uwp.targets deleted file mode 100644 index f121f9973ad..00000000000 --- a/eng/uwp.targets +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - diff --git a/src/System.Private.ServiceModel/tests/Common/Unit/Configurations.props b/src/System.Private.ServiceModel/tests/Common/Unit/Configurations.props deleted file mode 100644 index 896ddfce7cb..00000000000 --- a/src/System.Private.ServiceModel/tests/Common/Unit/Configurations.props +++ /dev/null @@ -1,11 +0,0 @@ - - - - - uap-Windows_NT; - uapaot-Windows_NT; - netfx-Windows_NT; - netstandard; - - - \ No newline at end of file diff --git a/src/System.Private.ServiceModel/tools/CertificateGenerator/CertificateGenerator.csproj b/src/System.Private.ServiceModel/tools/CertificateGenerator/CertificateGenerator.csproj index 8f7a07e652f..182c6e160ff 100644 --- a/src/System.Private.ServiceModel/tools/CertificateGenerator/CertificateGenerator.csproj +++ b/src/System.Private.ServiceModel/tools/CertificateGenerator/CertificateGenerator.csproj @@ -9,7 +9,6 @@ - diff --git a/src/System.ServiceModel.NetTcp/src/System.ServiceModel.NetTcp.csproj b/src/System.ServiceModel.NetTcp/src/System.ServiceModel.NetTcp.csproj index a4fa55f2f11..fde548700e6 100644 --- a/src/System.ServiceModel.NetTcp/src/System.ServiceModel.NetTcp.csproj +++ b/src/System.ServiceModel.NetTcp/src/System.ServiceModel.NetTcp.csproj @@ -12,8 +12,6 @@ Provides the types that permit SOAP messages to be exchanged using TCP (example: NetTcpBinding). - - diff --git a/src/System.ServiceModel.Primitives/src/System.ServiceModel.Primitives.csproj b/src/System.ServiceModel.Primitives/src/System.ServiceModel.Primitives.csproj index 9fe595b1cee..c4aff9bba2a 100644 --- a/src/System.ServiceModel.Primitives/src/System.ServiceModel.Primitives.csproj +++ b/src/System.ServiceModel.Primitives/src/System.ServiceModel.Primitives.csproj @@ -11,10 +11,6 @@ net6.0 $(Ship_WcfPackages) Provides the common types used by all of the WCF libraries. - - - - true diff --git a/src/System.Web.Services.Description/src/System.Web.Services.Description.csproj b/src/System.Web.Services.Description/src/System.Web.Services.Description.csproj index d06b6cd902a..babaa6fe64b 100644 --- a/src/System.Web.Services.Description/src/System.Web.Services.Description.csproj +++ b/src/System.Web.Services.Description/src/System.Web.Services.Description.csproj @@ -1,15 +1,15 @@ + $(WcfAssemblyVersion) Microsoft System.Web.Services.Description true true - true - false $(Ship_WcfPackages) netstandard2.0;net461 - true + true + false Contains classes that enable you to publicly describe an XML Web service by using the Web Services Description Language (WSDL). @@ -18,10 +18,6 @@ - - - - @@ -38,11 +34,4 @@ - - - - - - false - diff --git a/src/svcutilcore/tests/dotnet-svcutil.xmlserializer.IntegrationTests.csproj b/src/svcutilcore/tests/dotnet-svcutil.xmlserializer.IntegrationTests.csproj index e8a50f0144b..cac9a373464 100644 --- a/src/svcutilcore/tests/dotnet-svcutil.xmlserializer.IntegrationTests.csproj +++ b/src/svcutilcore/tests/dotnet-svcutil.xmlserializer.IntegrationTests.csproj @@ -13,7 +13,6 @@ $(DefineConstants);SVCUTILTESTS ..\..\System.Private.ServiceModel\tests\Scenarios\Contract\XmlSerializer\ - true diff --git a/tools-local/DefaultGenApiDocIds.txt b/tools-local/DefaultGenApiDocIds.txt deleted file mode 100644 index e2c93f8733e..00000000000 --- a/tools-local/DefaultGenApiDocIds.txt +++ /dev/null @@ -1,44 +0,0 @@ -// These attributes should be excluded from reference assemblies. - -T:System.ComponentModel.DesignerAttribute -T:System.ComponentModel.Design.Serialization.DesignerSerializerAttribute -T:System.ComponentModel.Design.Serialization.RootDesignerSerializerAttribute -T:System.ComponentModel.EditorAttribute -T:System.ComponentModel.TypeConverterAttribute -T:System.Configuration.ConfigurationPropertyAttribute -T:System.Diagnostics.CodeAnalysis.SuppressMessageAttribute -T:System.Diagnostics.DebuggerBrowsableAttribute -T:System.Diagnostics.DebuggerDisplayAttribute -T:System.Diagnostics.DebuggerHiddenAttribute -T:System.Diagnostics.DebuggerNonUserCodeAttribute -T:System.Diagnostics.DebuggerStepThroughAttribute -T:System.Diagnostics.DebuggerTypeProxyAttribute -T:System.Diagnostics.MonitoringDescriptionAttribute -T:System.IO.IODescriptionAttribut -T:System.Runtime.CompilerServices.AsyncStateMachineAttribute -T:System.Runtime.CompilerServices.CompilerGeneratedAttribute -T:System.Runtime.CompilerServices.IteratorStateMachineAttribute -T:System.Runtime.CompilerServices.TypeForwardedFromAttribute -T:System.Runtime.CompilerServices.MethodImpl -T:System.Runtime.ConstrainedExecution.ReliabilityContractAttribute -T:System.Runtime.InteropServices.ClassInterfaceAttribute -T:System.Runtime.InteropServices.ComDefaultInterfaceAttribute -T:System.Runtime.InteropServices.ComVisibleAttribute -T:System.Runtime.InteropServices.GuidAttribute -T:System.Runtime.InteropServices.InterfaceTypeAttribute -T:System.Runtime.Serialization.KnownTypeAttribute -T:System.Security.Permissions.EnvironmentPermissionAttribute -T:System.Security.Permissions.FileIOPermissionAttribute -T:System.Security.Permissions.HostProtectionAttribute -T:System.Security.Permissions.IsolatedStorageFilePermissionAttribute -T:System.Security.Permissions.PermissionSetAttribute -T:System.Security.Permissions.ReflectionPermissionAttribute -T:System.Security.Permissions.SecurityPermissionAttribute -T:System.Security.Permissions.StrongNameIdentityPermissionAttribute -T:System.Security.SecurityCriticalAttribute -T:System.Security.SecuritySafeCriticalAttribute -T:System.Security.SuppressUnmanagedCodeSecurityAttribute -T:System.Xml.Serialization.XmlAttributeAttribute -T:System.Xml.Serialization.XmlEnumAttribute -T:System.Xml.Serialization.XmlIgnoreAttribute -T:System.Xml.Serialization.XmlRootAttribute \ No newline at end of file diff --git a/tools-local/LicenseHeader.txt b/tools-local/LicenseHeader.txt deleted file mode 100644 index 5c2f593e663..00000000000 --- a/tools-local/LicenseHeader.txt +++ /dev/null @@ -1,7 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. -// See the LICENSE file in the project root for more information. -// ------------------------------------------------------------------------------ -// Changes to this file must follow the http://aka.ms/api-review process. -// ------------------------------------------------------------------------------ - diff --git a/tools-local/archgroups.props b/tools-local/archgroups.props deleted file mode 100644 index 135f9ba87e9..00000000000 --- a/tools-local/archgroups.props +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/tools-local/configurationgroups.props b/tools-local/configurationgroups.props deleted file mode 100644 index 882c3586860..00000000000 --- a/tools-local/configurationgroups.props +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/tools-local/osgroups.props b/tools-local/osgroups.props deleted file mode 100644 index e70e47c99ab..00000000000 --- a/tools-local/osgroups.props +++ /dev/null @@ -1,39 +0,0 @@ - - - - - AnyOS - true - win - - - AnyOS - true - true - unix - - - Unix - true - true - linux - - - Unix - true - true - osx - - - Unix - true - true - - - Unix - true - true - - - - \ No newline at end of file diff --git a/tools-local/properties.props b/tools-local/properties.props deleted file mode 100644 index 50cb3708e1a..00000000000 --- a/tools-local/properties.props +++ /dev/null @@ -1,50 +0,0 @@ - - - - - - - - - - AnyOS - - 1 - - 2 - - - - - - 2 - - 1 - - - Debug - - Insignificant - 3 - - - x64 - - Independent - 4 - - - - OSGroup - - - TargetGroup - - - ConfigurationGroup - - - ArchGroup - - - \ No newline at end of file diff --git a/tools-local/targetgroups.props b/tools-local/targetgroups.props deleted file mode 100644 index 0c68e0c9de7..00000000000 --- a/tools-local/targetgroups.props +++ /dev/null @@ -1,241 +0,0 @@ - - - - - Microsoft.TargetingPack.Private.NetNative - .NETCore,Version=v5.0 - netcore50 - true - netstandard1.4 - - - aot - Microsoft.TargetingPack.Private.NetNative - .NETCore,Version=v5.0 - netcore50 - true - netcore50 - netstandard1.4 - - - aot - $(UAPvNextTFMFull) - $(UAPvNextTFM) - true - netcore50aot - uapvnext;netstandard2.0 - - - $(UAPvNextTFMFull) - $(UAPvNextTFM) - true - netcore50 - netstandard2.0 - - - - $(UAPvNextTFMFull) - $(UAPvNextTFM) - true - uapvnext - netstandard - - - - aot - $(UAPvNextTFMFull) - $(UAPvNextTFM) - true - uapvnextaot - uap;netstandard - - - .NETStandard,Version=v1.0 - netstandard1.0 - - true - - - .NETStandard,Version=v1.1 - netstandard1.1 - - true - netstandard1.0 - - - .NETStandard,Version=v1.2 - netstandard1.2 - - true - netstandard1.1 - - - .NETStandard,Version=v1.3 - netstandard1.3 - - true - netstandard1.2 - - - .NETStandard,Version=v1.4 - netstandard1.4 - - true - netstandard1.3 - - - .NETStandard,Version=v1.5 - netstandard1.5 - - true - netstandard1.4 - - - .NETStandard,Version=v1.6 - netstandard1.6 - - true - netstandard1.5 - - - .NETStandard,Version=v2.0 - netstandard2.0 - - true - netstandard1.6 - - - - .NETStandard,Version=v2.0 - netstandard2.0 - - true - netstandard2.0 - - - .NETCoreApp,Version=v1.0 - netcoreapp1.0 - netstandard1.6 - - - .NETCoreApp,Version=v2.0 - netcoreapp2.0 - netcoreapp1.0 - netstandard - - - .NETCoreApp,Version=v2.1 - netcoreapp2.1 - netcoreapp2.0 - netstandard - - - - .NETCoreApp,Version=v2.1 - netcoreapp2.1 - netcoreapp2.1 - netstandard - - - .NETCoreApp,Version=v1.2 - netcoreapp1.2 - - - .NETCoreApp,Version=v1.2 - netcoreapp1.2 - - - Microsoft.TargetingPack.NETFramework.v4.5 - .NETFramework,Version=v4.5 - net45 - netstandard1.1 - - - Microsoft.TargetingPack.NETFramework.v4.5.1 - .NETFramework,Version=v4.5.1 - net451 - net45 - netstandard1.2 - - - Microsoft.TargetingPack.NETFramework.v4.6 - .NETFramework,Version=v4.6 - net46 - net451 - netstandard1.3 - - - Microsoft.TargetingPack.NETFramework.v4.6.1 - .NETFramework,Version=v4.6.1 - net461 - net46 - netstandard - - - - Microsoft.TargetingPack.NETFramework.v4.6.1 - .NETFramework,Version=v4.6.1 - net461 - net461 - netstandard - - - Microsoft.TargetingPack.NETFramework.v4.6.2 - .NETFramework,Version=v4.6.2 - net462 - netfx - netstandard - - - Microsoft.TargetingPack.NETFramework.v4.6.3 - .NETFramework,Version=v4.6.3 - net463 - net462 - netstandard - - - Microsoft.TargetingPack.NETFramework.v4.7 - .NETFramework,Version=v4.7 - net47 - net462 - netstandard - - - Windows,Version=v8.0 - win8 - netstandard1.1 - - - WindowsPhoneApp,Version=v8.1 - wpa81 - netstandard1.2 - - - Microsoft.TargetingPack.Portable.v4.0.Profile47 - .NETPortable,Version=v0.0,Profile=Profile47 - portable-net45+win8+sl5 - - - Microsoft.TargetingPack.Portable.v4.0.Profile36 - .NETPortable,Version=v0.0,Profile=Profile36 - portable-net40+sl4+win8+wp8 - - - - - - .NETFramework,Version=v4.6.3 - net463 - - - From 1966371fbf68aba5554509beb2026b949aa4f071 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Tue, 1 Aug 2023 15:22:37 +0200 Subject: [PATCH 2/4] Simplify msbuild logic 1. Remove dead properties from TestProperties.props and move the remaining ones directly into Directory.Build.props 2. Fix dotnet-svcutil-lib.csproj condition which was conditioning on the ConfigurationGroup property which wasn't set anymore. 3. Remove dead properties (which now are either the default or were removed) from Versions.props. Move one version property from Directory.Build.props into Versions.props 4. Remove the unnecessary "ToolsVersion="14.0" xmlns="..."" tag. MSBuild/VS doesn't require that anymore. 5. Drastically simplify logic in Versions.props (sync with what we have in runtime) by removing the now unnecessary targets. Move what remains directly into Directory.Build.*. 6. Remove dead code from ReferenceAssemblies.props and move the remainder into Directory.Build.props. --- Directory.Build.props | 45 ++++++---- Directory.Build.targets | 46 +++++++++- eng/FacadeAssemblies.targets | 2 +- eng/ReferenceAssemblies.props | 18 ---- eng/TestProperties.props | 17 ---- eng/Versioning.props | 85 ------------------- eng/Versions.props | 13 +-- .../lib/src/dotnet-svcutil-lib.csproj | 2 +- 8 files changed, 76 insertions(+), 152 deletions(-) delete mode 100644 eng/ReferenceAssemblies.props delete mode 100644 eng/TestProperties.props delete mode 100644 eng/Versioning.props diff --git a/Directory.Build.props b/Directory.Build.props index 4b17a0b70be..5a6d8c19132 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,49 +1,58 @@ - - false - - - - - - + MIT + false + false + true + + + + + + true true - 6.8.0 + $(RepoRoot)src\System.Private.ServiceModel\src\System.Private.ServiceModel.csproj + $(RepoRoot)src\svcutilcore\src\dotnet-svcutil.xmlserializer.csproj + $(RepoRoot)src\System.Private.ServiceModel\tests\Common\Unit\UnitTests.Common.csproj + $(RepoRoot)src\System.Private.ServiceModel\tests\Common\Scenarios\ScenarioTests.Common.Tests.csproj + $(RepoRoot)src\System.Private.ServiceModel\tests\Common\Infrastructure\Infrastructure.Common.csproj + + + + + <_Parameter1>(System.Reflection.AssemblyNameFlags)0x70 + <_Parameter1_IsLiteral>true + + + net6.0;net7.0 - net6.0;net7.0 - + net6.0;net7.0 + net6.0 - true - - - - - - + diff --git a/Directory.Build.targets b/Directory.Build.targets index 621db2d9afb..3de646e4f77 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -1,8 +1,50 @@ + - - + + + + true + false + + false + + + + + $(AssemblyName) + + + Microsoft%AE .NET Core + + + + $(ProductVersion) + $(InformationalVersion)-$(VersionSuffix) + + + + + + <_Parameter1>Serviceable + <_Parameter2>True + + + <_Parameter1>PreferInbox + <_Parameter2>True + + + + + + <_Parameter1>$(AssemblyName) + + + <_Parameter1>true + + + diff --git a/eng/FacadeAssemblies.targets b/eng/FacadeAssemblies.targets index 76158aa36fc..0da364d095c 100644 --- a/eng/FacadeAssemblies.targets +++ b/eng/FacadeAssemblies.targets @@ -1,5 +1,5 @@ - + diff --git a/eng/ReferenceAssemblies.props b/eng/ReferenceAssemblies.props deleted file mode 100644 index 676d86d8621..00000000000 --- a/eng/ReferenceAssemblies.props +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - $(NoWarn);0169 - - false - true - - - - - - - - diff --git a/eng/TestProperties.props b/eng/TestProperties.props deleted file mode 100644 index a058d206686..00000000000 --- a/eng/TestProperties.props +++ /dev/null @@ -1,17 +0,0 @@ - - - $([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)\..')) - $([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)\..\src\System.Private.ServiceModel\src\System.Private.ServiceModel.csproj')) - - $([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)\..\src\System.ServiceModel.Duplex\ref\System.ServiceModel.Duplex.Ref.csproj')) - $([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)\..\src\System.ServiceModel.Http\ref\System.ServiceModel.Http.Ref.csproj')) - $([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)\..\src\System.ServiceModel.Primitives\ref\System.ServiceModel.Primitives.Ref.csproj')) - $([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)\..\src\System.ServiceModel.NetTcp\ref\System.ServiceModel.NetTcp.Ref.csproj')) - $([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)\..\src\System.ServiceModel.Security\ref\System.ServiceModel.Security.Ref.csproj')) - $([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)\..\src\svcutilcore\src\dotnet-svcutil.xmlserializer.csproj')) - - $([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)\..\src\System.Private.ServiceModel\tests\Common\Unit\UnitTests.Common.csproj')) - $([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)\..\src\System.Private.ServiceModel\tests\Common\Scenarios\ScenarioTests.Common.Tests.csproj')) - $([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)\..\src\System.Private.ServiceModel\tests\Common\Infrastructure\Infrastructure.Common.csproj')) - - diff --git a/eng/Versioning.props b/eng/Versioning.props deleted file mode 100644 index 1e47d9f7f39..00000000000 --- a/eng/Versioning.props +++ /dev/null @@ -1,85 +0,0 @@ - - - true - false - false - true - - - - $(IntermediateOutputPath)_AssemblyInfo.cs - - - - - true - false - - false - - - - - - - - - - True - - - True - - - - - - - $(AssemblyName) - - - - Microsoft%AE .NET Core - - - - $(ProductVersion) - $(InformationalVersion)-$(VersionSuffix) - - - - - <_Parameter1>$(AssemblyName) - - - - <_Parameter1>%(AssemblyMetadata.Identity) - <_Parameter2>%(AssemblyMetadata.Value) - - - - - - - - - - - - - - - - - - - diff --git a/eng/Versions.props b/eng/Versions.props index c8beef49536..906f625ea71 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,5 +1,5 @@ - + 6.0.0 @@ -9,17 +9,9 @@ true rtm - - - - - false + - - true - - true @@ -42,5 +34,6 @@ 1.0.0 2.1.0 + 6.8.0 diff --git a/src/dotnet-svcutil/lib/src/dotnet-svcutil-lib.csproj b/src/dotnet-svcutil/lib/src/dotnet-svcutil-lib.csproj index 9997db0b94d..cd06522cffc 100644 --- a/src/dotnet-svcutil/lib/src/dotnet-svcutil-lib.csproj +++ b/src/dotnet-svcutil/lib/src/dotnet-svcutil-lib.csproj @@ -33,7 +33,7 @@ - true + true From 85f622744f7390a8cba995639fc29a86a54fbc62 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Thu, 3 Aug 2023 15:53:34 +0200 Subject: [PATCH 3/4] Add -vs switch back --- eng/build.ps1 | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/eng/build.ps1 b/eng/build.ps1 index 84f7b598d39..05e968b5a8d 100644 --- a/eng/build.ps1 +++ b/eng/build.ps1 @@ -34,6 +34,7 @@ function Get-Help() { Write-Host "" Write-Host "Libraries settings:" + Write-Host " -vs Open the solution with VS for Test Explorer support. Path to solution file" Write-Host " -coverage Collect code coverage when testing" Write-Host " -testscope Scope tests, allowed values: innerloop, outerloop, all" Write-Host "" @@ -47,6 +48,25 @@ if ($help -or (($null -ne $properties) -and ($properties.Contains('/help') -or $ exit 0 } +# VS Test Explorer support for libraries +if ($vs) { + . $PSScriptRoot\common\tools.ps1 + + # This tells MSBuild to load the SDK from the directory of the bootstrapped SDK + $env:DOTNET_MSBUILD_SDK_RESOLVER_CLI_DIR=InitializeDotNetCli -install:$false + + # This tells .NET Core not to go looking for .NET Core in other places + $env:DOTNET_MULTILEVEL_LOOKUP=0; + + # Put our local dotnet.exe on PATH first so Visual Studio knows which one to use + $env:PATH=($env:DOTNET_ROOT + ";" + $env:PATH); + + # Launch Visual Studio with the locally defined environment variables + Invoke-Item "$vs" + + exit 0 +} + # Check if an action is passed in $actions = "r","restore","b","build","rebuild","t","test","pack","sign","publish","clean" $actionPassedIn = @(Compare-Object -ReferenceObject @($PSBoundParameters.Keys) -DifferenceObject $actions -ExcludeDifferent -IncludeEqual).Length -ne 0 From cb915aa3360dbe6ed793335ac9f0c572f9b1dde6 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Thu, 3 Aug 2023 15:54:47 +0200 Subject: [PATCH 4/4] Update CertificateGenerator.csproj --- .../tools/CertificateGenerator/CertificateGenerator.csproj | 1 + 1 file changed, 1 insertion(+) diff --git a/src/System.Private.ServiceModel/tools/CertificateGenerator/CertificateGenerator.csproj b/src/System.Private.ServiceModel/tools/CertificateGenerator/CertificateGenerator.csproj index 182c6e160ff..8f7a07e652f 100644 --- a/src/System.Private.ServiceModel/tools/CertificateGenerator/CertificateGenerator.csproj +++ b/src/System.Private.ServiceModel/tools/CertificateGenerator/CertificateGenerator.csproj @@ -9,6 +9,7 @@ +