diff --git a/eng/SourceBuild.props b/eng/SourceBuild.props index c9ac54d245a8bd..087d844f2c4262 100644 --- a/eng/SourceBuild.props +++ b/eng/SourceBuild.props @@ -40,7 +40,6 @@ $(InnerBuildArgs) --verbosity $(LogVerbosity) $(InnerBuildArgs) --nodereuse false $(InnerBuildArgs) --warnAsError false - $(InnerBuildArgs) /p:MicrosoftNetFrameworkReferenceAssembliesVersion=1.0.0 $(InnerBuildArgs) /p:PackageRid=$(TargetRid) $(InnerBuildArgs) /p:NoPgoOptimize=true $(InnerBuildArgs) /p:KeepNativeSymbols=true diff --git a/src/libraries/shims/ApiCompat.proj b/src/libraries/shims/ApiCompat.proj index 47ae748d327302..70170e5de70b7e 100644 --- a/src/libraries/shims/ApiCompat.proj +++ b/src/libraries/shims/ApiCompat.proj @@ -8,7 +8,7 @@ - + diff --git a/src/libraries/shims/Directory.Build.props b/src/libraries/shims/Directory.Build.props index 940d67bab7738b..6c19fac9a86df4 100644 --- a/src/libraries/shims/Directory.Build.props +++ b/src/libraries/shims/Directory.Build.props @@ -3,12 +3,6 @@ - - net48 - $(NuGetPackageRoot)microsoft.netframework.referenceassemblies.$(NETFrameworkReferenceAssemblyTFM)\$(MicrosoftNetFrameworkReferenceAssembliesVersion)\build\.NETFramework\v4.8\ - $([MSBuild]::NormalizeDirectory('$(NuGetPackageRoot)', 'netstandard.library.ref', '$(NETStandardLibraryRefVersion)', 'ref', 'netstandard2.1')) - - true true diff --git a/src/libraries/shims/Directory.Build.targets b/src/libraries/shims/Directory.Build.targets index ecf410556b169a..aa615fdd535971 100644 --- a/src/libraries/shims/Directory.Build.targets +++ b/src/libraries/shims/Directory.Build.targets @@ -1,7 +1,22 @@ - - + + + + net48 + $(NuGetPackageRoot)microsoft.netframework.referenceassemblies.$(NETFrameworkReferenceAssemblyTFM)\$(MicrosoftNETFrameworkReferenceAssembliesLatestPackageVersion)\build\.NETFramework\v4.8\ + $([MSBuild]::NormalizeDirectory('$(NuGetPackageRoot)', 'netstandard.library.ref', '$(NETStandardLibraryRefVersion)', 'ref', 'netstandard2.1')) + + + + + + - + + + + diff --git a/src/libraries/shims/generateShims.proj b/src/libraries/shims/generateShims.proj index 10e495fe471a8f..fd7404dba99b76 100644 --- a/src/libraries/shims/generateShims.proj +++ b/src/libraries/shims/generateShims.proj @@ -13,7 +13,6 @@ <_contractName>%(GenFacadesContracts.Identity) <_contractStrongNameKeyId>%(GenFacadesContracts.StrongNameKeyId) <_contractStrongNameKeyId Condition="'$(_contractStrongNameKeyId)' == ''">Microsoft - <_contractDirProperty>%(GenFacadesContracts.ContractDir) <_contractAssembly>$(%(GenFacadesContracts.ContractDir))$(_contractName).dll <_contractProjectFile>generated/$(_contractName).csproj @@ -37,7 +36,6 @@ $(_contractAssemblyVersion) $(_contractStrongNameKeyId) - %24($(_contractDirProperty))%24(MSBuildProjectName).dll diff --git a/src/libraries/shims/generated/Directory.Build.props b/src/libraries/shims/generated/Directory.Build.props index c18e9ecb1d22f4..6b2ab04d6acff2 100644 --- a/src/libraries/shims/generated/Directory.Build.props +++ b/src/libraries/shims/generated/Directory.Build.props @@ -14,15 +14,8 @@ $(NetCoreAppCurrent) - + - - - diff --git a/src/libraries/shims/generated/Microsoft.VisualBasic.csproj b/src/libraries/shims/generated/Microsoft.VisualBasic.csproj index 8326dc6802694b..086cd1f1c38623 100644 --- a/src/libraries/shims/generated/Microsoft.VisualBasic.csproj +++ b/src/libraries/shims/generated/Microsoft.VisualBasic.csproj @@ -6,7 +6,6 @@ 10.0.0.0 Microsoft - $(NetFxRefPath)$(MSBuildProjectName).dll diff --git a/src/libraries/shims/generated/System.ComponentModel.DataAnnotations.csproj b/src/libraries/shims/generated/System.ComponentModel.DataAnnotations.csproj index 967159a41dabd5..926a3d52b61eaa 100644 --- a/src/libraries/shims/generated/System.ComponentModel.DataAnnotations.csproj +++ b/src/libraries/shims/generated/System.ComponentModel.DataAnnotations.csproj @@ -6,7 +6,6 @@ 4.0.0.0 MicrosoftShared - $(NetFxRefPath)$(MSBuildProjectName).dll diff --git a/src/libraries/shims/generated/System.Configuration.csproj b/src/libraries/shims/generated/System.Configuration.csproj index a7aa25c98c4d62..e501d2d3dfd2f7 100644 --- a/src/libraries/shims/generated/System.Configuration.csproj +++ b/src/libraries/shims/generated/System.Configuration.csproj @@ -6,7 +6,6 @@ 4.0.0.0 Microsoft - $(NetFxRefPath)$(MSBuildProjectName).dll diff --git a/src/libraries/shims/generated/System.Core.csproj b/src/libraries/shims/generated/System.Core.csproj index 96e132177f78f0..da05b9146f56ef 100644 --- a/src/libraries/shims/generated/System.Core.csproj +++ b/src/libraries/shims/generated/System.Core.csproj @@ -6,7 +6,6 @@ 4.0.0.0 ECMA - $(NetFxRefPath)$(MSBuildProjectName).dll diff --git a/src/libraries/shims/generated/System.Data.csproj b/src/libraries/shims/generated/System.Data.csproj index 96e132177f78f0..da05b9146f56ef 100644 --- a/src/libraries/shims/generated/System.Data.csproj +++ b/src/libraries/shims/generated/System.Data.csproj @@ -6,7 +6,6 @@ 4.0.0.0 ECMA - $(NetFxRefPath)$(MSBuildProjectName).dll diff --git a/src/libraries/shims/generated/System.Drawing.csproj b/src/libraries/shims/generated/System.Drawing.csproj index a7aa25c98c4d62..e501d2d3dfd2f7 100644 --- a/src/libraries/shims/generated/System.Drawing.csproj +++ b/src/libraries/shims/generated/System.Drawing.csproj @@ -6,7 +6,6 @@ 4.0.0.0 Microsoft - $(NetFxRefPath)$(MSBuildProjectName).dll diff --git a/src/libraries/shims/generated/System.IO.Compression.FileSystem.csproj b/src/libraries/shims/generated/System.IO.Compression.FileSystem.csproj index 96e132177f78f0..da05b9146f56ef 100644 --- a/src/libraries/shims/generated/System.IO.Compression.FileSystem.csproj +++ b/src/libraries/shims/generated/System.IO.Compression.FileSystem.csproj @@ -6,7 +6,6 @@ 4.0.0.0 ECMA - $(NetFxRefPath)$(MSBuildProjectName).dll diff --git a/src/libraries/shims/generated/System.Net.csproj b/src/libraries/shims/generated/System.Net.csproj index a7aa25c98c4d62..e501d2d3dfd2f7 100644 --- a/src/libraries/shims/generated/System.Net.csproj +++ b/src/libraries/shims/generated/System.Net.csproj @@ -6,7 +6,6 @@ 4.0.0.0 Microsoft - $(NetFxRefPath)$(MSBuildProjectName).dll diff --git a/src/libraries/shims/generated/System.Numerics.csproj b/src/libraries/shims/generated/System.Numerics.csproj index 96e132177f78f0..da05b9146f56ef 100644 --- a/src/libraries/shims/generated/System.Numerics.csproj +++ b/src/libraries/shims/generated/System.Numerics.csproj @@ -6,7 +6,6 @@ 4.0.0.0 ECMA - $(NetFxRefPath)$(MSBuildProjectName).dll diff --git a/src/libraries/shims/generated/System.Runtime.Serialization.csproj b/src/libraries/shims/generated/System.Runtime.Serialization.csproj index 96e132177f78f0..da05b9146f56ef 100644 --- a/src/libraries/shims/generated/System.Runtime.Serialization.csproj +++ b/src/libraries/shims/generated/System.Runtime.Serialization.csproj @@ -6,7 +6,6 @@ 4.0.0.0 ECMA - $(NetFxRefPath)$(MSBuildProjectName).dll diff --git a/src/libraries/shims/generated/System.Security.csproj b/src/libraries/shims/generated/System.Security.csproj index a7aa25c98c4d62..e501d2d3dfd2f7 100644 --- a/src/libraries/shims/generated/System.Security.csproj +++ b/src/libraries/shims/generated/System.Security.csproj @@ -6,7 +6,6 @@ 4.0.0.0 Microsoft - $(NetFxRefPath)$(MSBuildProjectName).dll diff --git a/src/libraries/shims/generated/System.ServiceModel.Web.csproj b/src/libraries/shims/generated/System.ServiceModel.Web.csproj index 967159a41dabd5..926a3d52b61eaa 100644 --- a/src/libraries/shims/generated/System.ServiceModel.Web.csproj +++ b/src/libraries/shims/generated/System.ServiceModel.Web.csproj @@ -6,7 +6,6 @@ 4.0.0.0 MicrosoftShared - $(NetFxRefPath)$(MSBuildProjectName).dll diff --git a/src/libraries/shims/generated/System.ServiceProcess.csproj b/src/libraries/shims/generated/System.ServiceProcess.csproj index a7aa25c98c4d62..e501d2d3dfd2f7 100644 --- a/src/libraries/shims/generated/System.ServiceProcess.csproj +++ b/src/libraries/shims/generated/System.ServiceProcess.csproj @@ -6,7 +6,6 @@ 4.0.0.0 Microsoft - $(NetFxRefPath)$(MSBuildProjectName).dll diff --git a/src/libraries/shims/generated/System.Transactions.csproj b/src/libraries/shims/generated/System.Transactions.csproj index 96e132177f78f0..da05b9146f56ef 100644 --- a/src/libraries/shims/generated/System.Transactions.csproj +++ b/src/libraries/shims/generated/System.Transactions.csproj @@ -6,7 +6,6 @@ 4.0.0.0 ECMA - $(NetFxRefPath)$(MSBuildProjectName).dll diff --git a/src/libraries/shims/generated/System.Web.csproj b/src/libraries/shims/generated/System.Web.csproj index a7aa25c98c4d62..e501d2d3dfd2f7 100644 --- a/src/libraries/shims/generated/System.Web.csproj +++ b/src/libraries/shims/generated/System.Web.csproj @@ -6,7 +6,6 @@ 4.0.0.0 Microsoft - $(NetFxRefPath)$(MSBuildProjectName).dll diff --git a/src/libraries/shims/generated/System.Windows.csproj b/src/libraries/shims/generated/System.Windows.csproj index a7aa25c98c4d62..e501d2d3dfd2f7 100644 --- a/src/libraries/shims/generated/System.Windows.csproj +++ b/src/libraries/shims/generated/System.Windows.csproj @@ -6,7 +6,6 @@ 4.0.0.0 Microsoft - $(NetFxRefPath)$(MSBuildProjectName).dll diff --git a/src/libraries/shims/generated/System.Xml.Linq.csproj b/src/libraries/shims/generated/System.Xml.Linq.csproj index 96e132177f78f0..da05b9146f56ef 100644 --- a/src/libraries/shims/generated/System.Xml.Linq.csproj +++ b/src/libraries/shims/generated/System.Xml.Linq.csproj @@ -6,7 +6,6 @@ 4.0.0.0 ECMA - $(NetFxRefPath)$(MSBuildProjectName).dll diff --git a/src/libraries/shims/generated/System.Xml.Serialization.csproj b/src/libraries/shims/generated/System.Xml.Serialization.csproj index 96e132177f78f0..da05b9146f56ef 100644 --- a/src/libraries/shims/generated/System.Xml.Serialization.csproj +++ b/src/libraries/shims/generated/System.Xml.Serialization.csproj @@ -6,7 +6,6 @@ 4.0.0.0 ECMA - $(NetFxRefPath)$(MSBuildProjectName).dll diff --git a/src/libraries/shims/generated/System.Xml.csproj b/src/libraries/shims/generated/System.Xml.csproj index 96e132177f78f0..da05b9146f56ef 100644 --- a/src/libraries/shims/generated/System.Xml.csproj +++ b/src/libraries/shims/generated/System.Xml.csproj @@ -6,7 +6,6 @@ 4.0.0.0 ECMA - $(NetFxRefPath)$(MSBuildProjectName).dll diff --git a/src/libraries/shims/generated/System.csproj b/src/libraries/shims/generated/System.csproj index 96e132177f78f0..da05b9146f56ef 100644 --- a/src/libraries/shims/generated/System.csproj +++ b/src/libraries/shims/generated/System.csproj @@ -6,7 +6,6 @@ 4.0.0.0 ECMA - $(NetFxRefPath)$(MSBuildProjectName).dll diff --git a/src/libraries/shims/generated/WindowsBase.csproj b/src/libraries/shims/generated/WindowsBase.csproj index 967159a41dabd5..926a3d52b61eaa 100644 --- a/src/libraries/shims/generated/WindowsBase.csproj +++ b/src/libraries/shims/generated/WindowsBase.csproj @@ -6,7 +6,6 @@ 4.0.0.0 MicrosoftShared - $(NetFxRefPath)$(MSBuildProjectName).dll diff --git a/src/libraries/shims/generated/mscorlib.csproj b/src/libraries/shims/generated/mscorlib.csproj index 96e132177f78f0..da05b9146f56ef 100644 --- a/src/libraries/shims/generated/mscorlib.csproj +++ b/src/libraries/shims/generated/mscorlib.csproj @@ -6,7 +6,6 @@ 4.0.0.0 ECMA - $(NetFxRefPath)$(MSBuildProjectName).dll diff --git a/src/libraries/shims/generated/netstandard.csproj b/src/libraries/shims/generated/netstandard.csproj index ec9b00675ebd3e..7cf2a84f2ef50e 100644 --- a/src/libraries/shims/generated/netstandard.csproj +++ b/src/libraries/shims/generated/netstandard.csproj @@ -6,7 +6,6 @@ 2.1.0.0 Open - $(NETStandard21RefPath)$(MSBuildProjectName).dll