提交 50d8a5f6 编写于 作者: S Santiago Fernandez Madero 提交者: GitHub

Cleanup MSBuild conditional operators to be all in lowercase (dotnet/corefx#42491)



Commit migrated from https://github.com/dotnet/corefx/commit/ab01852685e659a685af2ace33af5b3cefdf8430
上级 19538490
<Project> <Project>
<Import Condition="Exists($(AnalyzerPropsFile)) AND '$(EnableAnalyzers)' == 'true'" Project="$(AnalyzerPropsFile)" /> <Import Condition="Exists($(AnalyzerPropsFile)) and '$(EnableAnalyzers)' == 'true'" Project="$(AnalyzerPropsFile)" />
<!-- This target is executed when building a project and EnableAnalyzers property is set to true. <!-- This target is executed when building a project and EnableAnalyzers property is set to true.
It will populate the Analyzer item that is passed to the compiler with the analyzers restored It will populate the Analyzer item that is passed to the compiler with the analyzers restored
...@@ -20,9 +20,9 @@ ...@@ -20,9 +20,9 @@
<Analyzer Include="@(ResolvedAnalyzer)" /> <Analyzer Include="@(ResolvedAnalyzer)" />
</ItemGroup> </ItemGroup>
<Warning Text="AnalyzersToExclude and AnalyzersToInclude shouldn't be set together, they are mutually exclusive." Condition="'@(AnalyzersToExclude)' != '' AND '@(AnalyzersToInclude)' != ''" /> <Warning Text="AnalyzersToExclude and AnalyzersToInclude shouldn't be set together, they are mutually exclusive." Condition="'@(AnalyzersToExclude)' != '' and '@(AnalyzersToInclude)' != ''" />
<ItemGroup Condition="'@(AnalyzersToExclude)' != '' OR '@(AnalyzersToInclude)' != ''"> <ItemGroup Condition="'@(AnalyzersToExclude)' != '' or '@(AnalyzersToInclude)' != ''">
<_AnalyzersToFileName Include="@(Analyzer -> '%(FileName)')"> <_AnalyzersToFileName Include="@(Analyzer -> '%(FileName)')">
<OriginalIdentity>%(Identity)</OriginalIdentity> <OriginalIdentity>%(Identity)</OriginalIdentity>
</_AnalyzersToFileName> </_AnalyzersToFileName>
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<PropertyGroup Condition="'$(IsEligibleForNgenOptimization)' == ''"> <PropertyGroup Condition="'$(IsEligibleForNgenOptimization)' == ''">
<IsEligibleForNgenOptimization>true</IsEligibleForNgenOptimization> <IsEligibleForNgenOptimization>true</IsEligibleForNgenOptimization>
<IsEligibleForNgenOptimization Condition="'$(IsReferenceAssembly)' == 'true'">false</IsEligibleForNgenOptimization> <IsEligibleForNgenOptimization Condition="'$(IsReferenceAssembly)' == 'true'">false</IsEligibleForNgenOptimization>
<IsEligibleForNgenOptimization Condition="'$(GeneratePlatformNotSupportedAssembly)' == 'true' OR '$(GeneratePlatformNotSupportedAssemblyMessage)' != ''">false</IsEligibleForNgenOptimization> <IsEligibleForNgenOptimization Condition="'$(GeneratePlatformNotSupportedAssembly)' == 'true' or '$(GeneratePlatformNotSupportedAssemblyMessage)' != ''">false</IsEligibleForNgenOptimization>
</PropertyGroup> </PropertyGroup>
<Target Name="SetApplyNgenOptimization" <Target Name="SetApplyNgenOptimization"
......
...@@ -70,8 +70,8 @@ See the LICENSE file in the project root for more information. ...@@ -70,8 +70,8 @@ See the LICENSE file in the project root for more information.
<Target Name="CoreCompile" Condition="'@(PackageReference)' != '' Or '@(PackageDownload)' == ''"> <Target Name="CoreCompile" Condition="'@(PackageReference)' != '' Or '@(PackageDownload)' == ''">
<Error Condition="'$(NuGetDeploySourceItem)' != 'ReferenceCopyLocalPaths' AND <Error Condition="'$(NuGetDeploySourceItem)' != 'ReferenceCopyLocalPaths' and
'$(NuGetDeploySourceItem)' != 'Reference' AND '$(NuGetDeploySourceItem)' != 'Reference' and
'$(NuGetDeploySourceItem)' != 'Analyzer'" '$(NuGetDeploySourceItem)' != 'Analyzer'"
Text="Unexpected value for NuGetDeploySourceItem:'$(NuGetDeploySourceItem)'. Expected ReferenceCopyLocalPaths, Reference, or Analyzer." /> Text="Unexpected value for NuGetDeploySourceItem:'$(NuGetDeploySourceItem)'. Expected ReferenceCopyLocalPaths, Reference, or Analyzer." />
...@@ -122,7 +122,7 @@ See the LICENSE file in the project root for more information. ...@@ -122,7 +122,7 @@ See the LICENSE file in the project root for more information.
<Target Name="FilterNugetPackages" <Target Name="FilterNugetPackages"
BeforeTargets="ResolveAssemblyReferences" BeforeTargets="ResolveAssemblyReferences"
DependsOnTargets="ResolvePackageAssets" DependsOnTargets="ResolvePackageAssets"
Condition="'@(PackageToInclude)' != '' OR '@(PackageToExclude)' != '' OR '@(FileToInclude)' != '' OR '@(FileToExclude)' != ''"> Condition="'@(PackageToInclude)' != '' or '@(PackageToExclude)' != '' or '@(FileToInclude)' != '' or '@(FileToExclude)' != ''">
<ItemGroup> <ItemGroup>
<_nuGetDeploy Include="@($(NuGetDeploySourceItem))"/> <_nuGetDeploy Include="@($(NuGetDeploySourceItem))"/>
<_nuGetDeployByFileName Include="@(_nuGetDeploy->'%(FileName)')"> <_nuGetDeployByFileName Include="@(_nuGetDeploy->'%(FileName)')">
......
...@@ -18,10 +18,10 @@ ...@@ -18,10 +18,10 @@
<ILLinkTrimInputSymbols>$(ILLinkTrimInputPath)$(TargetName).pdb</ILLinkTrimInputSymbols> <ILLinkTrimInputSymbols>$(ILLinkTrimInputPath)$(TargetName).pdb</ILLinkTrimInputSymbols>
<ILLinkTrimOutputPath>$(IntermediateOutputPath)</ILLinkTrimOutputPath> <ILLinkTrimOutputPath>$(IntermediateOutputPath)</ILLinkTrimOutputPath>
<ILLinkTrimXml Condition="'$(ILLinkTrimXml)' == '' AND Exists('$(MSBuildProjectDirectory)/ILLinkTrim.xml')">$(MSBuildProjectDirectory)/ILLinkTrim.xml</ILLinkTrimXml> <ILLinkTrimXml Condition="'$(ILLinkTrimXml)' == '' and Exists('$(MSBuildProjectDirectory)/ILLinkTrim.xml')">$(MSBuildProjectDirectory)/ILLinkTrim.xml</ILLinkTrimXml>
<!-- if building a PDB, tell illink to rewrite the symbols file --> <!-- if building a PDB, tell illink to rewrite the symbols file -->
<ILLinkRewritePDBs Condition="'$(ILLinkRewritePDBs)' == '' AND '$(DebugSymbols)' != 'false'">true</ILLinkRewritePDBs> <ILLinkRewritePDBs Condition="'$(ILLinkRewritePDBs)' == '' and '$(DebugSymbols)' != 'false'">true</ILLinkRewritePDBs>
</PropertyGroup> </PropertyGroup>
<ItemGroup Condition="'$(ILLinkTrimXml)' != ''"> <ItemGroup Condition="'$(ILLinkTrimXml)' != ''">
...@@ -73,7 +73,7 @@ ...@@ -73,7 +73,7 @@
<ILLinkArgs>$(ILLinkArgs) -p link $(TargetName)</ILLinkArgs> <ILLinkArgs>$(ILLinkArgs) -p link $(TargetName)</ILLinkArgs>
<!-- keep type-forward assemblies (facades) --> <!-- keep type-forward assemblies (facades) -->
<ILLinkArgs>$(ILLinkArgs) -t</ILLinkArgs> <ILLinkArgs>$(ILLinkArgs) -t</ILLinkArgs>
<ILLinkArgs Condition="'$(ILLinkRewritePDBs)' == 'true' AND Exists('$(ILLinkTrimAssemblySymbols)')">$(ILLinkArgs) -b true</ILLinkArgs> <ILLinkArgs Condition="'$(ILLinkRewritePDBs)' == 'true' and Exists('$(ILLinkTrimAssemblySymbols)')">$(ILLinkArgs) -b true</ILLinkArgs>
<!-- keep types and members required by Debugger-related attributes --> <!-- keep types and members required by Debugger-related attributes -->
<ILLinkArgs>$(ILLinkArgs) -v true</ILLinkArgs> <ILLinkArgs>$(ILLinkArgs) -v true</ILLinkArgs>
<!-- don't remove the embedded root xml resource since ILLink may run again on the assembly --> <!-- don't remove the embedded root xml resource since ILLink may run again on the assembly -->
...@@ -96,7 +96,7 @@ ...@@ -96,7 +96,7 @@
<!-- Move the PDB into a subdirectory for ILLink if we are rewriting PDBs --> <!-- Move the PDB into a subdirectory for ILLink if we are rewriting PDBs -->
<Move SourceFiles="$(ILLinkTrimAssemblySymbols)" <Move SourceFiles="$(ILLinkTrimAssemblySymbols)"
DestinationFolder="$(ILLinkTrimInputPath)" DestinationFolder="$(ILLinkTrimInputPath)"
Condition="'$(ILLinkRewritePDBs)' == 'true' AND Exists('$(ILLinkTrimAssemblySymbols)')" Condition="'$(ILLinkRewritePDBs)' == 'true' and Exists('$(ILLinkTrimAssemblySymbols)')"
/> />
<ItemGroup> <ItemGroup>
...@@ -174,11 +174,11 @@ ...@@ -174,11 +174,11 @@
Condition="'$(ILLinkTrimAssembly)' == 'true'"> Condition="'$(ILLinkTrimAssembly)' == 'true'">
<ItemGroup> <ItemGroup>
<PreTrimmedItem Condition="Exists('$(ILLinkTrimInputAssembly)')" Include="$(ILLinkTrimInputAssembly)" /> <PreTrimmedItem Condition="Exists('$(ILLinkTrimInputAssembly)')" Include="$(ILLinkTrimInputAssembly)" />
<PreTrimmedItem Condition="'$(ILLinkRewritePDBs)' == 'true' AND Exists('$(ILLinkTrimInputSymbols)')" Include="$(ILLinkTrimInputSymbols)" /> <PreTrimmedItem Condition="'$(ILLinkRewritePDBs)' == 'true' and Exists('$(ILLinkTrimInputSymbols)')" Include="$(ILLinkTrimInputSymbols)" />
<FileWrites Include="@(PreTrimmedItem)" /> <FileWrites Include="@(PreTrimmedItem)" />
<TrimmedItem Condition="Exists('$(ILLinkTrimAssemblyPath)')" Include="$(ILLinkTrimAssemblyPath)" /> <TrimmedItem Condition="Exists('$(ILLinkTrimAssemblyPath)')" Include="$(ILLinkTrimAssemblyPath)" />
<TrimmedItem Condition="'$(ILLinkRewritePDBs)' == 'true' AND Exists('$(ILLinkTrimAssemblySymbols)')" Include="$(ILLinkTrimAssemblySymbols)" /> <TrimmedItem Condition="'$(ILLinkRewritePDBs)' == 'true' and Exists('$(ILLinkTrimAssemblySymbols)')" Include="$(ILLinkTrimAssemblySymbols)" />
<TrimmingReport Condition="Exists('$(AsmDiffReport)')" Include="$(AsmDiffReport)" /> <TrimmingReport Condition="Exists('$(AsmDiffReport)')" Include="$(AsmDiffReport)" />
<TrimmingReport Condition="Exists('$(AsmDiffList)')" Include="$(AsmDiffList)" /> <TrimmingReport Condition="Exists('$(AsmDiffList)')" Include="$(AsmDiffList)" />
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
<MakeDir Condition="'$(DotNetBuildOffline)' != 'true'" Directories="$(_notSupportedSourceDirectory)" /> <MakeDir Condition="'$(DotNetBuildOffline)' != 'true'" Directories="$(_notSupportedSourceDirectory)" />
<Error Condition="'$(DotNetBuildOffline)' == 'true' AND !Exists('$(NotSupportedSourceFile)')" <Error Condition="'$(DotNetBuildOffline)' == 'true' and !Exists('$(NotSupportedSourceFile)')"
Text="Error NotSupportedSourceFile '$(NotSupportedSourceFile)' did not exist under DotNetSourceBuildIntermediatePath." /> Text="Error NotSupportedSourceFile '$(NotSupportedSourceFile)' did not exist under DotNetSourceBuildIntermediatePath." />
<!-- DotNetBuildOffline == true, don't use GenAPI and include source from DotNetSourceBuildIntermediatePath --> <!-- DotNetBuildOffline == true, don't use GenAPI and include source from DotNetSourceBuildIntermediatePath -->
......
...@@ -45,7 +45,7 @@ ...@@ -45,7 +45,7 @@
<PackageConfigurations>$(BuildConfigurations)</PackageConfigurations> <PackageConfigurations>$(BuildConfigurations)</PackageConfigurations>
</PropertyGroup> </PropertyGroup>
<Import Condition="Exists('$(PkgDir)baseline\baseline.props') AND '$(MSBuildProjectExtension)' == '.pkgproj'" Project="$(PkgDir)baseline\baseline.props" /> <Import Condition="Exists('$(PkgDir)baseline\baseline.props') and '$(MSBuildProjectExtension)' == '.pkgproj'" Project="$(PkgDir)baseline\baseline.props" />
<PropertyGroup Condition="'$(OsEnvironment)'=='Unix'"> <PropertyGroup Condition="'$(OsEnvironment)'=='Unix'">
<!-- <!--
......
...@@ -28,8 +28,8 @@ ...@@ -28,8 +28,8 @@
<_excludeCompile Condition="@(Dependency->WithMetadataValue('Exclude', 'Compile')->Count()) == @(Dependency->Count())">true</_excludeCompile> <_excludeCompile Condition="@(Dependency->WithMetadataValue('Exclude', 'Compile')->Count()) == @(Dependency->Count())">true</_excludeCompile>
</PropertyGroup> </PropertyGroup>
<Error Text="Cannot have Exclude=Compile dependencies when targeting a desktop TFM. @(Dependency). You can exclude the reference asset in the package by setting the ExcludeReferenceAssets property to true in your project." <Error Text="Cannot have Exclude=Compile dependencies when targeting a desktop TFM. @(Dependency). You can exclude the reference asset in the package by setting the ExcludeReferenceAssets property to true in your project."
Condition="$([System.String]::Copy('%(Dependency.TargetFramework)').StartsWith('net4')) AND Condition="$([System.String]::Copy('%(Dependency.TargetFramework)').StartsWith('net4')) and
'$(_excludeCompile)' == 'true' AND '$(_excludeCompile)' == 'true' and
'%(Dependency.Identity)' != '_._'" /> '%(Dependency.Identity)' != '_._'" />
</Target> </Target>
</Project> </Project>
\ No newline at end of file
<Project> <Project>
<Target Name="AddReferenceFromRuntimeForTests" <Target Name="AddReferenceFromRuntimeForTests"
BeforeTargets="SetupDefaultReferences" BeforeTargets="SetupDefaultReferences"
Condition="'$(IsTestProject)'=='true' AND '@(ReferenceFromRuntime)' != ''"> Condition="'$(IsTestProject)'=='true' and '@(ReferenceFromRuntime)' != ''">
<ItemGroup> <ItemGroup>
<Reference Include="@(ReferenceFromRuntime->'$(RuntimePath)%(Identity).dll')" /> <Reference Include="@(ReferenceFromRuntime->'$(RuntimePath)%(Identity).dll')" />
</ItemGroup> </ItemGroup>
...@@ -23,9 +23,9 @@ ...@@ -23,9 +23,9 @@
</PropertyGroup> </PropertyGroup>
<Target Name="AddRuntimeProjectReference" <Target Name="AddRuntimeProjectReference"
Condition="'$(IsTestProject)'!='true' AND '@(ReferenceFromRuntime)' != ''"> Condition="'$(IsTestProject)'!='true' and '@(ReferenceFromRuntime)' != ''">
<Error Condition="('$(IsReferenceAssembly)' != 'true' OR '$(AllowReferenceFromRuntime)' == 'true') AND '$(RuntimeProjectFile)' == ''" Text="RuntimeProjectFile must be specified when using ReferenceFromRuntime from source projects." /> <Error Condition="('$(IsReferenceAssembly)' != 'true' or '$(AllowReferenceFromRuntime)' == 'true') and '$(RuntimeProjectFile)' == ''" Text="RuntimeProjectFile must be specified when using ReferenceFromRuntime from source projects." />
<Error Condition="'$(IsReferenceAssembly)' == 'true' AND '$(AllowReferenceFromRuntime)' != 'true'" Text="ReferenceFromRuntime may not be used from reference assemblies." /> <Error Condition="'$(IsReferenceAssembly)' == 'true' and '$(AllowReferenceFromRuntime)' != 'true'" Text="ReferenceFromRuntime may not be used from reference assemblies." />
<ItemGroup> <ItemGroup>
<ProjectReference Include="$(RuntimeProjectFile)"> <ProjectReference Include="$(RuntimeProjectFile)">
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
<Target Name="FilterReferenceFromRuntime" <Target Name="FilterReferenceFromRuntime"
AfterTargets="ResolveProjectReferences" AfterTargets="ResolveProjectReferences"
Condition="'$(IsTestProject)'!='true' AND '@(ReferenceFromRuntime)' != ''"> Condition="'$(IsTestProject)'!='true' and '@(ReferenceFromRuntime)' != ''">
<ItemGroup> <ItemGroup>
<!-- transform to filename in order to intersect --> <!-- transform to filename in order to intersect -->
<_referencePathFromRuntimeByFileName Include="@(_referencePathFromRuntime->'%(FileName)')" Condition="'%(_referencePathFromRuntime.Extension)' == '.dll'" > <_referencePathFromRuntimeByFileName Include="@(_referencePathFromRuntime->'%(FileName)')" Condition="'%(_referencePathFromRuntime.Extension)' == '.dll'" >
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
<!-- intersect with ReferenceFromRuntime --> <!-- intersect with ReferenceFromRuntime -->
<_filteredReferencePathFromRuntimeByFileName Include="@(_referencePathFromRuntimeByFileName)" <_filteredReferencePathFromRuntimeByFileName Include="@(_referencePathFromRuntimeByFileName)"
Condition="'@(_referencePathFromRuntimeByFileName)' == '@(ReferenceFromRuntime)' AND '%(Identity)' != ''"> Condition="'@(_referencePathFromRuntimeByFileName)' == '@(ReferenceFromRuntime)' and '%(Identity)' != ''">
<Aliases>@(ReferenceFromRuntime->'%(Aliases)')</Aliases> <Aliases>@(ReferenceFromRuntime->'%(Aliases)')</Aliases>
</_filteredReferencePathFromRuntimeByFileName> </_filteredReferencePathFromRuntimeByFileName>
...@@ -58,7 +58,7 @@ ...@@ -58,7 +58,7 @@
</_remainingReferenceFromRuntimeWithNI> </_remainingReferenceFromRuntimeWithNI>
<_filteredReferencePathFromRuntimeByFileName Include="@(_referencePathFromRuntimeByFileName)" <_filteredReferencePathFromRuntimeByFileName Include="@(_referencePathFromRuntimeByFileName)"
Condition="'@(_referencePathFromRuntimeByFileName)' == '@(_remainingReferenceFromRuntimeWithNI)' AND '%(Identity)' != ''"> Condition="'@(_referencePathFromRuntimeByFileName)' == '@(_remainingReferenceFromRuntimeWithNI)' and '%(Identity)' != ''">
<Aliases>@(_remainingReferenceFromRuntimeWithNI->'%(Aliases)')</Aliases> <Aliases>@(_remainingReferenceFromRuntimeWithNI->'%(Aliases)')</Aliases>
</_filteredReferencePathFromRuntimeByFileName> </_filteredReferencePathFromRuntimeByFileName>
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<ResourcesSourceFileExtension Condition="'$(MSBuildProjectExtension)' == '.csproj'">.cs</ResourcesSourceFileExtension> <ResourcesSourceFileExtension Condition="'$(MSBuildProjectExtension)' == '.csproj'">.cs</ResourcesSourceFileExtension>
<ResourcesSourceFileExtension Condition="'$(MSBuildProjectExtension)' == '.vbproj'">.vb</ResourcesSourceFileExtension> <ResourcesSourceFileExtension Condition="'$(MSBuildProjectExtension)' == '.vbproj'">.vb</ResourcesSourceFileExtension>
<StringResourcesPath Condition="'$(StringResourcesPath)' == '' AND Exists('$(MSBuildProjectDirectory)/Resources/Strings.resx')">$(MSBuildProjectDirectory)/Resources/Strings.resx</StringResourcesPath> <StringResourcesPath Condition="'$(StringResourcesPath)' == '' and Exists('$(MSBuildProjectDirectory)/Resources/Strings.resx')">$(MSBuildProjectDirectory)/Resources/Strings.resx</StringResourcesPath>
<StringResourcesNamespace Condition="'$(StringResourcesNamespace)' == ''">System</StringResourcesNamespace> <StringResourcesNamespace Condition="'$(StringResourcesNamespace)' == ''">System</StringResourcesNamespace>
<StringResourcesClassName Condition="'$(StringResourcesClassName)' == ''">SR</StringResourcesClassName> <StringResourcesClassName Condition="'$(StringResourcesClassName)' == ''">SR</StringResourcesClassName>
<StringResourcesName Condition="'$(StringResourcesName)' == ''">FxResources.$(AssemblyName).$(StringResourcesClassName)</StringResourcesName> <StringResourcesName Condition="'$(StringResourcesName)' == ''">FxResources.$(AssemblyName).$(StringResourcesClassName)</StringResourcesName>
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
</PropertyGroup> </PropertyGroup>
<!-- Include files under StringResourcesPath by convention unless OmitResources is set. --> <!-- Include files under StringResourcesPath by convention unless OmitResources is set. -->
<ItemGroup Condition="'$(StringResourcesPath)' != '' AND '$(OmitResources)' != 'true'"> <ItemGroup Condition="'$(StringResourcesPath)' != '' and '$(OmitResources)' != 'true'">
<EmbeddedResource Include="$(StringResourcesPath)"> <EmbeddedResource Include="$(StringResourcesPath)">
<Visible>true</Visible> <Visible>true</Visible>
<ManifestResourceName>$(StringResourcesName)</ManifestResourceName> <ManifestResourceName>$(StringResourcesName)</ManifestResourceName>
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
</ItemGroup> </ItemGroup>
<!-- Include common SR helper when resources are included unless SkipCommonResourcesIncludes is set. --> <!-- Include common SR helper when resources are included unless SkipCommonResourcesIncludes is set. -->
<ItemGroup Condition="Exists('$(StringResourcesPath)') AND '$(OmitResources)' != 'true' AND '$(SkipCommonResourcesIncludes)' == ''"> <ItemGroup Condition="Exists('$(StringResourcesPath)') and '$(OmitResources)' != 'true' and '$(SkipCommonResourcesIncludes)' == ''">
<Compile Include="$(CommonPath)/System/SR$(ResourcesSourceFileExtension)"> <Compile Include="$(CommonPath)/System/SR$(ResourcesSourceFileExtension)">
<Visible>true</Visible> <Visible>true</Visible>
<Link>Resources/Common/SR$(ResourcesSourceFileExtension)</Link> <Link>Resources/Common/SR$(ResourcesSourceFileExtension)</Link>
......
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
</ItemGroup> </ItemGroup>
<Target Name="DecideIfWeNeedToIncludeDllSafeSearchPathAttribute" <Target Name="DecideIfWeNeedToIncludeDllSafeSearchPathAttribute"
Condition="'$(IsDotNetFrameworkProductAssembly)' == 'true' AND '$(IsTestProject)' != 'true'"> Condition="'$(IsDotNetFrameworkProductAssembly)' == 'true' and '$(IsTestProject)' != 'true'">
<!-- We want to apply the IncludeDllSafeSearchPathAttribute on all DotNet assemblies (non test) that have a reference to System.Runtime.InteropServices --> <!-- We want to apply the IncludeDllSafeSearchPathAttribute on all DotNet assemblies (non test) that have a reference to System.Runtime.InteropServices -->
<PropertyGroup Condition="'$(IncludeDllSafeSearchPathAttribute)'==''"> <PropertyGroup Condition="'$(IncludeDllSafeSearchPathAttribute)'==''">
......
...@@ -48,9 +48,9 @@ ...@@ -48,9 +48,9 @@
https://github.com/Microsoft/msbuild/blob/3a9d1d2ae23e41b32a612ea6b0dce531fcf86be7/src/Build/Evaluation/IntrinsicFunctions.cs#L431 https://github.com/Microsoft/msbuild/blob/3a9d1d2ae23e41b32a612ea6b0dce531fcf86be7/src/Build/Evaluation/IntrinsicFunctions.cs#L431
--> -->
<DefaultOSGroup Condition="$([MSBuild]::IsOSPlatform('OSX'))">OSX</DefaultOSGroup> <DefaultOSGroup Condition="$([MSBuild]::IsOSPlatform('OSX'))">OSX</DefaultOSGroup>
<DefaultOSGroup Condition="'$(DefaultOSGroup)'=='' AND $([MSBuild]::IsOSPlatform('FREEBSD'))">FreeBSD</DefaultOSGroup> <DefaultOSGroup Condition="'$(DefaultOSGroup)'=='' and $([MSBuild]::IsOSPlatform('FREEBSD'))">FreeBSD</DefaultOSGroup>
<DefaultOSGroup Condition="'$(DefaultOSGroup)'=='' AND $([MSBuild]::IsOSPlatform('NETBSD'))">NetBSD</DefaultOSGroup> <DefaultOSGroup Condition="'$(DefaultOSGroup)'=='' and $([MSBuild]::IsOSPlatform('NETBSD'))">NetBSD</DefaultOSGroup>
<DefaultOSGroup Condition="'$(DefaultOSGroup)'=='' AND $([MSBuild]::IsOSUnixLike())">Linux</DefaultOSGroup> <DefaultOSGroup Condition="'$(DefaultOSGroup)'=='' and $([MSBuild]::IsOSUnixLike())">Linux</DefaultOSGroup>
<DefaultOSGroup Condition="'$(DefaultOSGroup)'==''">$(OS)</DefaultOSGroup> <DefaultOSGroup Condition="'$(DefaultOSGroup)'==''">$(OS)</DefaultOSGroup>
</PropertyGroup> </PropertyGroup>
...@@ -126,7 +126,7 @@ ...@@ -126,7 +126,7 @@
<_runtimeOSFamily Condition="'$(_runtimeOSVersionIndex)' != '-1'">$(RuntimeOS.SubString(0, $(_runtimeOSVersionIndex)))</_runtimeOSFamily> <_runtimeOSFamily Condition="'$(_runtimeOSVersionIndex)' != '-1'">$(RuntimeOS.SubString(0, $(_runtimeOSVersionIndex)))</_runtimeOSFamily>
<_portableOS>linux</_portableOS> <_portableOS>linux</_portableOS>
<_portableOS Condition="'$(RuntimeOS)' == 'linux-musl'">linux-musl</_portableOS> <_portableOS Condition="'$(RuntimeOS)' == 'linux-musl'">linux-musl</_portableOS>
<_portableOS Condition="'$(_runtimeOSFamily)' == 'win' OR '$(OSGroup)' == 'Windows_NT'">win</_portableOS> <_portableOS Condition="'$(_runtimeOSFamily)' == 'win' or '$(OSGroup)' == 'Windows_NT'">win</_portableOS>
<_portableOS Condition="'$(_runtimeOSFamily)' == 'osx'">osx</_portableOS> <_portableOS Condition="'$(_runtimeOSFamily)' == 'osx'">osx</_portableOS>
<_portableOS Condition="'$(_runtimeOSFamily)' == 'FreeBSD'">freebsd</_portableOS> <_portableOS Condition="'$(_runtimeOSFamily)' == 'FreeBSD'">freebsd</_portableOS>
<_portableOS Condition="'$(RuntimeOS)' == 'WebAssembly'">webassembly</_portableOS> <_portableOS Condition="'$(RuntimeOS)' == 'WebAssembly'">webassembly</_portableOS>
...@@ -138,7 +138,7 @@ ...@@ -138,7 +138,7 @@
<ToolRuntimeRID Condition="'$(BuildingInsideVisualStudio)' == 'true'">$(_runtimeOS)-x64</ToolRuntimeRID> <ToolRuntimeRID Condition="'$(BuildingInsideVisualStudio)' == 'true'">$(_runtimeOS)-x64</ToolRuntimeRID>
<ToolRuntimeRID Condition="'$(ToolRuntimeID)' == ''">$(_runtimeOS)-$(HostArch)</ToolRuntimeRID> <ToolRuntimeRID Condition="'$(ToolRuntimeID)' == ''">$(_runtimeOS)-$(HostArch)</ToolRuntimeRID>
<!-- We build linux-musl-arm on a ubuntu container, so we can't use the toolset build for alpine runtime. We need to use portable linux RID for our toolset in order to be able to use it. --> <!-- We build linux-musl-arm on a ubuntu container, so we can't use the toolset build for alpine runtime. We need to use portable linux RID for our toolset in order to be able to use it. -->
<ToolRuntimeRID Condition="'$(_runtimeOS)' == 'linux-musl' AND $(ArchGroup.StartsWith('arm')) AND !$(HostArch.StartsWith('arm'))">linux-x64</ToolRuntimeRID> <ToolRuntimeRID Condition="'$(_runtimeOS)' == 'linux-musl' and $(ArchGroup.StartsWith('arm')) and !$(HostArch.StartsWith('arm'))">linux-x64</ToolRuntimeRID>
<!-- There are no WebAssembly tools, so use the default ones --> <!-- There are no WebAssembly tools, so use the default ones -->
<_buildingInOSX>$([MSBuild]::IsOSPlatform('OSX'))</_buildingInOSX> <_buildingInOSX>$([MSBuild]::IsOSPlatform('OSX'))</_buildingInOSX>
...@@ -147,10 +147,10 @@ ...@@ -147,10 +147,10 @@
<ToolRuntimeRID Condition="'$(RuntimeOS)' == 'webassembly' and '$(OS)' != 'Windows_NT' and !$(_buildingInOSX)">linux-x64</ToolRuntimeRID> <ToolRuntimeRID Condition="'$(RuntimeOS)' == 'webassembly' and '$(OS)' != 'Windows_NT' and !$(_buildingInOSX)">linux-x64</ToolRuntimeRID>
<!-- support cross-targeting by choosing a RID to restore when running on a different machine that what we're build for --> <!-- support cross-targeting by choosing a RID to restore when running on a different machine that what we're build for -->
<_portableOS Condition="'$(OSGroup)' == 'Unix' and '$(_runtimeOSFamily)' != 'osx' and '$(_runtimeOSFamily)' != 'FreeBSD' AND '$(_runtimeOS)' != 'linux-musl'">linux</_portableOS> <_portableOS Condition="'$(OSGroup)' == 'Unix' and '$(_runtimeOSFamily)' != 'osx' and '$(_runtimeOSFamily)' != 'FreeBSD' and '$(_runtimeOS)' != 'linux-musl'">linux</_portableOS>
<!-- support cross-targeting by choosing a RID to restore when running on a different machine that what we're build for --> <!-- support cross-targeting by choosing a RID to restore when running on a different machine that what we're build for -->
<_portableOS Condition="'$(OSGroup)' == 'Unix' AND '$(_runtimeOSFamily)' != 'osx' AND '$(_runtimeOSFamily)' != 'FreeBSD' AND '$(_runtimeOS)' != 'linux-musl'">linux</_portableOS> <_portableOS Condition="'$(OSGroup)' == 'Unix' and '$(_runtimeOSFamily)' != 'osx' and '$(_runtimeOSFamily)' != 'FreeBSD' and '$(_runtimeOS)' != 'linux-musl'">linux</_portableOS>
<_packageRID /> <_packageRID />
<_packageRID Condition="'$(PortableBuild)' == 'true'">$(_portableOS)-$(ArchGroup)</_packageRID> <_packageRID Condition="'$(PortableBuild)' == 'true'">$(_portableOS)-$(ArchGroup)</_packageRID>
...@@ -167,8 +167,8 @@ ...@@ -167,8 +167,8 @@
<!-- set properties for each vertical --> <!-- set properties for each vertical -->
<PropertyGroup> <PropertyGroup>
<BuildingNETCoreAppVertical Condition="'$(BuildingNETCoreAppVertical)' == '' AND ('$(_bc_TargetGroup)'=='netcoreapp' OR '$(BuildAllConfigurations)' == 'true')">true</BuildingNETCoreAppVertical> <BuildingNETCoreAppVertical Condition="'$(BuildingNETCoreAppVertical)' == '' and ('$(_bc_TargetGroup)'=='netcoreapp' or '$(BuildAllConfigurations)' == 'true')">true</BuildingNETCoreAppVertical>
<BuildingNETFxVertical Condition="'$(BuildingNETFxVertical)' == '' AND ('$(_bc_TargetGroup)'=='netfx' OR '$(BuildAllConfigurations)' == 'true')">true</BuildingNETFxVertical> <BuildingNETFxVertical Condition="'$(BuildingNETFxVertical)' == '' and ('$(_bc_TargetGroup)'=='netfx' or '$(BuildAllConfigurations)' == 'true')">true</BuildingNETFxVertical>
</PropertyGroup> </PropertyGroup>
<!-- <!--
...@@ -194,13 +194,13 @@ ...@@ -194,13 +194,13 @@
<DebugType>portable</DebugType> <DebugType>portable</DebugType>
<!-- Empty DebugType when building for netfx and in windows so that it is set to full or pdbonly later --> <!-- Empty DebugType when building for netfx and in windows so that it is set to full or pdbonly later -->
<DebugType Condition="'$(TargetsNetFx)' == 'true' AND '$(OS)' == 'Windows_NT'" /> <DebugType Condition="'$(TargetsNetFx)' == 'true' and '$(OS)' == 'Windows_NT'" />
<!-- Workaround for codecov issue https://github.com/tonerdo/coverlet/issues/312 --> <!-- Workaround for codecov issue https://github.com/tonerdo/coverlet/issues/312 -->
<EnableSourceLink Condition="'$(ContinuousIntegrationBuild)' != 'true' and '$(OfficialBuildId)' == ''">false</EnableSourceLink> <EnableSourceLink Condition="'$(ContinuousIntegrationBuild)' != 'true' and '$(OfficialBuildId)' == ''">false</EnableSourceLink>
<!-- TODO-NULLABLE: Remove once netstandard has annotations for Debug.Assert, string.IsNullOrEmpty, etc. --> <!-- TODO-NULLABLE: Remove once netstandard has annotations for Debug.Assert, string.IsNullOrEmpty, etc. -->
<NoWarn Condition="'$(TargetsNetFx)' == 'true' OR '$(TargetsNetStandard)' == 'true'">$(NoWarn);nullable</NoWarn> <NoWarn Condition="'$(TargetsNetFx)' == 'true' or '$(TargetsNetStandard)' == 'true'">$(NoWarn);nullable</NoWarn>
</PropertyGroup> </PropertyGroup>
<!-- Set up Default symbol and optimization for Configuration --> <!-- Set up Default symbol and optimization for Configuration -->
...@@ -369,7 +369,7 @@ ...@@ -369,7 +369,7 @@
<EnablePinvokeUWPAnalyzer>false</EnablePinvokeUWPAnalyzer> <EnablePinvokeUWPAnalyzer>false</EnablePinvokeUWPAnalyzer>
</PropertyGroup> </PropertyGroup>
<ItemGroup Condition="'$(IsTestProject)' == 'true' AND '$(IsTestSupportProject)' != 'true'"> <ItemGroup Condition="'$(IsTestProject)' == 'true' and '$(IsTestSupportProject)' != 'true'">
<ProjectReference Include="$(CommonTestPath)\CoreFx.Private.TestUtilities\CoreFx.Private.TestUtilities.csproj" /> <ProjectReference Include="$(CommonTestPath)\CoreFx.Private.TestUtilities\CoreFx.Private.TestUtilities.csproj" />
</ItemGroup> </ItemGroup>
......
...@@ -53,15 +53,15 @@ ...@@ -53,15 +53,15 @@
<!-- Corefx-specific binplacing properties --> <!-- Corefx-specific binplacing properties -->
<PropertyGroup> <PropertyGroup>
<IsRuntimeAssembly Condition="'$(IsRuntimeAssembly)'=='' AND '$(IsReferenceAssembly)' != 'true' AND '$(BinPlaceRef)' != 'true' AND '$(IsTestProject)' != 'true'">true</IsRuntimeAssembly> <IsRuntimeAssembly Condition="'$(IsRuntimeAssembly)'=='' and '$(IsReferenceAssembly)' != 'true' and '$(BinPlaceRef)' != 'true' and '$(IsTestProject)' != 'true'">true</IsRuntimeAssembly>
<!-- Try to determine if this is a simple library without a ref project. <!-- Try to determine if this is a simple library without a ref project.
https://github.com/dotnet/corefx/issues/14291 is tracking cleaning this up --> https://github.com/dotnet/corefx/issues/14291 is tracking cleaning this up -->
<IsRuntimeAndReferenceAssembly Condition="'$(IsRuntimeAndReferenceAssembly)' == '' and '$(IsRuntimeAssembly)' == 'true' and Exists('$(LibrariesProjectRoot)$(MSBuildProjectName)') and !Exists('$(LibrariesProjectRoot)$(MSBuildProjectName)/ref') and !$(MSBuildProjectName.StartsWith('System.Private'))">true</IsRuntimeAndReferenceAssembly> <IsRuntimeAndReferenceAssembly Condition="'$(IsRuntimeAndReferenceAssembly)' == '' and '$(IsRuntimeAssembly)' == 'true' and Exists('$(LibrariesProjectRoot)$(MSBuildProjectName)') and !Exists('$(LibrariesProjectRoot)$(MSBuildProjectName)/ref') and !$(MSBuildProjectName.StartsWith('System.Private'))">true</IsRuntimeAndReferenceAssembly>
<IsNETCoreAppRef Condition="'$(IsNETCoreAppRef)' == ''">$(IsNETCoreApp)</IsNETCoreAppRef> <IsNETCoreAppRef Condition="'$(IsNETCoreAppRef)' == ''">$(IsNETCoreApp)</IsNETCoreAppRef>
<IsNetFxNETStandardRef Condition="'$(IsNetFxNETStandardRef)' == ''">$(IsNetFxNETStandard)</IsNetFxNETStandardRef> <IsNetFxNETStandardRef Condition="'$(IsNetFxNETStandardRef)' == ''">$(IsNetFxNETStandard)</IsNetFxNETStandardRef>
<BinPlaceRef Condition="'$(BinPlaceRef)' == '' And ('$(IsReferenceAssembly)' == 'true' OR '$(IsRuntimeAndReferenceAssembly)' == 'true')">true</BinPlaceRef> <BinPlaceRef Condition="'$(BinPlaceRef)' == '' And ('$(IsReferenceAssembly)' == 'true' or '$(IsRuntimeAndReferenceAssembly)' == 'true')">true</BinPlaceRef>
<BinPlaceRuntime Condition="'$(BinPlaceRuntime)' == '' And ('$(IsRuntimeAssembly)' == 'true' OR '$(IsRuntimeAndReferenceAssembly)' == 'true')">true</BinPlaceRuntime> <BinPlaceRuntime Condition="'$(BinPlaceRuntime)' == '' And ('$(IsRuntimeAssembly)' == 'true' or '$(IsRuntimeAndReferenceAssembly)' == 'true')">true</BinPlaceRuntime>
</PropertyGroup> </PropertyGroup>
<ItemGroup Condition="'@(BinPlaceConfiguration)' == ''"> <ItemGroup Condition="'@(BinPlaceConfiguration)' == ''">
...@@ -71,13 +71,13 @@ ...@@ -71,13 +71,13 @@
<RuntimePath>$(RuntimePath)</RuntimePath> <RuntimePath>$(RuntimePath)</RuntimePath>
</BinPlaceConfiguration> </BinPlaceConfiguration>
<!-- binplace to directories for packages --> <!-- binplace to directories for packages -->
<BinPlaceConfiguration Condition="'$(IsNETCoreApp)' == 'true' AND '$(BuildingNETCoreAppVertical)' == 'true'" Include="netcoreapp-$(_bc_OSGroup)"> <BinPlaceConfiguration Condition="'$(IsNETCoreApp)' == 'true' and '$(BuildingNETCoreAppVertical)' == 'true'" Include="netcoreapp-$(_bc_OSGroup)">
<PackageFileRefPath Condition="'$(IsNETCoreAppRef)' == 'true'">$(NETCoreAppPackageRefPath)</PackageFileRefPath> <PackageFileRefPath Condition="'$(IsNETCoreAppRef)' == 'true'">$(NETCoreAppPackageRefPath)</PackageFileRefPath>
<PackageFileRuntimePath>$(NETCoreAppPackageRuntimePath)</PackageFileRuntimePath> <PackageFileRuntimePath>$(NETCoreAppPackageRuntimePath)</PackageFileRuntimePath>
<RuntimePath Condition="'$(BinPlaceNETCoreAppPackage)' == 'true'">$(NETCoreAppPackageRuntimePath)\..\runtime</RuntimePath> <RuntimePath Condition="'$(BinPlaceNETCoreAppPackage)' == 'true'">$(NETCoreAppPackageRuntimePath)\..\runtime</RuntimePath>
<RefPath Condition="'$(BinPlaceNETCoreAppPackage)' == 'true' AND '$(IsNETCoreAppRef)' == 'true'">$(RefRootPath)microsoft.netcore.app</RefPath> <RefPath Condition="'$(BinPlaceNETCoreAppPackage)' == 'true' and '$(IsNETCoreAppRef)' == 'true'">$(RefRootPath)microsoft.netcore.app</RefPath>
<!-- enable trimming for any runtime project that's part of the shared framework and hasn't already set ILLinkTrimAssembly --> <!-- enable trimming for any runtime project that's part of the shared framework and hasn't already set ILLinkTrimAssembly -->
<SetProperties Condition="'$(BinPlaceRuntime)' == 'true' AND '$(ILLinkTrimAssembly)' == ''">ILLinkTrimAssembly=true</SetProperties> <SetProperties Condition="'$(BinPlaceRuntime)' == 'true' and '$(ILLinkTrimAssembly)' == ''">ILLinkTrimAssembly=true</SetProperties>
</BinPlaceConfiguration> </BinPlaceConfiguration>
<!-- Setup the shared framework directory for testing --> <!-- Setup the shared framework directory for testing -->
......
...@@ -4,11 +4,11 @@ ...@@ -4,11 +4,11 @@
<NoWarn>$(NoWarn);CS1573</NoWarn> <NoWarn>$(NoWarn);CS1573</NoWarn>
<DefineConstants>$(DefineConstants);REGISTRY_ASSEMBLY</DefineConstants> <DefineConstants>$(DefineConstants);REGISTRY_ASSEMBLY</DefineConstants>
<IsPartialFacadeAssembly Condition="'$(TargetsNetFx)' == 'true'">true</IsPartialFacadeAssembly> <IsPartialFacadeAssembly Condition="'$(TargetsNetFx)' == 'true'">true</IsPartialFacadeAssembly>
<GeneratePlatformNotSupportedAssemblyMessage Condition="'$(OSGroup)' == 'AnyOS' AND '$(TargetsNetStandard)' == 'true'">SR.PlatformNotSupported_Registry</GeneratePlatformNotSupportedAssemblyMessage> <GeneratePlatformNotSupportedAssemblyMessage Condition="'$(OSGroup)' == 'AnyOS' and '$(TargetsNetStandard)' == 'true'">SR.PlatformNotSupported_Registry</GeneratePlatformNotSupportedAssemblyMessage>
<NoWarn Condition="'$(TargetsUnix)' == 'true'">$(NoWarn);CA1823</NoWarn> <!-- Avoid unused fields warnings in Unix build --> <NoWarn Condition="'$(TargetsUnix)' == 'true'">$(NoWarn);CA1823</NoWarn> <!-- Avoid unused fields warnings in Unix build -->
<Configurations>net461-Windows_NT-Debug;net461-Windows_NT-Release;netcoreapp-Unix-Debug;netcoreapp-Unix-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release;netfx-Windows_NT-Debug;netfx-Windows_NT-Release;netstandard2.0-Debug;netstandard2.0-Release;netstandard2.0-Unix-Debug;netstandard2.0-Unix-Release;netstandard2.0-Windows_NT-Debug;netstandard2.0-Windows_NT-Release</Configurations> <Configurations>net461-Windows_NT-Debug;net461-Windows_NT-Release;netcoreapp-Unix-Debug;netcoreapp-Unix-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release;netfx-Windows_NT-Debug;netfx-Windows_NT-Release;netstandard2.0-Debug;netstandard2.0-Release;netstandard2.0-Unix-Debug;netstandard2.0-Unix-Release;netstandard2.0-Windows_NT-Debug;netstandard2.0-Windows_NT-Release</Configurations>
</PropertyGroup> </PropertyGroup>
<ItemGroup Condition="'$(TargetsNetFx)' != 'true' AND '$(OSGroup)' != 'AnyOS'"> <ItemGroup Condition="'$(TargetsNetFx)' != 'true' and '$(OSGroup)' != 'AnyOS'">
<Compile Include="$(CommonPath)\CoreLib\Interop\Windows\Advapi32\Interop.RegistryConstants.cs"> <Compile Include="$(CommonPath)\CoreLib\Interop\Windows\Advapi32\Interop.RegistryConstants.cs">
<Link>Common\CoreLib\Interop\Windows\Advapi32\Interop.RegistryConstants.cs</Link> <Link>Common\CoreLib\Interop\Windows\Advapi32\Interop.RegistryConstants.cs</Link>
</Compile> </Compile>
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
<Compile Include="System\Security\AccessControl\RegistryRights.cs" /> <Compile Include="System\Security\AccessControl\RegistryRights.cs" />
<Compile Include="System\Security\AccessControl\RegistrySecurity.cs" /> <Compile Include="System\Security\AccessControl\RegistrySecurity.cs" />
</ItemGroup> </ItemGroup>
<ItemGroup Condition="'$(TargetsNetFx)' != 'true' AND '$(TargetsWindows)' == 'true'"> <ItemGroup Condition="'$(TargetsNetFx)' != 'true' and '$(TargetsWindows)' == 'true'">
<Compile Include="$(CommonPath)\Interop\Windows\Interop.Libraries.cs"> <Compile Include="$(CommonPath)\Interop\Windows\Interop.Libraries.cs">
<Link>Common\Interop\Windows\Interop.Libraries.cs</Link> <Link>Common\Interop\Windows\Interop.Libraries.cs</Link>
</Compile> </Compile>
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<PropertyGroup> <PropertyGroup>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks> <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<IsPartialFacadeAssembly Condition="'$(TargetsNetFx)' == 'true'">true</IsPartialFacadeAssembly> <IsPartialFacadeAssembly Condition="'$(TargetsNetFx)' == 'true'">true</IsPartialFacadeAssembly>
<GeneratePlatformNotSupportedAssemblyMessage Condition="'$(TargetsNetStandard)' == 'true' AND '$(OSGroup)' == 'AnyOS'">SR.PlatformNotSupported_SystemEvents</GeneratePlatformNotSupportedAssemblyMessage> <GeneratePlatformNotSupportedAssemblyMessage Condition="'$(TargetsNetStandard)' == 'true' and '$(OSGroup)' == 'AnyOS'">SR.PlatformNotSupported_SystemEvents</GeneratePlatformNotSupportedAssemblyMessage>
<Configurations>net461-Debug;net461-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release;netcoreapp2.0-Windows_NT-Debug;netcoreapp2.0-Windows_NT-Release;netcoreapp3.0-Windows_NT-Debug;netcoreapp3.0-Windows_NT-Release;netfx-Debug;netfx-Release;netstandard2.0-Debug;netstandard2.0-Release</Configurations> <Configurations>net461-Debug;net461-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release;netcoreapp2.0-Windows_NT-Debug;netcoreapp2.0-Windows_NT-Release;netcoreapp3.0-Windows_NT-Debug;netcoreapp3.0-Windows_NT-Release;netfx-Debug;netfx-Release;netstandard2.0-Debug;netstandard2.0-Release</Configurations>
</PropertyGroup> </PropertyGroup>
<ItemGroup Condition="'$(TargetsWindows)' == 'true' "> <ItemGroup Condition="'$(TargetsWindows)' == 'true' ">
......
...@@ -36,8 +36,8 @@ ...@@ -36,8 +36,8 @@
<Message Text="Running Serialization Tool" Importance="normal" /> <Message Text="Running Serialization Tool" Importance="normal" />
<Exec Command="dotnet Microsoft.XmlSerializer.Generator &quot;$(IntermediateOutputPath)$(AssemblyName)$(TargetExt)&quot; --force --quiet $(_SgenRspFilePath)" ContinueOnError="true"/> <Exec Command="dotnet Microsoft.XmlSerializer.Generator &quot;$(IntermediateOutputPath)$(AssemblyName)$(TargetExt)&quot; --force --quiet $(_SgenRspFilePath)" ContinueOnError="true"/>
<Warning Condition="Exists('$(_SerializerCsIntermediateFolder)') != 'true'" Text="$(_SGenWarningText)" /> <Warning Condition="Exists('$(_SerializerCsIntermediateFolder)') != 'true'" Text="$(_SGenWarningText)" />
<Csc Condition="Exists('$(_SerializerCsIntermediateFolder)') AND !Exists('$(_CscRspFilePath)')" ContinueOnError="true" OutputAssembly="$(_SerializerDllIntermediateFolder)" References="@(ReferencePath);@(IntermediateAssembly)" EmitDebugInformation="$(DebugSymbols)" Sources="$(_SerializerCsIntermediateFolder)" TargetType="Library" ToolExe="$(CscToolExe)" ToolPath="$(CscToolPath)" DisabledWarnings="$(_SerializationAssemblyDisabledWarnings)"/> <Csc Condition="Exists('$(_SerializerCsIntermediateFolder)') and !Exists('$(_CscRspFilePath)')" ContinueOnError="true" OutputAssembly="$(_SerializerDllIntermediateFolder)" References="@(ReferencePath);@(IntermediateAssembly)" EmitDebugInformation="$(DebugSymbols)" Sources="$(_SerializerCsIntermediateFolder)" TargetType="Library" ToolExe="$(CscToolExe)" ToolPath="$(CscToolPath)" DisabledWarnings="$(_SerializationAssemblyDisabledWarnings)"/>
<Csc Condition="Exists('$(_SerializerCsIntermediateFolder)') AND Exists('$(_CscRspFilePath)')" ContinueOnError="true" OutputAssembly="$(_SerializerDllIntermediateFolder)" References="@(ReferencePath);@(IntermediateAssembly)" EmitDebugInformation="$(DebugSymbols)" Sources="$(_SerializerCsIntermediateFolder)" TargetType="Library" ResponseFiles="$(_CscRspFilePath)" ToolExe="$(CscToolExe)" ToolPath="$(CscToolPath)" DisabledWarnings="$(_SerializationAssemblyDisabledWarnings)"/> <Csc Condition="Exists('$(_SerializerCsIntermediateFolder)') and Exists('$(_CscRspFilePath)')" ContinueOnError="true" OutputAssembly="$(_SerializerDllIntermediateFolder)" References="@(ReferencePath);@(IntermediateAssembly)" EmitDebugInformation="$(DebugSymbols)" Sources="$(_SerializerCsIntermediateFolder)" TargetType="Library" ResponseFiles="$(_CscRspFilePath)" ToolExe="$(CscToolExe)" ToolPath="$(CscToolPath)" DisabledWarnings="$(_SerializationAssemblyDisabledWarnings)"/>
<Warning Condition="Exists('$(_SerializerDllIntermediateFolder)') != 'true' And Exists('$(_SerializerCsIntermediateFolder)') == 'true'" Text="$(_SGenWarningText)"/> <Warning Condition="Exists('$(_SerializerDllIntermediateFolder)') != 'true' And Exists('$(_SerializerCsIntermediateFolder)') == 'true'" Text="$(_SGenWarningText)"/>
<Copy Condition="Exists('$(_SerializerDllIntermediateFolder)') == 'true'" SourceFiles="$(_SerializerDllIntermediateFolder)" DestinationFolder="$(OutputPath)" /> <Copy Condition="Exists('$(_SerializerDllIntermediateFolder)') == 'true'" SourceFiles="$(_SerializerDllIntermediateFolder)" DestinationFolder="$(OutputPath)" />
<Delete Condition="Exists('$(_SgenRspFilePath)')" Files="$(_SgenRspFilePath)" /> <Delete Condition="Exists('$(_SgenRspFilePath)')" Files="$(_SgenRspFilePath)" />
......
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
<!-- We don't have any native components when building for netfx. --> <!-- We don't have any native components when building for netfx. -->
<Target Name="BuildNativeWindows" <Target Name="BuildNativeWindows"
Condition="'$(OS)' == 'Windows_NT' AND '$(TargetsNetFx)' != 'true'"> Condition="'$(OS)' == 'Windows_NT' and '$(TargetsNetFx)' != 'true'">
<PropertyGroup> <PropertyGroup>
<_BuildNativeWindowsArgs>$(_BuildNativeArgs)</_BuildNativeWindowsArgs> <_BuildNativeWindowsArgs>$(_BuildNativeArgs)</_BuildNativeWindowsArgs>
......
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
<NonWindowsSymbolFile Include="@(NativeDylibFile -> '%(Identity).dwarf')" /> <NonWindowsSymbolFile Include="@(NativeDylibFile -> '%(Identity).dwarf')" />
<ExistingWindowsSymbolFile Include="@(WindowsSymbolFile)" Condition="Exists('%(Identity)')" /> <ExistingWindowsSymbolFile Include="@(WindowsSymbolFile)" Condition="Exists('%(Identity)')" />
<ExistingNonWindowsSymbolFile Include="@(NonWindowsSymbolFile)" Condition="Exists('%(Identity)') AND '$(SkipPackagingXplatSymbols)'!='true'" /> <ExistingNonWindowsSymbolFile Include="@(NonWindowsSymbolFile)" Condition="Exists('%(Identity)') and '$(SkipPackagingXplatSymbols)'!='true'" />
<File Include="@(ExistingWindowsSymbolFile);@(ExistingNonWindowsSymbolFile)"> <File Include="@(ExistingWindowsSymbolFile);@(ExistingNonWindowsSymbolFile)">
<IsSymbolFile>true</IsSymbolFile> <IsSymbolFile>true</IsSymbolFile>
...@@ -46,11 +46,11 @@ ...@@ -46,11 +46,11 @@
</ItemGroup> </ItemGroup>
<PropertyGroup> <PropertyGroup>
<NeedsPlaceholderPdb Condition="'@(ExistingNonWindowsSymbolFile)'!='' AND '@(ExistingWindowsSymbolFile)'==''">true</NeedsPlaceholderPdb> <NeedsPlaceholderPdb Condition="'@(ExistingNonWindowsSymbolFile)'!='' and '@(ExistingWindowsSymbolFile)'==''">true</NeedsPlaceholderPdb>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<File Include="$(MSBuildThisFileDirectory)\_.pdb" Condition="'$(NeedsPlaceholderPdb)'=='true' AND '$(PackageTargetRuntime)'!=''"> <File Include="$(MSBuildThisFileDirectory)\_.pdb" Condition="'$(NeedsPlaceholderPdb)'=='true' and '$(PackageTargetRuntime)'!=''">
<TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath>
<IsSymbolFile>true</IsSymbolFile> <IsSymbolFile>true</IsSymbolFile>
</File> </File>
......
...@@ -121,7 +121,7 @@ ...@@ -121,7 +121,7 @@
<Link>Common\Interop\Interop.Odbc.cs</Link> <Link>Common\Interop\Interop.Odbc.cs</Link>
</Compile> </Compile>
</ItemGroup> </ItemGroup>
<ItemGroup Condition="'$(TargetsLinux)' == 'true' OR '$(TargetsFreeBSD)' == 'true'"> <ItemGroup Condition="'$(TargetsLinux)' == 'true' or '$(TargetsFreeBSD)' == 'true'">
<Compile Include="$(CommonPath)\Interop\Linux\Interop.Libraries.cs"> <Compile Include="$(CommonPath)\Interop\Linux\Interop.Libraries.cs">
<Link>Common\Interop\Linux\Interop.Libraries.cs</Link> <Link>Common\Interop\Linux\Interop.Libraries.cs</Link>
</Compile> </Compile>
......
...@@ -3,11 +3,11 @@ ...@@ -3,11 +3,11 @@
<AllowUnsafeBlocks>true</AllowUnsafeBlocks> <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<NoWarn>$(NoWarn);CS1573</NoWarn> <NoWarn>$(NoWarn);CS1573</NoWarn>
<IsPartialFacadeAssembly Condition="'$(TargetsNetFx)' == 'true'">true</IsPartialFacadeAssembly> <IsPartialFacadeAssembly Condition="'$(TargetsNetFx)' == 'true'">true</IsPartialFacadeAssembly>
<GeneratePlatformNotSupportedAssemblyMessage Condition="'$(OSGroup)' == 'AnyOS' AND '$(TargetsNetStandard)' == 'true'">SR.PlatformNotSupported_OleDb</GeneratePlatformNotSupportedAssemblyMessage> <GeneratePlatformNotSupportedAssemblyMessage Condition="'$(OSGroup)' == 'AnyOS' and '$(TargetsNetStandard)' == 'true'">SR.PlatformNotSupported_OleDb</GeneratePlatformNotSupportedAssemblyMessage>
<Configurations>net461-Windows_NT-Debug;net461-Windows_NT-Release;netfx-Windows_NT-Debug;netfx-Windows_NT-Release;netstandard2.0-Debug;netstandard2.0-Release;netstandard2.0-Windows_NT-Debug;netstandard2.0-Windows_NT-Release</Configurations> <Configurations>net461-Windows_NT-Debug;net461-Windows_NT-Release;netfx-Windows_NT-Debug;netfx-Windows_NT-Release;netstandard2.0-Debug;netstandard2.0-Release;netstandard2.0-Windows_NT-Debug;netstandard2.0-Windows_NT-Release</Configurations>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks> <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup> </PropertyGroup>
<ItemGroup Condition="'$(TargetsNetFx)' != 'true' AND '$(TargetsWindows)' == 'true'"> <ItemGroup Condition="'$(TargetsNetFx)' != 'true' and '$(TargetsWindows)' == 'true'">
<Compile Include="$(CommonPath)\Interop\Windows\Interop.Libraries.cs"> <Compile Include="$(CommonPath)\Interop\Windows\Interop.Libraries.cs">
<Link>Common\Interop\Windows\Interop.Libraries.cs</Link> <Link>Common\Interop\Windows\Interop.Libraries.cs</Link>
</Compile> </Compile>
......
...@@ -12,14 +12,14 @@ ...@@ -12,14 +12,14 @@
<Configurations>net461-Windows_NT-Debug;net461-Windows_NT-Release;netcoreapp-Debug;netcoreapp-Release;netcoreapp-Unix-Debug;netcoreapp-Unix-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release;netcoreapp2.1-Debug;netcoreapp2.1-Release;netcoreapp2.1-Unix-Debug;netcoreapp2.1-Unix-Release;netcoreapp2.1-Windows_NT-Debug;netcoreapp2.1-Windows_NT-Release;netfx-Windows_NT-Debug;netfx-Windows_NT-Release;netstandard2.0-Debug;netstandard2.0-Release;netstandard2.0-Unix-Debug;netstandard2.0-Unix-Release;netstandard2.0-Windows_NT-Debug;netstandard2.0-Windows_NT-Release;netstandard1.2-Debug;netstandard1.2-Release;netstandard1.3-Debug;netstandard1.3-Release</Configurations> <Configurations>net461-Windows_NT-Debug;net461-Windows_NT-Release;netcoreapp-Debug;netcoreapp-Release;netcoreapp-Unix-Debug;netcoreapp-Unix-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release;netcoreapp2.1-Debug;netcoreapp2.1-Release;netcoreapp2.1-Unix-Debug;netcoreapp2.1-Unix-Release;netcoreapp2.1-Windows_NT-Debug;netcoreapp2.1-Windows_NT-Release;netfx-Windows_NT-Debug;netfx-Windows_NT-Release;netstandard2.0-Debug;netstandard2.0-Release;netstandard2.0-Unix-Debug;netstandard2.0-Unix-Release;netstandard2.0-Windows_NT-Debug;netstandard2.0-Windows_NT-Release;netstandard1.2-Debug;netstandard1.2-Release;netstandard1.3-Debug;netstandard1.3-Release</Configurations>
<Nullable>annotations</Nullable> <Nullable>annotations</Nullable>
</PropertyGroup> </PropertyGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0' OR '$(TargetsNetCoreApp)' == 'true'"> <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0' or '$(TargetsNetCoreApp)' == 'true'">
<Compile Include="System.Data.SqlClient.TypeForwards.cs" /> <Compile Include="System.Data.SqlClient.TypeForwards.cs" />
</ItemGroup> </ItemGroup>
<ItemGroup Condition="'$(IsPartialFacadeAssembly)' != 'true' AND '$(OSGroup)' != 'AnyOS' AND '$(TargetsNetCoreApp)' == 'true'"> <ItemGroup Condition="'$(IsPartialFacadeAssembly)' != 'true' and '$(OSGroup)' != 'AnyOS' and '$(TargetsNetCoreApp)' == 'true'">
<Compile Include="System\Data\SqlClient\PoolBlockingPeriod.cs" /> <Compile Include="System\Data\SqlClient\PoolBlockingPeriod.cs" />
<Compile Include="Microsoft\SqlServer\Server\SqlFacetAttribute.cs" /> <Compile Include="Microsoft\SqlServer\Server\SqlFacetAttribute.cs" />
</ItemGroup> </ItemGroup>
<ItemGroup Condition="'$(IsPartialFacadeAssembly)' != 'true' AND '$(OSGroup)' != 'AnyOS'"> <ItemGroup Condition="'$(IsPartialFacadeAssembly)' != 'true' and '$(OSGroup)' != 'AnyOS'">
<Compile Include="Microsoft\SqlServer\Server\ITypedGetters.cs" /> <Compile Include="Microsoft\SqlServer\Server\ITypedGetters.cs" />
<Compile Include="Microsoft\SqlServer\Server\ITypedGettersV3.cs" /> <Compile Include="Microsoft\SqlServer\Server\ITypedGettersV3.cs" />
<Compile Include="Microsoft\SqlServer\Server\ITypedSetters.cs" /> <Compile Include="Microsoft\SqlServer\Server\ITypedSetters.cs" />
...@@ -213,11 +213,11 @@ ...@@ -213,11 +213,11 @@
<Compile Include="System\Data\SqlClient\SqlCredential.cs" /> <Compile Include="System\Data\SqlClient\SqlCredential.cs" />
</ItemGroup> </ItemGroup>
<!-- SqlFileStream Unix Netcoreapp only --> <!-- SqlFileStream Unix Netcoreapp only -->
<ItemGroup Condition="'$(TargetsNetCoreApp)' == 'true' AND '$(TargetsUnix)' == 'true'"> <ItemGroup Condition="'$(TargetsNetCoreApp)' == 'true' and '$(TargetsUnix)' == 'true'">
<Compile Include="System\Data\SqlClient\SqlFileStream.Unsupported.cs" /> <Compile Include="System\Data\SqlClient\SqlFileStream.Unsupported.cs" />
</ItemGroup> </ItemGroup>
<!-- SqlFileStream Windows Netcoreapp only --> <!-- SqlFileStream Windows Netcoreapp only -->
<ItemGroup Condition="'$(TargetsNetCoreApp)' == 'true' AND '$(TargetsWindows)' == 'true'"> <ItemGroup Condition="'$(TargetsNetCoreApp)' == 'true' and '$(TargetsWindows)' == 'true'">
<Compile Include="$(CommonPath)\CoreLib\Interop\Windows\Kernel32\Interop.FileTypes.cs"> <Compile Include="$(CommonPath)\CoreLib\Interop\Windows\Kernel32\Interop.FileTypes.cs">
<Link>Common\CoreLib\Interop\Windows\Kernel32\Interop.FileTypes.cs</Link> <Link>Common\CoreLib\Interop\Windows\Kernel32\Interop.FileTypes.cs</Link>
</Compile> </Compile>
...@@ -274,7 +274,7 @@ ...@@ -274,7 +274,7 @@
</Compile> </Compile>
<Compile Include="System\Data\SqlClient\SqlFileStream.Windows.cs" /> <Compile Include="System\Data\SqlClient\SqlFileStream.Windows.cs" />
</ItemGroup> </ItemGroup>
<ItemGroup Condition="'$(IsPartialFacadeAssembly)' != 'true' AND '$(OSGroup)' != 'AnyOS' AND '$(TargetsNetCoreApp)' == 'true'"> <ItemGroup Condition="'$(IsPartialFacadeAssembly)' != 'true' and '$(OSGroup)' != 'AnyOS' and '$(TargetsNetCoreApp)' == 'true'">
<Compile Include="System\Data\Common\DbConnectionStringCommon.NetCoreApp.cs" /> <Compile Include="System\Data\Common\DbConnectionStringCommon.NetCoreApp.cs" />
<Compile Include="System\Data\ProviderBase\DbConnectionPool.NetCoreApp.cs" /> <Compile Include="System\Data\ProviderBase\DbConnectionPool.NetCoreApp.cs" />
<Compile Include="System\Data\SqlClient\SqlConnectionString.NetCoreApp.cs" /> <Compile Include="System\Data\SqlClient\SqlConnectionString.NetCoreApp.cs" />
...@@ -283,13 +283,13 @@ ...@@ -283,13 +283,13 @@
<Compile Include="System\Data\SqlClient\TdsParser.NetCoreApp.cs" /> <Compile Include="System\Data\SqlClient\TdsParser.NetCoreApp.cs" />
<Compile Include="System\Data\SqlClient\SNI\SNIPacket.NetCoreApp.cs" /> <Compile Include="System\Data\SqlClient\SNI\SNIPacket.NetCoreApp.cs" />
</ItemGroup> </ItemGroup>
<ItemGroup Condition="'$(IsPartialFacadeAssembly)' != 'true' AND '$(OSGroup)' != 'AnyOS' AND '$(TargetsNetCoreApp)' != 'true'"> <ItemGroup Condition="'$(IsPartialFacadeAssembly)' != 'true' and '$(OSGroup)' != 'AnyOS' and '$(TargetsNetCoreApp)' != 'true'">
<Compile Include="System\Data\SqlClient\SqlDelegatedTransaction.NetStandard.cs" /> <Compile Include="System\Data\SqlClient\SqlDelegatedTransaction.NetStandard.cs" />
<Compile Include="System\Data\SqlClient\TdsParser.NetStandard.cs" /> <Compile Include="System\Data\SqlClient\TdsParser.NetStandard.cs" />
<Compile Include="System\Data\SqlClient\SNI\SNIPacket.NetStandard.cs" /> <Compile Include="System\Data\SqlClient\SNI\SNIPacket.NetStandard.cs" />
</ItemGroup> </ItemGroup>
<!-- Manage the SNI toggle for Windows netstandard and UWP --> <!-- Manage the SNI toggle for Windows netstandard and UWP -->
<ItemGroup Condition="('$(TargetFramework)' == 'netstandard2.0' OR '$(TargetsNetCoreApp)' == 'true') AND '$(TargetsWindows)' == 'true'"> <ItemGroup Condition="('$(TargetFramework)' == 'netstandard2.0' or '$(TargetsNetCoreApp)' == 'true') and '$(TargetsWindows)' == 'true'">
<!-- Manage the SNI toggle for Windows netstandard and UWP --> <!-- Manage the SNI toggle for Windows netstandard and UWP -->
<Compile Include="System\Data\SqlClient\SNI\SNITcpHandle.Windows.cs" /> <Compile Include="System\Data\SqlClient\SNI\SNITcpHandle.Windows.cs" />
<Compile Include="System\Data\SqlClient\TdsParserStateObjectFactory.Windows.cs" /> <Compile Include="System\Data\SqlClient\TdsParserStateObjectFactory.Windows.cs" />
...@@ -424,7 +424,7 @@ ...@@ -424,7 +424,7 @@
</Compile> </Compile>
</ItemGroup> </ItemGroup>
<!-- Common (Windows and Unix) dependencies for MANAGED_SNI build --> <!-- Common (Windows and Unix) dependencies for MANAGED_SNI build -->
<ItemGroup Condition="'$(IsPartialFacadeAssembly)' != 'true' AND '$(OSGroup)' != 'AnyOS'"> <ItemGroup Condition="'$(IsPartialFacadeAssembly)' != 'true' and '$(OSGroup)' != 'AnyOS'">
<Reference Include="System.Memory" /> <Reference Include="System.Memory" />
<Compile Include="$(CommonPath)\System\Net\ContextFlagsPal.cs"> <Compile Include="$(CommonPath)\System\Net\ContextFlagsPal.cs">
<Link>Common\System\Net\ContextFlagsPal.cs</Link> <Link>Common\System\Net\ContextFlagsPal.cs</Link>
...@@ -451,7 +451,7 @@ ...@@ -451,7 +451,7 @@
<Link>Common\System\Net\NegotiationInfoClass.cs</Link> <Link>Common\System\Net\NegotiationInfoClass.cs</Link>
</Compile> </Compile>
</ItemGroup> </ItemGroup>
<ItemGroup Condition=" '$(TargetsWindows)' != 'true' And '$(IsPartialFacadeAssembly)' != 'true' AND '$(OSGroup)' != 'AnyOS'"> <ItemGroup Condition=" '$(TargetsWindows)' != 'true' And '$(IsPartialFacadeAssembly)' != 'true' and '$(OSGroup)' != 'AnyOS'">
<Compile Include="System\Data\ProviderBase\DbConnectionPoolIdentity.Unix.cs" /> <Compile Include="System\Data\ProviderBase\DbConnectionPoolIdentity.Unix.cs" />
<Compile Include="Interop\SNINativeMethodWrapper.Unix.cs" /> <Compile Include="Interop\SNINativeMethodWrapper.Unix.cs" />
<Compile Include="$(CommonPath)\System\Net\Security\NegotiateStreamPal.Unix.cs"> <Compile Include="$(CommonPath)\System\Net\Security\NegotiateStreamPal.Unix.cs">
...@@ -513,7 +513,7 @@ ...@@ -513,7 +513,7 @@
<Reference Include="System.Threading.Tasks" /> <Reference Include="System.Threading.Tasks" />
<Reference Include="System.Xml.ReaderWriter" /> <Reference Include="System.Xml.ReaderWriter" />
</ItemGroup> </ItemGroup>
<ItemGroup Condition="'$(IsPartialFacadeAssembly)' != 'true' AND '$(OSGroup)' != 'AnyOS'"> <ItemGroup Condition="'$(IsPartialFacadeAssembly)' != 'true' and '$(OSGroup)' != 'AnyOS'">
<Reference Include="Microsoft.Win32.Primitives" /> <Reference Include="Microsoft.Win32.Primitives" />
<Reference Include="System.Buffers" /> <Reference Include="System.Buffers" />
<Reference Include="System.Collections" /> <Reference Include="System.Collections" />
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<CLSCompliant>false</CLSCompliant> <CLSCompliant>false</CLSCompliant>
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(TargetGroup)' == 'net45' OR '$(TargetGroup)' == 'netfx'"> <PropertyGroup Condition="'$(TargetGroup)' == 'net45' or '$(TargetGroup)' == 'netfx'">
<DefineConstants>$(DefineConstants);ALLOW_PARTIALLY_TRUSTED_CALLERS</DefineConstants> <DefineConstants>$(DefineConstants);ALLOW_PARTIALLY_TRUSTED_CALLERS</DefineConstants>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
<Compile Include="System.Diagnostics.DiagnosticSourceActivity.cs" /> <Compile Include="System.Diagnostics.DiagnosticSourceActivity.cs" />
<Reference Include="System.Memory" /> <Reference Include="System.Memory" />
</ItemGroup> </ItemGroup>
<ItemGroup Condition="'$(TargetGroup)' == 'net45' OR '$(TargetGroup)' == 'netfx'"> <ItemGroup Condition="'$(TargetGroup)' == 'net45' or '$(TargetGroup)' == 'netfx'">
<Reference Include="mscorlib" /> <Reference Include="mscorlib" />
</ItemGroup> </ItemGroup>
......
...@@ -9,9 +9,9 @@ ...@@ -9,9 +9,9 @@
<CLSCompliant>false</CLSCompliant> <CLSCompliant>false</CLSCompliant>
<NoWarn>$(NoWarn);SA1205</NoWarn> <NoWarn>$(NoWarn);SA1205</NoWarn>
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
<DefineConstants Condition="'$(TargetFramework)' == 'netstandard1.1' OR '$(TargetFramework)' == 'net45'">$(DefineConstants);NO_EVENTSOURCE_COMPLEX_TYPE_SUPPORT</DefineConstants> <DefineConstants Condition="'$(TargetFramework)' == 'netstandard1.1' or '$(TargetFramework)' == 'net45'">$(DefineConstants);NO_EVENTSOURCE_COMPLEX_TYPE_SUPPORT</DefineConstants>
<DefineConstants Condition="'$(TargetFramework)' != 'netstandard1.1'">$(DefineConstants);EVENTSOURCE_ACTIVITY_SUPPORT</DefineConstants> <DefineConstants Condition="'$(TargetFramework)' != 'netstandard1.1'">$(DefineConstants);EVENTSOURCE_ACTIVITY_SUPPORT</DefineConstants>
<DefineConstants Condition="'$(TargetFramework)' != 'netstandard1.1' AND '$(TargetFramework)' != 'netstandard1.3'">$(DefineConstants);EVENTSOURCE_ENUMERATE_SUPPORT</DefineConstants> <DefineConstants Condition="'$(TargetFramework)' != 'netstandard1.1' and '$(TargetFramework)' != 'netstandard1.3'">$(DefineConstants);EVENTSOURCE_ENUMERATE_SUPPORT</DefineConstants>
<DefineConstants Condition="'$(TargetsNetFx)' == 'true'">$(DefineConstants);ALLOW_PARTIALLY_TRUSTED_CALLERS;ENABLE_HTTP_HANDLER</DefineConstants> <DefineConstants Condition="'$(TargetsNetFx)' == 'true'">$(DefineConstants);ALLOW_PARTIALLY_TRUSTED_CALLERS;ENABLE_HTTP_HANDLER</DefineConstants>
<Configurations>net45-Debug;net45-Release;net46-Debug;net46-Release;netcoreapp-Debug;netcoreapp-Release;netfx-Debug;netfx-Release;netstandard2.0-Debug;netstandard2.0-Release;netstandard1.1-Debug;netstandard1.1-Release;netstandard1.3-Debug;netstandard1.3-Release</Configurations> <Configurations>net45-Debug;net45-Release;net46-Debug;net46-Release;netcoreapp-Debug;netcoreapp-Release;netfx-Debug;netfx-Release;netstandard2.0-Debug;netstandard2.0-Release;netstandard1.1-Debug;netstandard1.1-Release;netstandard1.3-Debug;netstandard1.3-Release</Configurations>
</PropertyGroup> </PropertyGroup>
...@@ -39,13 +39,13 @@ ...@@ -39,13 +39,13 @@
<TargetingPackReference Include="System" /> <TargetingPackReference Include="System" />
<TargetingPackReference Include="System.Runtime.Remoting" /> <TargetingPackReference Include="System.Runtime.Remoting" />
</ItemGroup> </ItemGroup>
<ItemGroup Condition=" '$(TargetsNetCoreApp)' == 'true' OR '$(TargetFramework)' == 'netstandard1.1' or '$(TargetFramework)' == 'netstandard1.3' or '$(TargetFramework)' == 'netstandard2.0'"> <ItemGroup Condition=" '$(TargetsNetCoreApp)' == 'true' or '$(TargetFramework)' == 'netstandard1.1' or '$(TargetFramework)' == 'netstandard1.3' or '$(TargetFramework)' == 'netstandard2.0'">
<Compile Include="System\Diagnostics\Activity.DateTime.corefx.cs" /> <Compile Include="System\Diagnostics\Activity.DateTime.corefx.cs" />
</ItemGroup> </ItemGroup>
<ItemGroup Condition=" '$(TargetsNetCoreApp)' == 'true' OR '$(TargetFramework)' == 'netstandard2.1'"> <ItemGroup Condition=" '$(TargetsNetCoreApp)' == 'true' or '$(TargetFramework)' == 'netstandard2.1'">
<Compile Include="System\Diagnostics\Activity.GenerateRootId.netcoreapp.cs" /> <Compile Include="System\Diagnostics\Activity.GenerateRootId.netcoreapp.cs" />
</ItemGroup> </ItemGroup>
<ItemGroup Condition=" '$(TargetsNetCoreApp)' != 'true' AND '$(TargetFramework)' != 'netstandard2.1' and '$(TargetFramework)' != 'netstandard1.1'"> <ItemGroup Condition=" '$(TargetsNetCoreApp)' != 'true' and '$(TargetFramework)' != 'netstandard2.1' and '$(TargetFramework)' != 'netstandard1.1'">
<Compile Include="System\Diagnostics\Activity.GenerateRootId.netfx.cs" /> <Compile Include="System\Diagnostics\Activity.GenerateRootId.netfx.cs" />
</ItemGroup> </ItemGroup>
<ItemGroup Condition="'$(TargetsNetFx)' == 'true'"> <ItemGroup Condition="'$(TargetsNetFx)' == 'true'">
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<NoWarn>$(NoWarn);CS1573</NoWarn> <NoWarn>$(NoWarn);CS1573</NoWarn>
<Configurations>netcoreapp-FreeBSD-Debug;netcoreapp-FreeBSD-Release;netcoreapp-Linux-Debug;netcoreapp-Linux-Release;netcoreapp-OSX-Debug;netcoreapp-OSX-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release</Configurations> <Configurations>netcoreapp-FreeBSD-Debug;netcoreapp-FreeBSD-Release;netcoreapp-Linux-Debug;netcoreapp-Linux-Release;netcoreapp-OSX-Debug;netcoreapp-OSX-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release</Configurations>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(TargetsFreeBSD)' == 'true' OR '$(TargetsUnknownUnix)' == 'true' "> <PropertyGroup Condition=" '$(TargetsFreeBSD)' == 'true' or '$(TargetsUnknownUnix)' == 'true' ">
<!-- Suppress unused field warnings when using PlatformNotSupportedException stubs --> <!-- Suppress unused field warnings when using PlatformNotSupportedException stubs -->
<NoWarn>$(NoWarn);0649</NoWarn> <NoWarn>$(NoWarn);0649</NoWarn>
</PropertyGroup> </PropertyGroup>
...@@ -405,7 +405,7 @@ ...@@ -405,7 +405,7 @@
<Link>Common\Interop\OSX\Interop.Libraries.cs</Link> <Link>Common\Interop\OSX\Interop.Libraries.cs</Link>
</Compile> </Compile>
</ItemGroup> </ItemGroup>
<ItemGroup Condition="'$(TargetGroup)' == 'netcoreapp' AND '$(TargetsWindows)' == 'true'"> <ItemGroup Condition="'$(TargetGroup)' == 'netcoreapp' and '$(TargetsWindows)' == 'true'">
<Compile Include="$(CommonPath)\Interop\Windows\Shell32\Interop.ShellExecuteExW.cs"> <Compile Include="$(CommonPath)\Interop\Windows\Shell32\Interop.ShellExecuteExW.cs">
<Link>Common\Interop\Windows\Shell32\Interop.ShellExecuteExW.cs</Link> <Link>Common\Interop\Windows\Shell32\Interop.ShellExecuteExW.cs</Link>
</Compile> </Compile>
......
...@@ -125,7 +125,7 @@ ...@@ -125,7 +125,7 @@
<Link>Common\System\Text\ValueUtf8Converter.cs</Link> <Link>Common\System\Text\ValueUtf8Converter.cs</Link>
</Compile> </Compile>
</ItemGroup> </ItemGroup>
<ItemGroup Condition="'$(TargetsFreeBSD)' == 'true' OR '$(TargetsUnknownUnix)' == 'true'"> <ItemGroup Condition="'$(TargetsFreeBSD)' == 'true' or '$(TargetsUnknownUnix)' == 'true'">
<Compile Include="System\IO\FileSystemWatcher.UnknownUnix.cs" /> <Compile Include="System\IO\FileSystemWatcher.UnknownUnix.cs" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
......
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<IsPartialFacadeAssembly Condition="'$(TargetGroup)' == 'netfx' OR '$(TargetGroup)' == 'net46'">true</IsPartialFacadeAssembly> <IsPartialFacadeAssembly Condition="'$(TargetGroup)' == 'netfx' or '$(TargetGroup)' == 'net46'">true</IsPartialFacadeAssembly>
<DefineConstants Condition="'$(TargetGroup)'=='netstandard1.3'">$(DefineConstants);netcoreapp</DefineConstants> <DefineConstants Condition="'$(TargetGroup)'=='netstandard1.3'">$(DefineConstants);netcoreapp</DefineConstants>
<Configurations>net46-Debug;net46-Release;netfx-Debug;netfx-Release;netstandard2.0-Debug;netstandard2.0-Release;netstandard1.3-Debug;netstandard1.3-Release</Configurations> <Configurations>net46-Debug;net46-Release;netfx-Debug;netfx-Release;netstandard2.0-Debug;netstandard2.0-Release;netstandard1.3-Debug;netstandard1.3-Release</Configurations>
</PropertyGroup> </PropertyGroup>
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
<Compile Include="System.IO.Packaging.Serialization.cs" /> <Compile Include="System.IO.Packaging.Serialization.cs" />
<Compile Include="System.IO.Packaging.PackUriScheme.cs" /> <Compile Include="System.IO.Packaging.PackUriScheme.cs" />
</ItemGroup> </ItemGroup>
<ItemGroup Condition="'$(TargetGroup)' == 'netfx' OR '$(TargetGroup)' == 'net46'"> <ItemGroup Condition="'$(TargetGroup)' == 'netfx' or '$(TargetGroup)' == 'net46'">
<Reference Include="mscorlib" /> <Reference Include="mscorlib" />
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="WindowsBase" /> <Reference Include="WindowsBase" />
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<RootNamespace>System.IO.Packaging</RootNamespace> <RootNamespace>System.IO.Packaging</RootNamespace>
<AssemblyName>System.IO.Packaging</AssemblyName> <AssemblyName>System.IO.Packaging</AssemblyName>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks> <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<IsPartialFacadeAssembly Condition="'$(TargetGroup)'=='netfx' OR '$(TargetGroup)'=='net46'">true</IsPartialFacadeAssembly> <IsPartialFacadeAssembly Condition="'$(TargetGroup)'=='netfx' or '$(TargetGroup)'=='net46'">true</IsPartialFacadeAssembly>
<DefineConstants Condition="'$(TargetGroup)' != 'netstandard1.3'">$(DefineConstants);FEATURE_SERIALIZATION</DefineConstants> <DefineConstants Condition="'$(TargetGroup)' != 'netstandard1.3'">$(DefineConstants);FEATURE_SERIALIZATION</DefineConstants>
<Configurations>net46-Debug;net46-Release;netfx-Windows_NT-Debug;netfx-Windows_NT-Release;netstandard2.0-Debug;netstandard2.0-Release;netstandard1.3-Debug;netstandard1.3-Release</Configurations> <Configurations>net46-Debug;net46-Release;netfx-Windows_NT-Debug;netfx-Windows_NT-Release;netstandard2.0-Debug;netstandard2.0-Release;netstandard1.3-Debug;netstandard1.3-Release</Configurations>
</PropertyGroup> </PropertyGroup>
...@@ -51,7 +51,7 @@ ...@@ -51,7 +51,7 @@
<Compile Include="System\IO\Packaging\ZipWrappingStream.cs" /> <Compile Include="System\IO\Packaging\ZipWrappingStream.cs" />
<Compile Condition="'$(TargetGroup)'!='netstandard1.3'" Include="System\IO\Packaging\PackUriHelper.PackUriScheme.cs" /> <Compile Condition="'$(TargetGroup)'!='netstandard1.3'" Include="System\IO\Packaging\PackUriHelper.PackUriScheme.cs" />
</ItemGroup> </ItemGroup>
<ItemGroup Condition="'$(TargetGroup)'=='netfx' OR '$(TargetGroup)' == 'net46' "> <ItemGroup Condition="'$(TargetGroup)'=='netfx' or '$(TargetGroup)' == 'net46' ">
<Reference Include="mscorlib" /> <Reference Include="mscorlib" />
<Reference Include="WindowsBase" /> <Reference Include="WindowsBase" />
</ItemGroup> </ItemGroup>
......
...@@ -2,12 +2,12 @@ ...@@ -2,12 +2,12 @@
<PropertyGroup> <PropertyGroup>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks> <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<IsPartialFacadeAssembly Condition="'$(TargetsNetFx)' == 'true'">true</IsPartialFacadeAssembly> <IsPartialFacadeAssembly Condition="'$(TargetsNetFx)' == 'true'">true</IsPartialFacadeAssembly>
<GeneratePlatformNotSupportedAssemblyMessage Condition="'$(TargetsNetStandard)' == 'true' AND '$(TargetsWindows)' != 'true' AND '$(TargetsLinux)' != 'true' AND '$(TargetsOSX)' != 'true'">SR.PlatformNotSupported_IOPorts</GeneratePlatformNotSupportedAssemblyMessage> <GeneratePlatformNotSupportedAssemblyMessage Condition="'$(TargetsNetStandard)' == 'true' and '$(TargetsWindows)' != 'true' and '$(TargetsLinux)' != 'true' and '$(TargetsOSX)' != 'true'">SR.PlatformNotSupported_IOPorts</GeneratePlatformNotSupportedAssemblyMessage>
<DefineConstants>$(DefineConstants);NOSPAN</DefineConstants> <DefineConstants>$(DefineConstants);NOSPAN</DefineConstants>
<IncludeDllSafeSearchPathAttribute>true</IncludeDllSafeSearchPathAttribute> <IncludeDllSafeSearchPathAttribute>true</IncludeDllSafeSearchPathAttribute>
<Configurations>net461-Windows_NT-Debug;net461-Windows_NT-Release;netfx-Windows_NT-Debug;netfx-Windows_NT-Release;netstandard2.0-Debug;netstandard2.0-Linux-Debug;netstandard2.0-Linux-Release;netstandard2.0-OSX-Debug;netstandard2.0-OSX-Release;netstandard2.0-Release;netstandard2.0-Windows_NT-Debug;netstandard2.0-Windows_NT-Release</Configurations> <Configurations>net461-Windows_NT-Debug;net461-Windows_NT-Release;netfx-Windows_NT-Debug;netfx-Windows_NT-Release;netstandard2.0-Debug;netstandard2.0-Linux-Debug;netstandard2.0-Linux-Release;netstandard2.0-OSX-Debug;netstandard2.0-OSX-Release;netstandard2.0-Release;netstandard2.0-Windows_NT-Debug;netstandard2.0-Windows_NT-Release</Configurations>
</PropertyGroup> </PropertyGroup>
<ItemGroup Condition="'$(TargetsNetFx)' != 'true' AND ('$(TargetsWindows)' == 'true' OR '$(TargetsLinux)' == 'true' OR '$(TargetsOSX)' == 'true')"> <ItemGroup Condition="'$(TargetsNetFx)' != 'true' and ('$(TargetsWindows)' == 'true' or '$(TargetsLinux)' == 'true' or '$(TargetsOSX)' == 'true')">
<Compile Include="System\IO\Ports\Handshake.cs" /> <Compile Include="System\IO\Ports\Handshake.cs" />
<Compile Include="System\IO\Ports\InternalResources.cs" /> <Compile Include="System\IO\Ports\InternalResources.cs" />
<Compile Include="System\IO\Ports\Parity.cs" /> <Compile Include="System\IO\Ports\Parity.cs" />
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
<Compile Include="System\IO\Ports\SerialStream.cs" /> <Compile Include="System\IO\Ports\SerialStream.cs" />
<Compile Include="System\IO\Ports\StopBits.cs" /> <Compile Include="System\IO\Ports\StopBits.cs" />
</ItemGroup> </ItemGroup>
<ItemGroup Condition="'$(TargetsNetFx)' != 'true' AND '$(TargetsWindows)' == 'true'"> <ItemGroup Condition="'$(TargetsNetFx)' != 'true' and '$(TargetsWindows)' == 'true'">
<Compile Include="System\IO\Ports\SerialStream.Windows.cs" /> <Compile Include="System\IO\Ports\SerialStream.Windows.cs" />
<Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.DCB.cs"> <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.DCB.cs">
<Link>Common\Interop\Windows\Kernel32\Interop.DCB.cs</Link> <Link>Common\Interop\Windows\Kernel32\Interop.DCB.cs</Link>
...@@ -145,7 +145,7 @@ ...@@ -145,7 +145,7 @@
<ItemGroup Condition=" '$(TargetsOSX)' == 'true' "> <ItemGroup Condition=" '$(TargetsOSX)' == 'true' ">
<Compile Include="System\IO\Ports\SerialPort.OSX.cs" /> <Compile Include="System\IO\Ports\SerialPort.OSX.cs" />
</ItemGroup> </ItemGroup>
<ItemGroup Condition=" '$(TargetsLinux)' == 'true' OR '$(TargetsOSX)' == 'true'"> <ItemGroup Condition=" '$(TargetsLinux)' == 'true' or '$(TargetsOSX)' == 'true'">
<Compile Include="System\IO\Ports\SafeSerialDeviceHandle.Unix.cs" /> <Compile Include="System\IO\Ports\SafeSerialDeviceHandle.Unix.cs" />
<Compile Include="System\IO\Ports\SerialStream.Unix.cs" /> <Compile Include="System\IO\Ports\SerialStream.Unix.cs" />
<Compile Include="Interop\Unix\Interop.Termios.cs" /> <Compile Include="Interop\Unix\Interop.Termios.cs" />
...@@ -184,7 +184,7 @@ ...@@ -184,7 +184,7 @@
<Reference Include="System.Memory" /> <Reference Include="System.Memory" />
<Reference Include="System.Threading.Tasks" /> <Reference Include="System.Threading.Tasks" />
</ItemGroup> </ItemGroup>
<ItemGroup Condition="'$(TargetsLinux)' == 'true' OR '$(TargetsOSX)' == 'true'"> <ItemGroup Condition="'$(TargetsLinux)' == 'true' or '$(TargetsOSX)' == 'true'">
<Reference Include="Microsoft.Win32.Primitives" /> <Reference Include="Microsoft.Win32.Primitives" />
<Reference Include="System.Collections" /> <Reference Include="System.Collections" />
<Reference Include="System.ComponentModel.Primitives" /> <Reference Include="System.ComponentModel.Primitives" />
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<Configurations>net461-Windows_NT-Debug;net461-Windows_NT-Release;netfx-Windows_NT-Debug;netfx-Windows_NT-Release;netstandard2.0-Debug;netstandard2.0-Release;netstandard2.0-Windows_NT-Debug;netstandard2.0-Windows_NT-Release</Configurations> <Configurations>net461-Windows_NT-Debug;net461-Windows_NT-Release;netfx-Windows_NT-Debug;netfx-Windows_NT-Release;netstandard2.0-Debug;netstandard2.0-Release;netstandard2.0-Windows_NT-Debug;netstandard2.0-Windows_NT-Release</Configurations>
</PropertyGroup> </PropertyGroup>
<Import Project="System.Net.Http.WinHttpHandler.msbuild" Condition="'$(TargetsWindows)' == 'true'" /> <Import Project="System.Net.Http.WinHttpHandler.msbuild" Condition="'$(TargetsWindows)' == 'true'" />
<ItemGroup Condition="'$(TargetFramework)' == 'net46' OR '$(TargetFramework)' == 'net461'"> <ItemGroup Condition="'$(TargetFramework)' == 'net46' or '$(TargetFramework)' == 'net461'">
<!-- Need to compile it here since the NET46 target here is building against System.Runtime whereas the <!-- Need to compile it here since the NET46 target here is building against System.Runtime whereas the
the list of other files in System.Net.Http.WinHttpHandler.msbuild is also used by System.Net.Http the list of other files in System.Net.Http.WinHttpHandler.msbuild is also used by System.Net.Http
library and the NET46 target there uses framework assembly references instead. --> library and the NET46 target there uses framework assembly references instead. -->
......
...@@ -542,7 +542,7 @@ ...@@ -542,7 +542,7 @@
<Link>Common\CoreLib\System\Threading\Tasks\TaskToApm.cs</Link> <Link>Common\CoreLib\System\Threading\Tasks\TaskToApm.cs</Link>
</Compile> </Compile>
</ItemGroup> </ItemGroup>
<ItemGroup Condition=" '$(TargetsUnix)' == 'true' AND '$(TargetsOSX)' != 'true' "> <ItemGroup Condition=" '$(TargetsUnix)' == 'true' and '$(TargetsOSX)' != 'true' ">
<Compile Include="$(CommonPath)\Interop\Unix\System.Security.Cryptography.Native\Interop.ASN1.cs"> <Compile Include="$(CommonPath)\Interop\Unix\System.Security.Cryptography.Native\Interop.ASN1.cs">
<Link>Common\Interop\Unix\System.Security.Cryptography.Native\Interop.ASN1.cs</Link> <Link>Common\Interop\Unix\System.Security.Cryptography.Native\Interop.ASN1.cs</Link>
</Compile> </Compile>
......
...@@ -104,7 +104,7 @@ ...@@ -104,7 +104,7 @@
<Link>Common\System\Runtime\CompilerServices\PreserveDependencyAttribute.cs</Link> <Link>Common\System\Runtime\CompilerServices\PreserveDependencyAttribute.cs</Link>
</Compile> </Compile>
</ItemGroup> </ItemGroup>
<ItemGroup Condition="'$(TargetsWindows)' == 'true' AND '$(ForceManagedImplementation)' != 'true'"> <ItemGroup Condition="'$(TargetsWindows)' == 'true' and '$(ForceManagedImplementation)' != 'true'">
<Compile Include="System\Net\Windows\HttpListener.Windows.cs" /> <Compile Include="System\Net\Windows\HttpListener.Windows.cs" />
<Compile Include="System\Net\Windows\HttpListenerContext.Windows.cs" /> <Compile Include="System\Net\Windows\HttpListenerContext.Windows.cs" />
<Compile Include="System\Net\Windows\HttpListenerRequest.Windows.cs" /> <Compile Include="System\Net\Windows\HttpListenerRequest.Windows.cs" />
...@@ -335,7 +335,7 @@ ...@@ -335,7 +335,7 @@
<Link>Common\Interop\Windows\SspiCli\SSPIWrapper.cs</Link> <Link>Common\Interop\Windows\SspiCli\SSPIWrapper.cs</Link>
</Compile> </Compile>
</ItemGroup> </ItemGroup>
<ItemGroup Condition="'$(TargetsUnix)' == 'true' OR '$(ForceManagedImplementation)' == 'true'"> <ItemGroup Condition="'$(TargetsUnix)' == 'true' or '$(ForceManagedImplementation)' == 'true'">
<Compile Include="System\Net\Managed\HttpEndPointListener.cs" /> <Compile Include="System\Net\Managed\HttpEndPointListener.cs" />
<Compile Include="System\Net\Managed\HttpEndPointManager.cs" /> <Compile Include="System\Net\Managed\HttpEndPointManager.cs" />
<Compile Include="System\Net\Managed\HttpConnection.cs" /> <Compile Include="System\Net\Managed\HttpConnection.cs" />
......
...@@ -227,7 +227,7 @@ ...@@ -227,7 +227,7 @@
</Compile> </Compile>
</ItemGroup> </ItemGroup>
<!-- OSX --> <!-- OSX -->
<ItemGroup Condition=" '$(TargetsOsx)' == 'true' OR '$(TargetsFreeBSD)' == 'true'"> <ItemGroup Condition=" '$(TargetsOsx)' == 'true' or '$(TargetsFreeBSD)' == 'true'">
<Compile Include="System\Net\NetworkInformation\IPGlobalPropertiesPal.Bsd.cs" /> <Compile Include="System\Net\NetworkInformation\IPGlobalPropertiesPal.Bsd.cs" />
<Compile Include="System\Net\NetworkInformation\NetworkInterfacePal.Bsd.cs" /> <Compile Include="System\Net\NetworkInformation\NetworkInterfacePal.Bsd.cs" />
<Compile Include="System\Net\NetworkInformation\BsdIcmpV4Statistics.cs" /> <Compile Include="System\Net\NetworkInformation\BsdIcmpV4Statistics.cs" />
......
...@@ -314,7 +314,7 @@ ...@@ -314,7 +314,7 @@
<Compile Include="System\Net\Security\SslConnectionInfo.Unix.cs" /> <Compile Include="System\Net\Security\SslConnectionInfo.Unix.cs" />
<Compile Include="System\Net\Security\TlsCipherSuiteData.cs" /> <Compile Include="System\Net\Security\TlsCipherSuiteData.cs" />
</ItemGroup> </ItemGroup>
<ItemGroup Condition=" '$(TargetsUnix)' == 'true' AND '$(TargetsOSX)' != 'true' "> <ItemGroup Condition=" '$(TargetsUnix)' == 'true' and '$(TargetsOSX)' != 'true' ">
<Compile Include="System\Net\CertificateValidationPal.Unix.cs" /> <Compile Include="System\Net\CertificateValidationPal.Unix.cs" />
<Compile Include="System\Net\Security\CipherSuitesPolicyPal.Linux.cs" /> <Compile Include="System\Net\Security\CipherSuitesPolicyPal.Linux.cs" />
<Compile Include="System\Net\Security\SslStreamPal.Unix.cs" /> <Compile Include="System\Net\Security\SslStreamPal.Unix.cs" />
......
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<OutputType>Library</OutputType> <OutputType>Library</OutputType>
<GeneratePlatformNotSupportedAssemblyMessage Condition="'$(TargetFramework)' == 'netstandard1.1' OR '$(TargetFramework)' == 'netstandard2.0'">SR.PlatformNotSupported_ReflectionContext</GeneratePlatformNotSupportedAssemblyMessage> <GeneratePlatformNotSupportedAssemblyMessage Condition="'$(TargetFramework)' == 'netstandard1.1' or '$(TargetFramework)' == 'netstandard2.0'">SR.PlatformNotSupported_ReflectionContext</GeneratePlatformNotSupportedAssemblyMessage>
<Configurations>netstandard2.0-Debug;netstandard2.0-Release;netstandard1.1-Debug;netstandard1.1-Release;netstandard2.1-Debug;netstandard2.1-Release</Configurations> <Configurations>netstandard2.0-Debug;netstandard2.0-Release;netstandard1.1-Debug;netstandard1.1-Release;netstandard2.1-Debug;netstandard2.1-Release</Configurations>
</PropertyGroup> </PropertyGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.1'"> <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.1'">
......
...@@ -5,12 +5,12 @@ ...@@ -5,12 +5,12 @@
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
<Configurations>net461-Debug;net461-Release;netcoreapp-Unix-Debug;netcoreapp-Unix-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release;netfx-Debug;netfx-Release;netstandard2.0-Debug;netstandard2.0-Release;netstandard1.3-Debug;netstandard1.3-Release;netstandard1.5-Debug;netstandard1.5-Release</Configurations> <Configurations>net461-Debug;net461-Release;netcoreapp-Unix-Debug;netcoreapp-Unix-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release;netfx-Debug;netfx-Release;netstandard2.0-Debug;netstandard2.0-Release;netstandard1.3-Debug;netstandard1.3-Release;netstandard1.5-Debug;netstandard1.5-Release</Configurations>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(TargetFramework)' == 'netstandard1.3' OR '$(TargetFramework)' == 'netstandard1.5'"> <PropertyGroup Condition="'$(TargetFramework)' == 'netstandard1.3' or '$(TargetFramework)' == 'netstandard1.5'">
<GeneratePlatformNotSupportedAssemblyMessage>SR.PlatformNotSupported_ReflectionTypeExtensions</GeneratePlatformNotSupportedAssemblyMessage> <GeneratePlatformNotSupportedAssemblyMessage>SR.PlatformNotSupported_ReflectionTypeExtensions</GeneratePlatformNotSupportedAssemblyMessage>
<AssemblyVersion Condition="'$(TargetFramework)' == 'netstandard1.3'">4.0.0.0</AssemblyVersion> <AssemblyVersion Condition="'$(TargetFramework)' == 'netstandard1.3'">4.0.0.0</AssemblyVersion>
<AssemblyVersion Condition="'$(TargetFramework)' == 'netstandard1.5'">4.1.0.0</AssemblyVersion> <AssemblyVersion Condition="'$(TargetFramework)' == 'netstandard1.5'">4.1.0.0</AssemblyVersion>
</PropertyGroup> </PropertyGroup>
<ItemGroup Condition="'$(TargetFramework)' != 'netstandard1.3' AND '$(TargetFramework)' != 'netstandard1.5'"> <ItemGroup Condition="'$(TargetFramework)' != 'netstandard1.3' and '$(TargetFramework)' != 'netstandard1.5'">
<Compile Include="System\Reflection\Requires.cs" /> <Compile Include="System\Reflection\Requires.cs" />
<Compile Include="System\Reflection\TypeExtensions.cs" /> <Compile Include="System\Reflection\TypeExtensions.cs" />
</ItemGroup> </ItemGroup>
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
<Reference Include="mscorlib" Condition="'$(TargetsNetFx)' == 'true'" /> <Reference Include="mscorlib" Condition="'$(TargetsNetFx)' == 'true'" />
<ReferenceFromRuntime Include="System.Private.CoreLib" Condition="'$(TargetsNetCoreApp)' == 'true'" /> <ReferenceFromRuntime Include="System.Private.CoreLib" Condition="'$(TargetsNetCoreApp)' == 'true'" />
</ItemGroup> </ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard1.3' OR '$(TargetFramework)' == 'netstandard1.5'"> <ItemGroup Condition="'$(TargetFramework)' == 'netstandard1.3' or '$(TargetFramework)' == 'netstandard1.5'">
<Reference Include="System.Reflection" /> <Reference Include="System.Reflection" />
<Reference Include="System.Resources.ResourceManager" /> <Reference Include="System.Resources.ResourceManager" />
<Reference Include="System.Runtime" /> <Reference Include="System.Runtime" />
......
...@@ -475,7 +475,7 @@ ...@@ -475,7 +475,7 @@
<Link>Common\System\Security\Cryptography\RSACng.SignVerify.cs</Link> <Link>Common\System\Security\Cryptography\RSACng.SignVerify.cs</Link>
</Compile> </Compile>
</ItemGroup> </ItemGroup>
<ItemGroup Condition=" '$(TargetsUnix)' == 'true' AND '$(TargetsOSX)' != 'true' "> <ItemGroup Condition=" '$(TargetsUnix)' == 'true' and '$(TargetsOSX)' != 'true' ">
<Compile Include="$(CommonPath)\Interop\Unix\System.Security.Cryptography.Native\Interop.ASN1.cs"> <Compile Include="$(CommonPath)\Interop\Unix\System.Security.Cryptography.Native\Interop.ASN1.cs">
<Link>Common\Interop\Unix\System.Security.Cryptography.Native\Interop.ASN1.cs</Link> <Link>Common\Interop\Unix\System.Security.Cryptography.Native\Interop.ASN1.cs</Link>
</Compile> </Compile>
......
...@@ -122,7 +122,7 @@ ...@@ -122,7 +122,7 @@
<ItemGroup Condition="'$(TargetsWindows)' == 'true'"> <ItemGroup Condition="'$(TargetsWindows)' == 'true'">
<Compile Include="DefaultECDsaProvider.Windows.cs" /> <Compile Include="DefaultECDsaProvider.Windows.cs" />
</ItemGroup> </ItemGroup>
<ItemGroup Condition="'$(TargetsWindows)' == 'true' AND '$(TargetsNetCoreApp)' == 'true'"> <ItemGroup Condition="'$(TargetsWindows)' == 'true' and '$(TargetsNetCoreApp)' == 'true'">
<Compile Include="DefaultECDiffieHellmanProvider.Windows.cs" /> <Compile Include="DefaultECDiffieHellmanProvider.Windows.cs" />
</ItemGroup> </ItemGroup>
<ItemGroup Condition="'$(TargetsUnix)' == 'true'"> <ItemGroup Condition="'$(TargetsUnix)' == 'true'">
...@@ -131,7 +131,7 @@ ...@@ -131,7 +131,7 @@
<Link>Common\Interop\Unix\Interop.Libraries.cs</Link> <Link>Common\Interop\Unix\Interop.Libraries.cs</Link>
</Compile> </Compile>
</ItemGroup> </ItemGroup>
<ItemGroup Condition="'$(TargetsUnix)' == 'true' AND '$(TargetsNetCoreApp)' == 'true'"> <ItemGroup Condition="'$(TargetsUnix)' == 'true' and '$(TargetsNetCoreApp)' == 'true'">
<Compile Include="DefaultECDiffieHellmanProvider.Unix.cs" /> <Compile Include="DefaultECDiffieHellmanProvider.Unix.cs" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
......
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<DefineConstants Condition="'$(TargetGroup)' != 'net461' AND '$(TargetGroup)' != 'net462'">$(DefineConstants);FEATURE_ECPARAMETERS</DefineConstants> <DefineConstants Condition="'$(TargetGroup)' != 'net461' and '$(TargetGroup)' != 'net462'">$(DefineConstants);FEATURE_ECPARAMETERS</DefineConstants>
<!-- FEATURE_DSA_HASHDATA is technically also available on net462+, but it doesn't require being enabled since it is a facade --> <!-- FEATURE_DSA_HASHDATA is technically also available on net462+, but it doesn't require being enabled since it is a facade -->
<DefineConstants Condition="'$(TargetsNetCoreApp)' == 'true' or '$(TargetsNetStandard)' == 'true'">$(DefineConstants);FEATURE_DSA_HASHDATA</DefineConstants> <DefineConstants Condition="'$(TargetsNetCoreApp)' == 'true' or '$(TargetsNetStandard)' == 'true'">$(DefineConstants);FEATURE_DSA_HASHDATA</DefineConstants>
<!-- FEATURE_ECDH_DERIVEFROM is technically also available on net462+, but it doesn't require being enabled since it is a facade --> <!-- FEATURE_ECDH_DERIVEFROM is technically also available on net462+, but it doesn't require being enabled since it is a facade -->
......
...@@ -11,9 +11,9 @@ ...@@ -11,9 +11,9 @@
<GeneratePlatformNotSupportedAssemblyMessage>SR.PlatformNotSupported_CryptographyCng</GeneratePlatformNotSupportedAssemblyMessage> <GeneratePlatformNotSupportedAssemblyMessage>SR.PlatformNotSupported_CryptographyCng</GeneratePlatformNotSupportedAssemblyMessage>
<AssemblyVersion Condition="'$(TargetFramework)' == 'netstandard2.0'">4.3.0.0</AssemblyVersion> <AssemblyVersion Condition="'$(TargetFramework)' == 'netstandard2.0'">4.3.0.0</AssemblyVersion>
</PropertyGroup> </PropertyGroup>
<Import Project="$(CommonPath)\System\Security\Cryptography\Asn1\AsnXml.targets" Condition="'$(IsPartialFacadeAssembly)' != 'true' AND '$(TargetsWindows)' == 'true'" /> <Import Project="$(CommonPath)\System\Security\Cryptography\Asn1\AsnXml.targets" Condition="'$(IsPartialFacadeAssembly)' != 'true' and '$(TargetsWindows)' == 'true'" />
<Import Project="$(CommonPath)\System\Security\Cryptography\Asn1Reader\System.Security.Cryptography.Asn1Reader.Shared.projitems" Condition="'$(IsPartialFacadeAssembly)' != 'true' AND '$(TargetsWindows)' == 'true'" /> <Import Project="$(CommonPath)\System\Security\Cryptography\Asn1Reader\System.Security.Cryptography.Asn1Reader.Shared.projitems" Condition="'$(IsPartialFacadeAssembly)' != 'true' and '$(TargetsWindows)' == 'true'" />
<ItemGroup Condition="'$(IsPartialFacadeAssembly)' != 'true' AND '$(TargetsWindows)' == 'true'"> <ItemGroup Condition="'$(IsPartialFacadeAssembly)' != 'true' and '$(TargetsWindows)' == 'true'">
<Compile Include="System\Security\Cryptography\AesCng.cs" /> <Compile Include="System\Security\Cryptography\AesCng.cs" />
<Compile Include="System\Security\Cryptography\CngAlgorithm.cs" /> <Compile Include="System\Security\Cryptography\CngAlgorithm.cs" />
<Compile Include="System\Security\Cryptography\CngAlgorithmGroup.cs" /> <Compile Include="System\Security\Cryptography\CngAlgorithmGroup.cs" />
......
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
<Link>Common\Interop\Windows\Interop.Libraries.cs</Link> <Link>Common\Interop\Windows\Interop.Libraries.cs</Link>
</Compile> </Compile>
</ItemGroup> </ItemGroup>
<ItemGroup Condition=" '$(TargetsUnix)' == 'true' AND '$(TargetsOSX)' != 'true' "> <ItemGroup Condition=" '$(TargetsUnix)' == 'true' and '$(TargetsOSX)' != 'true' ">
<Compile Include="Internal\Cryptography\AsnFormatter.Unix.cs" /> <Compile Include="Internal\Cryptography\AsnFormatter.Unix.cs" />
<Compile Include="Internal\Cryptography\OidLookup.Unix.cs" /> <Compile Include="Internal\Cryptography\OidLookup.Unix.cs" />
<Compile Include="Internal\Cryptography\OpenSslAsnFormatter.cs" /> <Compile Include="Internal\Cryptography\OpenSslAsnFormatter.cs" />
......
...@@ -133,7 +133,7 @@ ...@@ -133,7 +133,7 @@
</Compile> </Compile>
</ItemGroup> </ItemGroup>
<!-- Internal types (platform: Windows) --> <!-- Internal types (platform: Windows) -->
<ItemGroup Condition="'$(TargetsWindows)' == 'true' AND '$(IsPartialFacadeAssembly)' != 'true'"> <ItemGroup Condition="'$(TargetsWindows)' == 'true' and '$(IsPartialFacadeAssembly)' != 'true'">
<Compile Include="Internal\Cryptography\Pal\Windows\AlgId.cs" /> <Compile Include="Internal\Cryptography\Pal\Windows\AlgId.cs" />
<Compile Include="Internal\Cryptography\Pal\Windows\DecryptorPalWindows.cs" /> <Compile Include="Internal\Cryptography\Pal\Windows\DecryptorPalWindows.cs" />
<Compile Include="Internal\Cryptography\Pal\Windows\DecryptorPalWindows.Decode.cs" /> <Compile Include="Internal\Cryptography\Pal\Windows\DecryptorPalWindows.Decode.cs" />
...@@ -154,7 +154,7 @@ ...@@ -154,7 +154,7 @@
<Compile Include="Interop\Windows\Crypt32\Interop.CertDuplicateCertificateContext.cs" /> <Compile Include="Interop\Windows\Crypt32\Interop.CertDuplicateCertificateContext.cs" />
</ItemGroup> </ItemGroup>
<!-- Interop types (platform: Windows) --> <!-- Interop types (platform: Windows) -->
<ItemGroup Condition="'$(TargetsWindows)' == 'true' AND '$(IsPartialFacadeAssembly)' != 'true'"> <ItemGroup Condition="'$(TargetsWindows)' == 'true' and '$(IsPartialFacadeAssembly)' != 'true'">
<Compile Include="$(CommonPath)\Interop\Windows\Advapi32\Interop.CryptAcquireContext.cs"> <Compile Include="$(CommonPath)\Interop\Windows\Advapi32\Interop.CryptAcquireContext.cs">
<Link>Common\Interop\Windows\Advapi32\Interop.CryptAcquireContext.cs</Link> <Link>Common\Interop\Windows\Advapi32\Interop.CryptAcquireContext.cs</Link>
</Compile> </Compile>
...@@ -370,7 +370,7 @@ ...@@ -370,7 +370,7 @@
</Compile> </Compile>
</ItemGroup> </ItemGroup>
<!-- Common types (platform: Windows) --> <!-- Common types (platform: Windows) -->
<ItemGroup Condition="'$(TargetsWindows)' == 'true' AND '$(IsPartialFacadeAssembly)' != 'true'"> <ItemGroup Condition="'$(TargetsWindows)' == 'true' and '$(IsPartialFacadeAssembly)' != 'true'">
<Compile Include="$(CommonPath)\Internal\Cryptography\Windows\CryptoThrowHelper.cs"> <Compile Include="$(CommonPath)\Internal\Cryptography\Windows\CryptoThrowHelper.cs">
<Link>Common\Internal\Cryptography\Windows\CryptoThrowHelper.cs</Link> <Link>Common\Internal\Cryptography\Windows\CryptoThrowHelper.cs</Link>
</Compile> </Compile>
...@@ -379,7 +379,7 @@ ...@@ -379,7 +379,7 @@
</Compile> </Compile>
</ItemGroup> </ItemGroup>
<!-- Internal types (platform: AnyOS) --> <!-- Internal types (platform: AnyOS) -->
<ItemGroup Condition="'$(TargetsWindows)' != 'true' AND '$(IsPartialFacadeAssembly)' != 'true'"> <ItemGroup Condition="'$(TargetsWindows)' != 'true' and '$(IsPartialFacadeAssembly)' != 'true'">
<Compile Include="Internal\Cryptography\Pal\AnyOS\PkcsPal.AnyOS.cs" /> <Compile Include="Internal\Cryptography\Pal\AnyOS\PkcsPal.AnyOS.cs" />
</ItemGroup> </ItemGroup>
<ItemGroup Condition="'$(IsPartialFacadeAssembly)' == 'true'"> <ItemGroup Condition="'$(IsPartialFacadeAssembly)' == 'true'">
......
...@@ -62,10 +62,10 @@ ...@@ -62,10 +62,10 @@
<Compile Include="Pkcs8PrivateKeyInfoTests.cs" /> <Compile Include="Pkcs8PrivateKeyInfoTests.cs" />
<Compile Include="PrivateKeyHelpers.cs" /> <Compile Include="PrivateKeyHelpers.cs" />
</ItemGroup> </ItemGroup>
<ItemGroup Condition="'$(TargetsNetCoreApp)' == 'true' OR '$(TargetsNetFx)' == 'true'"> <ItemGroup Condition="'$(TargetsNetCoreApp)' == 'true' or '$(TargetsNetFx)' == 'true'">
<Compile Include="EnvelopedCms\KeyTransRecipientInfoRsaOaepCertTests.cs" /> <Compile Include="EnvelopedCms\KeyTransRecipientInfoRsaOaepCertTests.cs" />
</ItemGroup> </ItemGroup>
<ItemGroup Condition="'$(TargetsWindows)' == 'true' AND '$(TargetsNetCoreApp)' == 'true'"> <ItemGroup Condition="'$(TargetsWindows)' == 'true' and '$(TargetsNetCoreApp)' == 'true'">
<Compile Include="EnvelopedCms\DecryptTests.KeyPersistence.cs" /> <Compile Include="EnvelopedCms\DecryptTests.KeyPersistence.cs" />
</ItemGroup> </ItemGroup>
</Project> </Project>
\ No newline at end of file
...@@ -295,7 +295,7 @@ ...@@ -295,7 +295,7 @@
<Link>Common\Microsoft\Win32\SafeHandles\SafeBCryptKeyHandle.cs</Link> <Link>Common\Microsoft\Win32\SafeHandles\SafeBCryptKeyHandle.cs</Link>
</Compile> </Compile>
</ItemGroup> </ItemGroup>
<ItemGroup Condition=" '$(TargetsUnix)' == 'true' AND '$(TargetsOSX)' != 'true' "> <ItemGroup Condition=" '$(TargetsUnix)' == 'true' and '$(TargetsOSX)' != 'true' ">
<AsnXml Include="System\Security\Cryptography\X509Certificates\Asn1\DistributionPointAsn.xml" /> <AsnXml Include="System\Security\Cryptography\X509Certificates\Asn1\DistributionPointAsn.xml" />
<Compile Include="System\Security\Cryptography\X509Certificates\Asn1\DistributionPointAsn.xml.cs"> <Compile Include="System\Security\Cryptography\X509Certificates\Asn1\DistributionPointAsn.xml.cs">
<DependentUpon>System\Security\Cryptography\X509Certificates\Asn1\DistributionPointAsn.xml</DependentUpon> <DependentUpon>System\Security\Cryptography\X509Certificates\Asn1\DistributionPointAsn.xml</DependentUpon>
...@@ -452,7 +452,7 @@ ...@@ -452,7 +452,7 @@
<Link>Common\System\IO\PersistedFiles.Names.Unix.cs</Link> <Link>Common\System\IO\PersistedFiles.Names.Unix.cs</Link>
</Compile> </Compile>
</ItemGroup> </ItemGroup>
<ItemGroup Condition=" '$(TargetsOSX)' == 'true' AND '$(IsPartialFacadeAssembly)' != 'true'"> <ItemGroup Condition=" '$(TargetsOSX)' == 'true' and '$(IsPartialFacadeAssembly)' != 'true'">
<Compile Include="$(CommonPath)\Internal\Cryptography\AsymmetricAlgorithmHelpers.Hash.cs"> <Compile Include="$(CommonPath)\Internal\Cryptography\AsymmetricAlgorithmHelpers.Hash.cs">
<Link>Common\Internal\Cryptography\AsymmetricAlgorithmHelpers.Hash.cs</Link> <Link>Common\Internal\Cryptography\AsymmetricAlgorithmHelpers.Hash.cs</Link>
</Compile> </Compile>
...@@ -773,7 +773,7 @@ ...@@ -773,7 +773,7 @@
<Reference Include="System.Security.Cryptography.Cng" /> <Reference Include="System.Security.Cryptography.Cng" />
<Reference Include="System.Security.Cryptography.Csp" /> <Reference Include="System.Security.Cryptography.Csp" />
</ItemGroup> </ItemGroup>
<ItemGroup Condition="'$(TargetsUnix)' == 'true' AND '$(TargetsOSX)' != 'true'"> <ItemGroup Condition="'$(TargetsUnix)' == 'true' and '$(TargetsOSX)' != 'true'">
<Reference Include="System.Diagnostics.StackTrace" /> <Reference Include="System.Diagnostics.StackTrace" />
<Reference Include="System.Security.Cryptography.OpenSsl" /> <Reference Include="System.Security.Cryptography.OpenSsl" />
</ItemGroup> </ItemGroup>
......
...@@ -63,7 +63,7 @@ ...@@ -63,7 +63,7 @@
<Compile Include="RSAOther.cs" /> <Compile Include="RSAOther.cs" />
<Compile Include="TestDataGenerator.cs" /> <Compile Include="TestDataGenerator.cs" />
</ItemGroup> </ItemGroup>
<ItemGroup Condition=" '$(TargetsUnix)' == 'true' AND '$(TargetsOSX)' != 'true' "> <ItemGroup Condition=" '$(TargetsUnix)' == 'true' and '$(TargetsOSX)' != 'true' ">
<Compile Include="X509FilesystemTests.Unix.cs" /> <Compile Include="X509FilesystemTests.Unix.cs" />
<Compile Include="$(CommonPath)\Interop\Unix\Interop.Libraries.cs"> <Compile Include="$(CommonPath)\Interop\Unix\Interop.Libraries.cs">
<Link>Common\Interop\Unix\Interop.Libraries.cs</Link> <Link>Common\Interop\Unix\Interop.Libraries.cs</Link>
......
...@@ -169,7 +169,7 @@ ...@@ -169,7 +169,7 @@
<Link>Common\System\Runtime\CompilerServices\PreserveDependencyAttribute.cs</Link> <Link>Common\System\Runtime\CompilerServices\PreserveDependencyAttribute.cs</Link>
</Compile> </Compile>
</ItemGroup> </ItemGroup>
<ItemGroup Condition="'$(TargetsNetStandard)' == 'true' OR '$(TargetsNetFx)' == 'true'"> <ItemGroup Condition="'$(TargetsNetStandard)' == 'true' or '$(TargetsNetFx)' == 'true'">
<Compile Include="System\Collections\Generic\StackExtensions.netstandard.cs" /> <Compile Include="System\Collections\Generic\StackExtensions.netstandard.cs" />
<!-- Common or Common-branched source files --> <!-- Common or Common-branched source files -->
<Compile Include="$(CommonPath)\System\Buffers\ArrayBufferWriter.cs"> <Compile Include="$(CommonPath)\System\Buffers\ArrayBufferWriter.cs">
......
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<DefineConstants Condition="'$(TargetFramework)' == 'netstandard1.1' OR '$(TargetFramework)' == 'netstandard2.0'">$(DefineConstants);FEATURE_TRACING</DefineConstants> <DefineConstants Condition="'$(TargetFramework)' == 'netstandard1.1' or '$(TargetFramework)' == 'netstandard2.0'">$(DefineConstants);FEATURE_TRACING</DefineConstants>
<DefineConstants Condition="'$(TargetFramework)' == 'netstandard1.0'">$(DefineConstants);USE_INTERNAL_CONCURRENT_COLLECTIONS</DefineConstants> <DefineConstants Condition="'$(TargetFramework)' == 'netstandard1.0'">$(DefineConstants);USE_INTERNAL_CONCURRENT_COLLECTIONS</DefineConstants>
<DefineConstants Condition="'$(TargetFramework)' == 'netstandard1.0' OR '$(TargetFramework)' == 'netstandard1.1'">$(DefineConstants);USE_INTERNAL_THREADING</DefineConstants> <DefineConstants Condition="'$(TargetFramework)' == 'netstandard1.0' or '$(TargetFramework)' == 'netstandard1.1'">$(DefineConstants);USE_INTERNAL_THREADING</DefineConstants>
<PackageTargetFramework Condition="'$(TargetFramework)' == 'netstandard1.1'">netstandard1.1;portable-net45+win8+wpa81</PackageTargetFramework> <PackageTargetFramework Condition="'$(TargetFramework)' == 'netstandard1.1'">netstandard1.1;portable-net45+win8+wpa81</PackageTargetFramework>
<Configurations>netstandard2.0-Debug;netstandard2.0-Release;netstandard1.0-Debug;netstandard1.0-Release;netstandard1.1-Debug;netstandard1.1-Release</Configurations> <Configurations>netstandard2.0-Debug;netstandard2.0-Release;netstandard1.0-Debug;netstandard1.0-Release;netstandard1.1-Debug;netstandard1.1-Release</Configurations>
</PropertyGroup> </PropertyGroup>
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
<Link>Common\Internal\Padding.cs</Link> <Link>Common\Internal\Padding.cs</Link>
</Compile> </Compile>
</ItemGroup> </ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard1.0' OR '$(TargetFramework)' == 'netstandard1.1'"> <ItemGroup Condition="'$(TargetFramework)' == 'netstandard1.0' or '$(TargetFramework)' == 'netstandard1.1'">
<Compile Include="Internal\Threading.cs" /> <Compile Include="Internal\Threading.cs" />
</ItemGroup> </ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard1.0'"> <ItemGroup Condition="'$(TargetFramework)' == 'netstandard1.0'">
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
however since the project names are unique it will essentially force each to run in its own batch --> however since the project names are unique it will essentially force each to run in its own batch -->
<MSBuild Targets="$(DefaultBuildAllTarget)" <MSBuild Targets="$(DefaultBuildAllTarget)"
Projects="@(Project)" Projects="@(Project)"
Condition="'$(SerializeProjects)'=='true' AND '%(Identity)' != ''" Condition="'$(SerializeProjects)'=='true' and '%(Identity)' != ''"
Properties="DefaultBuildAllTarget=$(DefaultBuildAllTarget);BuildAllProjects=true;BuildConfiguration=$(BuildConfiguration)" Properties="DefaultBuildAllTarget=$(DefaultBuildAllTarget);BuildAllProjects=true;BuildConfiguration=$(BuildConfiguration)"
ContinueOnError="ErrorAndStop" /> ContinueOnError="ErrorAndStop" />
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<!-- Used to determine if we should build some packages only once across multiple official build legs. <!-- Used to determine if we should build some packages only once across multiple official build legs.
For offline builds we still set OfficialBuildId but we need to build all the packages for a single For offline builds we still set OfficialBuildId but we need to build all the packages for a single
leg only, so we also take DotNetBuildFromSource into account. --> leg only, so we also take DotNetBuildFromSource into account. -->
<BuildingAnOfficialBuildLeg Condition="'$(BuildingAnOfficialBuildLeg)' == '' AND '$(OfficialBuildId)' != '' AND '$(DotNetBuildFromSource)' != 'true'">true</BuildingAnOfficialBuildLeg> <BuildingAnOfficialBuildLeg Condition="'$(BuildingAnOfficialBuildLeg)' == '' and '$(OfficialBuildId)' != '' and '$(DotNetBuildFromSource)' != 'true'">true</BuildingAnOfficialBuildLeg>
<HarvestStablePackage>false</HarvestStablePackage> <HarvestStablePackage>false</HarvestStablePackage>
</PropertyGroup> </PropertyGroup>
......
...@@ -20,9 +20,9 @@ ...@@ -20,9 +20,9 @@
<Target Name="FilterProjectsPackageRID" Condition="'@(BuildRID)' != ''"> <Target Name="FilterProjectsPackageRID" Condition="'@(BuildRID)' != ''">
<ItemGroup> <ItemGroup>
<!-- Build identity package, when SkipBuildIdentityPackage is not set --> <!-- Build identity package, when SkipBuildIdentityPackage is not set -->
<_projectsToBuild Include="@(Project)" Condition="'%(Project.PackageTargetRuntime)' == '' AND '$(SkipBuildIdentityPackage)' != 'true'" /> <_projectsToBuild Include="@(Project)" Condition="'%(Project.PackageTargetRuntime)' == '' and '$(SkipBuildIdentityPackage)' != 'true'" />
<!-- Build packages for current RID, when SkipBuildRuntimePackage is not set --> <!-- Build packages for current RID, when SkipBuildRuntimePackage is not set -->
<_projectsToBuild Include="@(Project)" Condition="'%(Project.PackageTargetRuntime)' == '$(PackageRID)' AND '$(SkipBuildRuntimePackage)' != 'true'" /> <_projectsToBuild Include="@(Project)" Condition="'%(Project.PackageTargetRuntime)' == '$(PackageRID)' and '$(SkipBuildRuntimePackage)' != 'true'" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
......
<Project InitialTargets="_CheckForFiles;IncludeFiles;SetValidateFramework"> <Project InitialTargets="_CheckForFiles;IncludeFiles;SetValidateFramework">
<PropertyGroup> <PropertyGroup>
<IsLineupPackage Condition="'$(PackageTargetRuntime)' == '' AND '$(IncludeLibFiles)' != 'true'">true</IsLineupPackage> <IsLineupPackage Condition="'$(PackageTargetRuntime)' == '' and '$(IncludeLibFiles)' != 'true'">true</IsLineupPackage>
<PreventImplementationReference Condition="'$(PackageTargetRuntime)' != ''">true</PreventImplementationReference> <PreventImplementationReference Condition="'$(PackageTargetRuntime)' != ''">true</PreventImplementationReference>
<NETStandardVersion Condition="'$(NETStandardVersion)' == ''">2.0</NETStandardVersion> <NETStandardVersion Condition="'$(NETStandardVersion)' == ''">2.0</NETStandardVersion>
<NETStandardPackageRefPath Condition="'$(NETStandardPackageRefPath)' == ''">$(NuGetPackageRoot)$(NETStandardLibraryPackage)\$(NETStandardLibraryVersion)\build\netstandard$(NETStandardVersion)\ref</NETStandardPackageRefPath> <NETStandardPackageRefPath Condition="'$(NETStandardPackageRefPath)' == ''">$(NuGetPackageRoot)$(NETStandardLibraryPackage)\$(NETStandardLibraryVersion)\build\netstandard$(NETStandardVersion)\ref</NETStandardPackageRefPath>
<IncludeReferenceFiles Condition="'$(IncludeReferenceFiles)' == '' AND '$(PackageTargetRuntime)' == ''">true</IncludeReferenceFiles> <IncludeReferenceFiles Condition="'$(IncludeReferenceFiles)' == '' and '$(PackageTargetRuntime)' == ''">true</IncludeReferenceFiles>
<IncludeLibFiles Condition="'$(IncludeLibFiles)' == '' AND '$(PackageTargetRuntime)' != ''">true</IncludeLibFiles> <IncludeLibFiles Condition="'$(IncludeLibFiles)' == '' and '$(PackageTargetRuntime)' != ''">true</IncludeLibFiles>
<IncludeNativeFiles Condition="'$(IncludeNativeFiles)' == '' AND '$(PackageTargetRuntime)' != ''">true</IncludeNativeFiles> <IncludeNativeFiles Condition="'$(IncludeNativeFiles)' == '' and '$(PackageTargetRuntime)' != ''">true</IncludeNativeFiles>
<RefFileTargetPath Condition="'$(RefFileTargetPath)' == ''">ref/$(TargetFramework)</RefFileTargetPath> <RefFileTargetPath Condition="'$(RefFileTargetPath)' == ''">ref/$(TargetFramework)</RefFileTargetPath>
<LibFileTargetPath Condition="'$(LibFileTargetPath)' == '' AND '$(PackageTargetRuntime)' == ''">lib/$(TargetFramework)</LibFileTargetPath> <LibFileTargetPath Condition="'$(LibFileTargetPath)' == '' and '$(PackageTargetRuntime)' == ''">lib/$(TargetFramework)</LibFileTargetPath>
<LibFileTargetPath Condition="'$(LibFileTargetPath)' == '' AND '$(PackageTargetRuntime)' != ''">runtimes/$(PackageTargetRuntime)/lib/$(TargetFramework)</LibFileTargetPath> <LibFileTargetPath Condition="'$(LibFileTargetPath)' == '' and '$(PackageTargetRuntime)' != ''">runtimes/$(PackageTargetRuntime)/lib/$(TargetFramework)</LibFileTargetPath>
<NativeFileTargetPath Condition="'$(NativeFileTargetPath)' == '' AND '$(PackageTargetRuntime)' != ''">runtimes/$(PackageTargetRuntime)/native</NativeFileTargetPath> <NativeFileTargetPath Condition="'$(NativeFileTargetPath)' == '' and '$(PackageTargetRuntime)' != ''">runtimes/$(PackageTargetRuntime)/native</NativeFileTargetPath>
<NativeBinDir Condition="'$(PackageTargetRuntimeSuffix)' == 'aot'">$(NativeBinDir)-aot</NativeBinDir> <NativeBinDir Condition="'$(PackageTargetRuntimeSuffix)' == 'aot'">$(NativeBinDir)-aot</NativeBinDir>
</PropertyGroup> </PropertyGroup>
...@@ -42,11 +42,11 @@ ...@@ -42,11 +42,11 @@
</ItemGroup> </ItemGroup>
<Target Name="_CheckForFiles"> <Target Name="_CheckForFiles">
<Error Condition="'$(IncludeReferenceFiles)' == 'true' AND '@(RefFile)' == ''" <Error Condition="'$(IncludeReferenceFiles)' == 'true' and '@(RefFile)' == ''"
Text="IncludeReferenceFiles was specified but no file props were found in '$(RefBinDir)'" /> Text="IncludeReferenceFiles was specified but no file props were found in '$(RefBinDir)'" />
<Error Condition="'$(IncludeLibFiles)' == 'true' AND '@(LibFile)' == ''" <Error Condition="'$(IncludeLibFiles)' == 'true' and '@(LibFile)' == ''"
Text="IncludeLibFiles was specified but no file props were found in '$(LibBinDir)'" /> Text="IncludeLibFiles was specified but no file props were found in '$(LibBinDir)'" />
<Error Condition="'$(IncludeNativeFiles)' == 'true' AND '@(NativeFile)' == ''" <Error Condition="'$(IncludeNativeFiles)' == 'true' and '@(NativeFile)' == ''"
Text="IncludeNativeFiles was specified but no files were found in '$(NativeBinDir)'" /> Text="IncludeNativeFiles was specified but no files were found in '$(NativeBinDir)'" />
</Target> </Target>
...@@ -83,11 +83,11 @@ ...@@ -83,11 +83,11 @@
<Target Name="GetClosureFiles"> <Target Name="GetClosureFiles">
<!-- sets up ClosureFile items that are organized by file-set --> <!-- sets up ClosureFile items that are organized by file-set -->
<ItemGroup> <ItemGroup>
<ClosureFile Include="@(RefFile)" Condition="Exists('%(FullPath)') AND ('%(Extension)' == '.dll' OR '%(Extension)' == '$(LibraryFileExtension)')" > <ClosureFile Include="@(RefFile)" Condition="Exists('%(FullPath)') and ('%(Extension)' == '.dll' or '%(Extension)' == '$(LibraryFileExtension)')" >
<FileSet>reference</FileSet> <FileSet>reference</FileSet>
</ClosureFile> </ClosureFile>
<ClosureFile Include="@(LibFile);@(NativeFile)" Condition="Exists('%(FullPath)') AND ('%(Extension)' == '.dll' OR '%(Extension)' == '$(LibraryFileExtension)')"> <ClosureFile Include="@(LibFile);@(NativeFile)" Condition="Exists('%(FullPath)') and ('%(Extension)' == '.dll' or '%(Extension)' == '$(LibraryFileExtension)')">
<FileSet>runtime</FileSet> <FileSet>runtime</FileSet>
</ClosureFile> </ClosureFile>
</ItemGroup> </ItemGroup>
...@@ -170,7 +170,7 @@ ...@@ -170,7 +170,7 @@
<ItemGroup> <ItemGroup>
<File> <File>
<IsSymbolFile Condition="'%(Extension)' == '.pdb'">true</IsSymbolFile> <IsSymbolFile Condition="'%(Extension)' == '.pdb'">true</IsSymbolFile>
<IsSymbolFile Condition="'$(SymbolFileExtension)' != '' AND'%(Extension)' == '$(SymbolFileExtension)'">true</IsSymbolFile> <IsSymbolFile Condition="'$(SymbolFileExtension)' != '' and'%(Extension)' == '$(SymbolFileExtension)'">true</IsSymbolFile>
</File> </File>
</ItemGroup> </ItemGroup>
</Target> </Target>
......
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
<Target Name="VerifyReferenceClosure" <Target Name="VerifyReferenceClosure"
DependsOnTargets="ResolveReferences" DependsOnTargets="ResolveReferences"
Condition="'$(ShouldVerifyClosure)' == 'true' AND '$(RuntimeIdentifier)' == ''"> Condition="'$(ShouldVerifyClosure)' == 'true' and '$(RuntimeIdentifier)' == ''">
<ItemGroup> <ItemGroup>
<_refClosureFileNames Include="@(ReferencePath->'%(FileName)')"> <_refClosureFileNames Include="@(ReferencePath->'%(FileName)')">
<Original>%(Identity)</Original> <Original>%(Identity)</Original>
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
<Target Name="VerifyReferenceTypes" <Target Name="VerifyReferenceTypes"
DependsOnTargets="ResolveReferences" DependsOnTargets="ResolveReferences"
Condition="'$(ShouldVerifyTypes)' == 'true' AND '$(RuntimeIdentifier)' == ''"> Condition="'$(ShouldVerifyTypes)' == 'true' and '$(RuntimeIdentifier)' == ''">
<ItemGroup> <ItemGroup>
<_refTypesFileNames Include="@(ReferencePath->'%(FileName)')"> <_refTypesFileNames Include="@(ReferencePath->'%(FileName)')">
<Original>%(Identity)</Original> <Original>%(Identity)</Original>
...@@ -62,7 +62,7 @@ ...@@ -62,7 +62,7 @@
<Target Name="VerifyRuntimeClosure" <Target Name="VerifyRuntimeClosure"
DependsOnTargets="ResolveReferences" DependsOnTargets="ResolveReferences"
Condition="'$(ShouldVerifyClosure)' == 'true' AND '$(RuntimeIdentifier)' != ''"> Condition="'$(ShouldVerifyClosure)' == 'true' and '$(RuntimeIdentifier)' != ''">
<ItemGroup> <ItemGroup>
<_runClosureFileNames Include="@(ReferenceCopyLocalPaths->'%(FileName)')"> <_runClosureFileNames Include="@(ReferenceCopyLocalPaths->'%(FileName)')">
<Original>%(Identity)</Original> <Original>%(Identity)</Original>
...@@ -78,7 +78,7 @@ ...@@ -78,7 +78,7 @@
<Target Name="VerifyRuntimeTypes" <Target Name="VerifyRuntimeTypes"
DependsOnTargets="ResolveReferences" DependsOnTargets="ResolveReferences"
Condition="'$(ShouldVerifyTypes)' == 'true' AND '$(RuntimeIdentifier)' != ''"> Condition="'$(ShouldVerifyTypes)' == 'true' and '$(RuntimeIdentifier)' != ''">
<ItemGroup> <ItemGroup>
<_runTypesFileNames Include="@(ReferenceCopyLocalPaths->'%(FileName)')"> <_runTypesFileNames Include="@(ReferenceCopyLocalPaths->'%(FileName)')">
<Original>%(Identity)</Original> <Original>%(Identity)</Original>
...@@ -129,7 +129,7 @@ ...@@ -129,7 +129,7 @@
<TestDependsOn>_getTestProjects</TestDependsOn> <TestDependsOn>_getTestProjects</TestDependsOn>
<!-- Runs ResolveReferences once up front in order to ensure we don't run it for the first time concurrently during testing. <!-- Runs ResolveReferences once up front in order to ensure we don't run it for the first time concurrently during testing.
This is needed to avoid sharing violations when RAR and ResolvePackageAssets write out state files. --> This is needed to avoid sharing violations when RAR and ResolvePackageAssets write out state files. -->
<TestDependsOn Condition="'$(ShouldVerifyClosure)' == 'true' OR '$(ShouldVerifyTypes)' == 'true'">$(TestDependsOn);ResolveReferences</TestDependsOn> <TestDependsOn Condition="'$(ShouldVerifyClosure)' == 'true' or '$(ShouldVerifyTypes)' == 'true'">$(TestDependsOn);ResolveReferences</TestDependsOn>
</PropertyGroup> </PropertyGroup>
<!-- Runs all tests scenarios for this project --> <!-- Runs all tests scenarios for this project -->
<Target Name="Test" <Target Name="Test"
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<NETStandardSupportPackageId>NETStandard.Library.NETFramework</NETStandardSupportPackageId> <NETStandardSupportPackageId>NETStandard.Library.NETFramework</NETStandardSupportPackageId>
<NETStandardSupportPackageVersion>2.0.1-servicing-26011-01</NETStandardSupportPackageVersion> <NETStandardSupportPackageVersion>2.0.1-servicing-26011-01</NETStandardSupportPackageVersion>
<NETStandardSupportRoot>$(NuGetPackageRoot)$(NETStandardSupportPackageId.ToLower())\$(NETStandardSupportPackageVersion)\build</NETStandardSupportRoot> <NETStandardSupportRoot>$(NuGetPackageRoot)$(NETStandardSupportPackageId.ToLower())\$(NETStandardSupportPackageVersion)\build</NETStandardSupportRoot>
<AddNetStandardSupportPackage Condition="'$(TargetFramework)' == 'net461' OR '$(TargetFramework)' == 'net462' OR '$(TargetFramework)' == 'net47'">true</AddNetStandardSupportPackage> <AddNetStandardSupportPackage Condition="'$(TargetFramework)' == 'net461' or '$(TargetFramework)' == 'net462' or '$(TargetFramework)' == 'net47'">true</AddNetStandardSupportPackage>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(TargetsNetFx)' != 'true'"> <PropertyGroup Condition="'$(TargetsNetFx)' != 'true'">
<!-- For things not .NETFramework we need the net472 targeting pack to generate facades --> <!-- For things not .NETFramework we need the net472 targeting pack to generate facades -->
...@@ -30,17 +30,17 @@ ...@@ -30,17 +30,17 @@
<PropertyGroup> <PropertyGroup>
<_TargetingPackVersion>1.0.1</_TargetingPackVersion> <_TargetingPackVersion>1.0.1</_TargetingPackVersion>
<_TargetingPackVersion Condition="'$(TargetingPackNugetPackageId)' == 'Microsoft.TargetingPack.NETFramework.v4.7.1' OR '$(TargetingPackNugetPackageId)' == 'Microsoft.TargetingPack.NETFramework.v4.7.2'">1.0.0</_TargetingPackVersion> <_TargetingPackVersion Condition="'$(TargetingPackNugetPackageId)' == 'Microsoft.TargetingPack.NETFramework.v4.7.1' or '$(TargetingPackNugetPackageId)' == 'Microsoft.TargetingPack.NETFramework.v4.7.2'">1.0.0</_TargetingPackVersion>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="$(TargetingPackNugetPackageId)"> <PackageReference Include="$(TargetingPackNugetPackageId)">
<Version >$(_TargetingPackVersion)</Version> <Version >$(_TargetingPackVersion)</Version>
</PackageReference> </PackageReference>
<PackageReference Include="System.Memory" Condition="'$(TargetFramework)' == 'net45' OR '$(TargetFramework)' == 'net46'"> <PackageReference Include="System.Memory" Condition="'$(TargetFramework)' == 'net45' or '$(TargetFramework)' == 'net46'">
<Version>4.5.2</Version> <Version>4.5.2</Version>
</PackageReference> </PackageReference>
<PackageReference Include="System.Numerics.Vectors" Condition="'$(TargetGroup)' == 'net461' OR '$(TargetGroup)' == 'netfx'"> <PackageReference Include="System.Numerics.Vectors" Condition="'$(TargetGroup)' == 'net461' or '$(TargetGroup)' == 'netfx'">
<Version>4.5.0</Version> <Version>4.5.0</Version>
</PackageReference> </PackageReference>
<PackageReference Include="$(NETStandardSupportPackageId)" Condition="'$(AddNetStandardSupportPackage)' == 'true'"> <PackageReference Include="$(NETStandardSupportPackageId)" Condition="'$(AddNetStandardSupportPackage)' == 'true'">
...@@ -55,7 +55,7 @@ ...@@ -55,7 +55,7 @@
<Target Name="AddNETStandardShims" AfterTargets="FilterNugetPackages" <Target Name="AddNETStandardShims" AfterTargets="FilterNugetPackages"
Condition="'$(AddNetStandardSupportPackage)' == 'true'"> Condition="'$(AddNetStandardSupportPackage)' == 'true'">
<ItemGroup> <ItemGroup>
<_netStandardReference Condition="'$(TargetFramework)' != 'net461' AND '$(TargetFramework)' != 'net462'" <_netStandardReference Condition="'$(TargetFramework)' != 'net461' and '$(TargetFramework)' != 'net462'"
Include="$(NETStandardSupportRoot)\net47\lib\*.dll" Include="$(NETStandardSupportRoot)\net47\lib\*.dll"
Exclude="@(_netStandardReference->'$(NETStandardSupportRoot)\net47\lib\%(FileName).dll')" /> Exclude="@(_netStandardReference->'$(NETStandardSupportRoot)\net47\lib\%(FileName).dll')" />
<_netStandardReference Condition="'$(TargetFramework)' != 'net461'" <_netStandardReference Condition="'$(TargetFramework)' != 'net461'"
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<!-- We're using ToolRuntimeRID as a placeholder for the real corelib/runtime components until we have an actual set of runtime bits to consume for webassembly. --> <!-- We're using ToolRuntimeRID as a placeholder for the real corelib/runtime components until we have an actual set of runtime bits to consume for webassembly. -->
<RuntimeIdentifier Condition="'$(RuntimeOS)' == 'webassembly'">$(ToolRuntimeRID)</RuntimeIdentifier> <RuntimeIdentifier Condition="'$(RuntimeOS)' == 'webassembly'">$(ToolRuntimeRID)</RuntimeIdentifier>
<NoWarn>$(NoWarn);NU1603;NU1605</NoWarn> <NoWarn>$(NoWarn);NU1603;NU1605</NoWarn>
<SwapNativeForIL Condition="'$(SwapNativeForIL)' == '' AND ('$(ConfigurationGroup)' == 'Debug' OR '$(Coverage)' == 'true')">true</SwapNativeForIL> <SwapNativeForIL Condition="'$(SwapNativeForIL)' == '' and ('$(ConfigurationGroup)' == 'Debug' or '$(Coverage)' == 'true')">true</SwapNativeForIL>
</PropertyGroup> </PropertyGroup>
<ItemGroup Condition="'$(DotNetBuildFromSource)' != 'true'"> <ItemGroup Condition="'$(DotNetBuildFromSource)' != 'true'">
...@@ -100,7 +100,7 @@ ...@@ -100,7 +100,7 @@
<_CoreLibFilePath>%(_CoreLibFile.FullPath)</_CoreLibFilePath> <_CoreLibFilePath>%(_CoreLibFile.FullPath)</_CoreLibFilePath>
<_CoreLibPackagePath>$(_CoreLibFilePath.SubString(0, $(_CoreLibFilePath.IndexOf('runtimes'))))</_CoreLibPackagePath> <_CoreLibPackagePath>$(_CoreLibFilePath.SubString(0, $(_CoreLibFilePath.IndexOf('runtimes'))))</_CoreLibPackagePath>
</PropertyGroup> </PropertyGroup>
<Error Condition="'$(_CoreLibPackagePath)' == '' OR !Exists('$(_CoreLibPackagePath)')" <Error Condition="'$(_CoreLibPackagePath)' == '' or !Exists('$(_CoreLibPackagePath)')"
Text="Could not locate the CoreClr package." /> Text="Could not locate the CoreClr package." />
</Target> </Target>
......
...@@ -67,7 +67,7 @@ ...@@ -67,7 +67,7 @@
<_netStandard21OnlyRef>$(NetStandard21RefPath)netstandard.dll</_netStandard21OnlyRef> <_netStandard21OnlyRef>$(NetStandard21RefPath)netstandard.dll</_netStandard21OnlyRef>
<_netStandard21OnlyRef Condition="$(UpdateNETStandardBaselineLocally)">$(MSBuildThisFileDirectory)..\..\..\standard\artifacts\bin\ref\netstandard\Debug\netstandard.dll</_netStandard21OnlyRef> <_netStandard21OnlyRef Condition="$(UpdateNETStandardBaselineLocally)">$(MSBuildThisFileDirectory)..\..\..\standard\artifacts\bin\ref\netstandard\Debug\netstandard.dll</_netStandard21OnlyRef>
<_netStandard21BaselineModifer>--baseline</_netStandard21BaselineModifer> <_netStandard21BaselineModifer>--baseline</_netStandard21BaselineModifer>
<_netStandard21BaselineModifer Condition="$(UpdateNETStandardBaseline) OR $(UpdateNETStandardBaselineLocally)">&gt;</_netStandard21BaselineModifer> <_netStandard21BaselineModifer Condition="$(UpdateNETStandardBaseline) or $(UpdateNETStandardBaselineLocally)">&gt;</_netStandard21BaselineModifer>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="$(UpdateNETStandardBaseline)"> <PropertyGroup Condition="$(UpdateNETStandardBaseline)">
......
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
<HasMatchingContract>true</HasMatchingContract> <HasMatchingContract>true</HasMatchingContract>
</PropertyGroup> </PropertyGroup>
<ItemGroup Condition="'$(MSBuildProjectName)' == 'System.Runtime' OR '$(MSBuildProjectName)' == 'mscorlib' OR '$(MSBuildProjectName)' == 'netstandard'"> <ItemGroup Condition="'$(MSBuildProjectName)' == 'System.Runtime' or '$(MSBuildProjectName)' == 'mscorlib' or '$(MSBuildProjectName)' == 'netstandard'">
<!-- Omit System.Void since C# doesn't permit the use of the `System.Void` <!-- Omit System.Void since C# doesn't permit the use of the `System.Void`
typename and instead requires callers to use the `void` keyword. --> typename and instead requires callers to use the `void` keyword. -->
<GenFacadesOmitType Include="System.Void" /> <GenFacadesOmitType Include="System.Void" />
......
...@@ -45,7 +45,7 @@ ...@@ -45,7 +45,7 @@
however since the project names are unique it will essentially force each to run in its own batch --> however since the project names are unique it will essentially force each to run in its own batch -->
<MSBuild Targets="Test" <MSBuild Targets="Test"
Projects="@(Project)" Projects="@(Project)"
Condition="'$(SerializeProjects)' == 'true' AND '%(Identity)' != ''" Condition="'$(SerializeProjects)' == 'true' and '%(Identity)' != ''"
Properties="TestAllProjects=true;BuildConfiguration=$(BuildConfiguration)" Properties="TestAllProjects=true;BuildConfiguration=$(BuildConfiguration)"
ContinueOnError="ErrorAndContinue" /> ContinueOnError="ErrorAndContinue" />
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册