diff --git a/Directory.Build.props b/Directory.Build.props
index d654ceb87578269e7884f6b21c7bd90ba6573e8e..3d391c4b4436aeb6cbe3619c828b0432f126cc3b 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -1,63 +1,74 @@
-
-
+
-
+
false
-
-
-
-
-
- $([MSBuild]::EnsureTrailingSlash('$(MSBuildThisFileDirectory)'))
- $([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'eng'))
- $([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'artifacts'))
- $([MSBuild]::NormalizeDirectory('$(ArtifactsDir)', 'bin'))
- $([MSBuild]::NormalizeDirectory('$(ArtifactsDir)', 'obj'))
+
+ OSX
+ FreeBSD
+ NetBSD
+ illumos
+ Solaris
+ Linux
+ windows
+ true
-
-
+
+
+ <_hostArch>$([System.Runtime.InteropServices.RuntimeInformation]::ProcessArchitecture.ToString().ToLowerInvariant)
+ $(_hostArch)
+ arm
+ arm64
+ wasm
+ x64
+ x64
+ $(TargetArchitecture)
+
-
-
+
+
+
-
- $([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'installer.tasks'))
- $([MSBuild]::NormalizePath('$(InstallerTasksOutputPath)', 'Debug', 'netstandard2.0', 'installer.tasks.dll'))
- $([MSBuild]::NormalizePath('$(InstallerTasksOutputPath)', 'Debug', 'net461', 'installer.tasks.dll'))
-
- $([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'docs'))
- $([MSBuild]::NormalizeDirectory('$(DocsDir)', 'manpages'))
-
-
- $([MSBuild]::NormalizeDirectory('$(LibrariesProjectRoot)', 'System.Private.CoreLib', 'src'))
- $([MSBuild]::NormalizePath('$(CoreClrProjectRoot)', 'System.Private.CoreLib', 'System.Private.CoreLib.csproj'))
- $([MSBuild]::NormalizePath('$(MonoProjectRoot)', 'netcore', 'System.Private.CoreLib', 'System.Private.CoreLib.csproj'))
+ $(MajorVersion).$(MinorVersion)
+ 5.0
+ 5.0
+ .NETCoreApp
+ $(NetCoreAppCurrentIdentifier),Version=v$(NetCoreAppCurrentVersion)
+ net$(NetCoreAppCurrentVersion)
+ net$(AspNetCoreAppCurrentVersion)
+ net$(NetCoreAppToolCurrentVersion)
+ $(NetCoreAppCurrentIdentifier),Version=v$(NetCoreAppToolCurrentVersion)
+
+ $(NetCoreAppCurrent)
+ Microsoft.NETCore.App
+ .NET $(NetCoreAppCurrentVersion)
+ $([MSBuild]::NormalizeDirectory('$(MSBuildThisFileDirectory)', 'src', 'libraries'))
+ $([MSBuild]::NormalizeDirectory('$(MSBuildThisFileDirectory)', 'src', 'coreclr'))
+ $([MSBuild]::NormalizeDirectory('$(MSBuildThisFileDirectory)', 'src', 'mono'))
+ $([MSBuild]::NormalizeDirectory('$(MSBuildThisFileDirectory)', 'src', 'installer'))
+ $([MSBuild]::NormalizeDirectory('$(MSBuildThisFileDirectory)', 'tools-local'))
+ $([MSBuild]::NormalizeDirectory('$(MSBuildThisFileDirectory)', 'src', 'tasks'))
+ $([MSBuild]::NormalizeDirectory('$(ArtifactsDir)', 'ibc'))
+ $([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'docs'))
+ $([MSBuild]::NormalizeDirectory('$(NuGetPackageRoot)', 'microsoft.private.intellisense', '$(MicrosoftPrivateIntellisenseVersion)', 'IntellisenseFiles', 'net'))
+ $([MSBuild]::NormalizeDirectory('$(MSBuildThisFileDirectory)', 'docs'))
+ $([MSBuild]::NormalizeDirectory('$(DocsDir)', 'manpages'))
+
$([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'AppleAppBuilder', 'Debug', '$(NetCoreAppToolCurrent)'))
$([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'AndroidAppBuilder', 'Debug', '$(NetCoreAppToolCurrent)', 'publish'))
$([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'WasmAppBuilder', 'Debug', '$(NetCoreAppToolCurrent)', 'publish'))
$([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'WasmBuildTasks', 'Debug', '$(NetCoreAppToolCurrent)', 'publish'))
$([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'MonoAOTCompiler', 'Debug', '$(NetCoreAppToolCurrent)'))
+ $([MSBuild]::NormalizePath('$(ArtifactsBinDir)', 'installer.tasks', 'Debug', 'netstandard2.0', 'installer.tasks.dll'))
+ $([MSBuild]::NormalizePath('$(ArtifactsBinDir)', 'installer.tasks', 'Debug', 'net461', 'installer.tasks.dll'))
$([MSBuild]::NormalizePath('$(AppleAppBuilderDir)', 'AppleAppBuilder.dll'))
$([MSBuild]::NormalizePath('$(AndroidAppBuilderDir)', 'AndroidAppBuilder.dll'))
$([MSBuild]::NormalizePath('$(WasmAppBuilderDir)', 'WasmAppBuilder.dll'))
@@ -65,39 +76,155 @@
$([MSBuild]::NormalizePath('$(MonoAOTCompilerDir)', 'MonoAOTCompiler.dll'))
-
+
+
+ $(Configuration)
+ $(Configuration)
+ Debug
+ $(RuntimeConfiguration)
+ $(RuntimeConfiguration)
+
+ Debug
+ $(Configuration)
+
+
+
+
+ true
+
+ <_parseDistroRid>$(__DistroRid)
+ <_parseDistroRid Condition="'$(_parseDistroRid)' == '' and '$(MSBuildRuntimeType)' == 'core'">$([System.Runtime.InteropServices.RuntimeInformation]::RuntimeIdentifier)
+ <_parseDistroRid Condition="'$(_parseDistroRid)' == '' and '$(MSBuildRuntimeType)' != 'core'">win-$([System.Runtime.InteropServices.RuntimeInformation]::OSArchitecture.ToString().ToLowerInvariant)
+ <_distroRidIndex>$(_parseDistroRid.LastIndexOfAny("-"))
+
+ <_runtimeOS>$(RuntimeOS)
+ <_runtimeOS Condition="'$(_runtimeOS)' == ''">$(_parseDistroRid.SubString(0, $(_distroRidIndex)))
+
+
+ <_runtimeOS Condition="'$(TargetsMobile)' == 'true'">$(TargetOS.ToLowerInvariant())
+
+ <_runtimeOSVersionIndex>$(_runtimeOS.IndexOfAny(".-0123456789"))
+ <_runtimeOSFamily Condition="'$(_runtimeOSVersionIndex)' != '-1'">$(_runtimeOS.SubString(0, $(_runtimeOSVersionIndex)))
+
+ <_portableOS>linux
+ <_portableOS Condition="'$(_runtimeOS)' == 'linux-musl'">linux-musl
+ <_portableOS Condition="$([MSBuild]::IsOSPlatform('OSX'))">osx
+ <_portableOS Condition="'$(_runtimeOSFamily)' == 'win' or '$(_runtimeOS)' == 'win' or '$(TargetOS)' == 'windows'">win
+ <_portableOS Condition="'$(_runtimeOSFamily)' == 'FreeBSD'">freebsd
+ <_portableOS Condition="'$(_runtimeOSFamily)' == 'illumos'">illumos
+ <_portableOS Condition="'$(_runtimeOSFamily)' == 'Solaris'">solaris
+ <_portableOS Condition="'$(_runtimeOS)' == 'Browser'">browser
+ <_portableOS Condition="'$(_runtimeOS)' == 'ios'">ios
+ <_portableOS Condition="'$(_runtimeOS)' == 'tvos'">tvos
+ <_portableOS Condition="'$(_runtimeOS)' == 'android'">android
+
+ <_runtimeOS Condition="$(_runtimeOS.StartsWith('tizen'))">linux
+ <_runtimeOS Condition="'$(PortableBuild)' == 'true'">$(_portableOS)
+
+
+ <_portableOS Condition="'$(TargetOS)' == 'Unix' and '$(_runtimeOSFamily)' != 'osx' and '$(_runtimeOSFamily)' != 'FreeBSD' and '$(_runtimeOS)' != 'linux-musl' and '$(_runtimeOSFamily)' != 'illumos' and '$(_runtimeOSFamily)' != 'Solaris'">linux
+
+
+
+ <_toolRuntimeRID Condition="'$(BuildingInsideVisualStudio)' == 'true'">$(_runtimeOS)-x64
+ <_toolRuntimeRID Condition="'$(_toolRuntimeRID)' == ''">$(_runtimeOS)-$(_hostArch)
+
+ <_toolRuntimeRID Condition="'$(_runtimeOS)' == 'linux-musl' and $(TargetArchitecture.StartsWith('arm')) and !$(_hostArch.StartsWith('arm'))">linux-x64
+
+
+ <_toolRuntimeRID Condition="'$(_runtimeOS)' == 'browser'">linux-x64
+ <_toolRuntimeRID Condition="'$(_runtimeOS)' == 'browser' and $([MSBuild]::IsOSPlatform('WINDOWS'))">win-x64
+ <_toolRuntimeRID Condition="'$(_runtimeOS)' == 'browser' and $([MSBuild]::IsOSPlatform('OSX'))">osx-x64
+
+
+ <_toolRuntimeRID Condition="'$(_runtimeOS)' == 'android'">linux-x64
+ <_toolRuntimeRID Condition="'$(_runtimeOS)' == 'android' and $([MSBuild]::IsOSPlatform('WINDOWS'))">win-x64
+ <_toolRuntimeRID Condition="'$(_runtimeOS)' == 'android' and $([MSBuild]::IsOSPlatform('OSX'))">osx-x64
+
+
+ <_toolRuntimeRID Condition="'$(_runtimeOS)' == 'ios' or '$(_runtimeOS)' == 'tvos'">osx-x64
+
+ $(_toolRuntimeRID)
+
+ <_packageRID Condition="'$(PortableBuild)' == 'true'">$(_portableOS)-$(TargetArchitecture)
+ $(_packageRID)
+ $(_runtimeOS)-$(TargetArchitecture)
+
+ <_outputRID Condition="'$(TargetOS)' == 'windows'">win-$(TargetArchitecture)
+ <_outputRID Condition="'$(TargetOS)' == 'OSX'">osx-$(TargetArchitecture)
+ <_outputRID Condition="'$(TargetOS)' == 'Linux'">linux-$(TargetArchitecture)
+ <_outputRID Condition="'$(TargetOS)' == 'FreeBSD'">freebsd-$(TargetArchitecture)
+ <_outputRID Condition="'$(TargetOS)' == 'NetBSD'">netbsd-$(TargetArchitecture)
+ <_outputRID Condition="'$(TargetOS)' == 'illumos'">illumos-$(TargetArchitecture)
+ <_outputRID Condition="'$(TargetOS)' == 'Solaris'">solaris-$(TargetArchitecture)
+ <_outputRID Condition="'$(TargetOS)' == 'iOS'">ios-$(TargetArchitecture)
+ <_outputRID Condition="'$(TargetOS)' == 'tvOS'">tvos-$(TargetArchitecture)
+ <_outputRID Condition="'$(TargetOS)' == 'Android'">android-$(TargetArchitecture)
+ <_outputRID Condition="'$(TargetOS)' == 'Browser'">browser-$(TargetArchitecture)
+
+ $(PackageRID)
+ $(_outputRID)
+
+
+
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+
+
+
+
+ true
+
+ true
+
+ false
+
+
+
+
+
+
+
+
+ $([MSBuild]::NormalizeDirectory('$(LibrariesProjectRoot)', 'System.Private.CoreLib', 'src'))
+ $([MSBuild]::NormalizePath('$(CoreClrProjectRoot)', 'System.Private.CoreLib', 'System.Private.CoreLib.csproj'))
+ $([MSBuild]::NormalizePath('$(MonoProjectRoot)', 'netcore', 'System.Private.CoreLib', 'System.Private.CoreLib.csproj'))
+
+
+
-
runtime
git://github.com/dotnet/runtime
https://github.com/dotnet/runtime
https://github.com/dotnet/runtime/blob/master/LICENSE.TXT
$([MSBuild]::NormalizePath('$(LibrariesProjectRoot)', 'pkg', 'Microsoft.NETCore.Platforms', 'runtime.json'))
- $(RepoRoot)LICENSE.TXT
+ $(MSBuildThisFileDirectory)LICENSE.TXT
MIT
$(CopyrightNetFoundation)
- $(RepoRoot)THIRD-PARTY-NOTICES.TXT
+ $(MSBuildThisFileDirectory)THIRD-PARTY-NOTICES.TXT
https://go.microsoft.com/fwlink/?LinkID=799421
-
true
-
$(MSBuildProjectName.Contains('Experimental'))
-
true
false
-
false
-
-
- false
-
true
@@ -107,19 +234,18 @@
preview
latest
+
+ strict;nullablePublicOnly
true
true
-
-
-
+
+ portable
+ true
false
Properties
-
- $([System.Runtime.InteropServices.RuntimeInformation]::ProcessArchitecture.ToString().ToLowerInvariant())
+
+ false
-
-
-
diff --git a/Directory.Build.targets b/Directory.Build.targets
index e8bb87918af86584ea5e4a7d61b600705b15c322..764d12bb822fc4ed6a869bd65a5bbed6125e84c0 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -5,13 +5,11 @@
tell Microsoft.Common.targets not to import Directory.Build.targets again
-->
false
-
- false
+
-
$(MajorVersion).$(MinorVersion)
+ false
+
+ Microsoft%AE .NET
+
+ $(ProductVersion)
+ $(ProductVersion)-$(VersionSuffix)
diff --git a/eng/Configurations.props b/eng/Configurations.props
deleted file mode 100644
index 0cad6e6db72841108aad6f267abca4df65190b83..0000000000000000000000000000000000000000
--- a/eng/Configurations.props
+++ /dev/null
@@ -1,186 +0,0 @@
-
-
-
-
-
- true
-
-
-
- $([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'src', 'libraries'))
- $([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'src', 'coreclr'))
- $([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'src', 'mono'))
- $([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'src', 'installer'))
- $([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'tools-local'))
- $([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'src', 'tasks'))
- $([MSBuild]::NormalizeDirectory('$(ArtifactsDir)', 'ibc'))
- $([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'docs'))
-
-
-
-
-
- 6.0
- 5.0
- 5.0
- .NETCoreApp
- $(NetCoreAppCurrentIdentifier),Version=v$(NetCoreAppCurrentVersion)
- net$(NetCoreAppCurrentVersion)
- net$(AspNetCoreAppCurrentVersion)
- net$(NetCoreAppToolCurrentVersion)
- $(NetCoreAppCurrentIdentifier),Version=v$(NetCoreAppToolCurrentVersion)
-
- $(NetCoreAppCurrent)
- Microsoft.NETCore.App
- .NET $(NetCoreAppCurrentVersion)
-
-
-
-
- $(Configuration)
- $(Configuration)
- Debug
- $(RuntimeConfiguration)
- $(RuntimeConfiguration)
-
- Debug
- $(Configuration)
-
-
-
- OSX
- FreeBSD
- NetBSD
- illumos
- Solaris
- Linux
- windows
- $(TargetOS)
- $(TargetOS)
- $(TargetOS)
-
-
-
- true
-
-
-
- <_runtimeOS>$(RuntimeOS)
-
- <_parseDistroRid>$(__DistroRid)
- <_parseDistroRid Condition="'$(_parseDistroRid)' == '' and '$(MSBuildRuntimeType)' == 'core'">$([System.Runtime.InteropServices.RuntimeInformation]::RuntimeIdentifier)
- <_parseDistroRid Condition="'$(_parseDistroRid)' == '' and '$(MSBuildRuntimeType)' != 'core'">win-$([System.Runtime.InteropServices.RuntimeInformation]::OSArchitecture.ToString().ToLowerInvariant)
- <_distroRidIndex>$(_parseDistroRid.LastIndexOfAny("-"))
-
- <_runtimeOS Condition="'$(_runtimeOS)' == ''">$(_parseDistroRid.SubString(0, $(_distroRidIndex)))
-
-
- <_runtimeOS Condition="'$(TargetsMobile)' == 'true'">$(TargetOS.ToLowerInvariant())
-
- <_runtimeOSVersionIndex>$(_runtimeOS.IndexOfAny(".-0123456789"))
- <_runtimeOSFamily Condition="'$(_runtimeOSVersionIndex)' != '-1'">$(_runtimeOS.SubString(0, $(_runtimeOSVersionIndex)))
-
- <_portableOS>linux
- <_portableOS Condition="'$(_runtimeOS)' == 'linux-musl'">linux-musl
- <_portableOS Condition="$([MSBuild]::IsOSPlatform('OSX'))">osx
- <_portableOS Condition="'$(_runtimeOSFamily)' == 'win' or '$(_runtimeOS)' == 'win' or '$(TargetOS)' == 'windows'">win
- <_portableOS Condition="'$(_runtimeOSFamily)' == 'FreeBSD'">freebsd
- <_portableOS Condition="'$(_runtimeOSFamily)' == 'illumos'">illumos
- <_portableOS Condition="'$(_runtimeOSFamily)' == 'Solaris'">solaris
- <_portableOS Condition="'$(_runtimeOS)' == 'Browser'">browser
- <_portableOS Condition="'$(_runtimeOS)' == 'ios'">ios
- <_portableOS Condition="'$(_runtimeOS)' == 'tvos'">tvos
- <_portableOS Condition="'$(_runtimeOS)' == 'android'">android
-
- <_runtimeOS Condition="$(_runtimeOS.StartsWith('tizen'))">linux
- <_runtimeOS Condition="'$(PortableBuild)' == 'true'">$(_portableOS)
-
-
- <_portableOS Condition="'$(TargetOS)' == 'Unix' and '$(_runtimeOSFamily)' != 'osx' and '$(_runtimeOSFamily)' != 'FreeBSD' and '$(_runtimeOS)' != 'linux-musl' and '$(_runtimeOSFamily)' != 'illumos' and '$(_runtimeOSFamily)' != 'Solaris'">linux
-
-
-
- <_hostArch>$([System.Runtime.InteropServices.RuntimeInformation]::ProcessArchitecture.ToString().ToLowerInvariant)
- arm
- arm64
- wasm
- x64
- x64
-
-
-
- <_toolRuntimeRID Condition="'$(BuildingInsideVisualStudio)' == 'true'">$(_runtimeOS)-x64
- <_toolRuntimeRID Condition="'$(_toolRuntimeRID)' == ''">$(_runtimeOS)-$(_hostArch)
-
- <_toolRuntimeRID Condition="'$(_runtimeOS)' == 'linux-musl' and $(TargetArchitecture.StartsWith('arm')) and !$(_hostArch.StartsWith('arm'))">linux-x64
-
-
- <_toolRuntimeRID Condition="'$(_runtimeOS)' == 'browser'">linux-x64
- <_toolRuntimeRID Condition="'$(_runtimeOS)' == 'browser' and $([MSBuild]::IsOSPlatform('WINDOWS'))">win-x64
- <_toolRuntimeRID Condition="'$(_runtimeOS)' == 'browser' and $([MSBuild]::IsOSPlatform('OSX'))">osx-x64
-
-
- <_toolRuntimeRID Condition="'$(_runtimeOS)' == 'android'">linux-x64
- <_toolRuntimeRID Condition="'$(_runtimeOS)' == 'android' and $([MSBuild]::IsOSPlatform('WINDOWS'))">win-x64
- <_toolRuntimeRID Condition="'$(_runtimeOS)' == 'android' and $([MSBuild]::IsOSPlatform('OSX'))">osx-x64
-
-
- <_toolRuntimeRID Condition="'$(_runtimeOS)' == 'ios' or '$(_runtimeOS)' == 'tvos'">osx-x64
-
- $(_toolRuntimeRID)
-
- <_packageRID Condition="'$(PortableBuild)' == 'true'">$(_portableOS)-$(TargetArchitecture)
- $(_packageRID)
- $(_runtimeOS)-$(TargetArchitecture)
-
- <_outputRID Condition="'$(TargetOS)' == 'windows'">win-$(TargetArchitecture)
- <_outputRID Condition="'$(TargetOS)' == 'OSX'">osx-$(TargetArchitecture)
- <_outputRID Condition="'$(TargetOS)' == 'Linux'">linux-$(TargetArchitecture)
- <_outputRID Condition="'$(TargetOS)' == 'FreeBSD'">freebsd-$(TargetArchitecture)
- <_outputRID Condition="'$(TargetOS)' == 'NetBSD'">netbsd-$(TargetArchitecture)
- <_outputRID Condition="'$(TargetOS)' == 'illumos'">illumos-$(TargetArchitecture)
- <_outputRID Condition="'$(TargetOS)' == 'Solaris'">solaris-$(TargetArchitecture)
- <_outputRID Condition="'$(TargetOS)' == 'iOS'">ios-$(TargetArchitecture)
- <_outputRID Condition="'$(TargetOS)' == 'tvOS'">tvos-$(TargetArchitecture)
- <_outputRID Condition="'$(TargetOS)' == 'Android'">android-$(TargetArchitecture)
- <_outputRID Condition="'$(TargetOS)' == 'Browser'">browser-$(TargetArchitecture)
-
- $(PackageRID)
- $(_outputRID)
-
-
-
- true
- true
- true
- true
- true
- true
- true
- true
- true
- true
- true
- true
- true
- true
-
-
-
-
- true
-
- true
-
- false
-
-
-
-
diff --git a/eng/Signing.props b/eng/Signing.props
index 2d29ea85ea41dc2d073290d8743ced4ee7a5c7ea..a0fb8225d1b3b9b608173b9125b54fc0fb9d579e 100644
--- a/eng/Signing.props
+++ b/eng/Signing.props
@@ -1,10 +1,5 @@
-
-
-
-
- dotnet
- $(ContainerName)
1.7.0
2.0.0-beta1.20253.1
+ 2.2.0
2.1.0
2.0.3
+ 1.0.0-beta-build0015
+ 2.0.49
+ 1.0.4-preview6.19326.1
+ 0.2.61701
-
- optimization.windows_nt-x64.ibc.corefx
- optimization.linux-x64.ibc.corefx
- microsoft.private.intellisense
- Microsoft.DotNet.XUnitConsoleRunner
- Microsoft.NETCore.App
- optimization.windows_nt-x64.IBC.CoreCLR
- optimization.linux-x64.IBC.CoreCLR
- optimization.PGO.CoreCLR
- Microsoft.DotNet.Build.Tasks.Feed
- Microsoft.NETCore.Targets
- Microsoft.NETCore.Runtime.CoreCLR
- Microsoft.NETCore.Runtime.ICU.Transport
-
- $([MSBuild]::NormalizeDirectory('$(NuGetPackageRoot)', '$(MicrosoftPrivateIntellisensePackage)', '$(MicrosoftPrivateIntellisenseVersion)', 'IntellisenseFiles', 'net'))
-
diff --git a/eng/liveBuilds.targets b/eng/liveBuilds.targets
index aeee8b277f1956fb020e6fc1870068ad5aa8f295..96181b33cfc2db13b7ab62b8f72f60e552fc6367 100644
--- a/eng/liveBuilds.targets
+++ b/eng/liveBuilds.targets
@@ -9,13 +9,13 @@
$([MSBuild]::NormalizeDirectory('$(RuntimeArtifactsPath)'))
$([MSBuild]::NormalizeDirectory('$(RuntimeArtifactsPath)'))
- $(LibrariesTargetOS)-$(LibrariesConfiguration)-$(TargetArchitecture)
+ $(TargetOS)-$(LibrariesConfiguration)-$(TargetArchitecture)
- $([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'artifacts', 'bin', 'coreclr', '$(CoreCLRTargetOS).$(TargetArchitecture).$(CoreCLRConfiguration)'))
- $([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'artifacts', 'bin', 'mono', '$(MonoTargetOS).$(TargetArchitecture).$(MonoConfiguration)'))
+ $([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'artifacts', 'bin', 'coreclr', '$(TargetOS).$(TargetArchitecture).$(CoreCLRConfiguration)'))
+ $([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'artifacts', 'bin', 'mono', '$(TargetOS).$(TargetArchitecture).$(MonoConfiguration)'))
$([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'artifacts'))
$([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'artifacts'))
diff --git a/eng/restore/docs.targets b/eng/restore/docs.targets
index 072564d9ac7aba5f6f09b9f15e6d9c1b191afeef..764bc5bbefb64b363af0ef503b4e3b1c87e9aa06 100644
--- a/eng/restore/docs.targets
+++ b/eng/restore/docs.targets
@@ -1,7 +1,7 @@
-
+
@@ -43,4 +43,4 @@
-
\ No newline at end of file
+
diff --git a/eng/restore/optimizationData.targets b/eng/restore/optimizationData.targets
index a8466b7cd0c7f11333395fdc125f5767db5082ea..9b431aa953af2db9dc36a57216462577b232d578 100644
--- a/eng/restore/optimizationData.targets
+++ b/eng/restore/optimizationData.targets
@@ -1,10 +1,10 @@
-
-
-
-
+
+
+
+
diff --git a/eng/versioning.targets b/eng/versioning.targets
index 4a14c7e0c2d8288152e6f9cadd602db49a28189e..2eede86003fe9eb724a6cfec6d0ff3e8f653983c 100644
--- a/eng/versioning.targets
+++ b/eng/versioning.targets
@@ -68,13 +68,6 @@
$(AssemblyName)
-
-
- Microsoft%AE .NET
-
-
- $(ProductVersion)
- $(InformationalVersion)-$(VersionSuffix)
-
- true
+ true
+
+
+ $(__BuildType)
+ Debug
+ Release
+ Checked
-
-
-
-
+
- false
-
+ $([MSBuild]::NormalizeDirectory('$(ArtifactsObjDir)', 'coreclr', '$(MSBuildProjectName)'))
+ $(BaseIntermediateOutputPath)$(Configuration)\
+ $(BaseIntermediateOutputPath)$(PlatformName)\$(Configuration)\
+ $(MSBuildThisFileDirectory)
+ $([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'coreclr', '$(TargetOS).$(TargetArchitecture).$(Configuration)'))
-
+ false
+ false
$(NumberOfCores)
-
-
- strict;nullablePublicOnly
-
diff --git a/src/coreclr/Directory.Build.targets b/src/coreclr/Directory.Build.targets
index 09081a3d6129f99577afcf1df003f2a438492258..6d5b00ba7c4dccd456ea357e69c710495a33d0b1 100644
--- a/src/coreclr/Directory.Build.targets
+++ b/src/coreclr/Directory.Build.targets
@@ -1,18 +1,6 @@
-
-
-
-
-
- Microsoft%AE .NET
-
-
- $(ProductVersion)
- $(InformationalVersion)-$(VersionSuffix)
-
-
diff --git a/src/coreclr/System.Private.CoreLib/System.Private.CoreLib.csproj b/src/coreclr/System.Private.CoreLib/System.Private.CoreLib.csproj
index 06390a99641df9598f2980ac140987d0662fe872..a2a5b776f4cbda1c14c5d585b4bb963436e2f352 100644
--- a/src/coreclr/System.Private.CoreLib/System.Private.CoreLib.csproj
+++ b/src/coreclr/System.Private.CoreLib/System.Private.CoreLib.csproj
@@ -8,10 +8,6 @@
false
$(NetCoreAppCurrent)
-
- Portable
- true
-
$(RuntimeBinDir)/IL/
Debug;Release;Checked
@@ -42,6 +38,8 @@
true
v4.0.30319
+
+ $(ProductVersion)
true
$(NoWarn),0419,0649,CA2249,CA1830
enable
@@ -91,7 +89,6 @@
- true
SilverlightPlatform
diff --git a/src/coreclr/crossgen-corelib.proj b/src/coreclr/crossgen-corelib.proj
index f1e9eb80fa65d979413e0b5729fab62779f78f4a..fadc1f514c872f3f2915d9f22c27ef42ad71f852 100644
--- a/src/coreclr/crossgen-corelib.proj
+++ b/src/coreclr/crossgen-corelib.proj
@@ -1,8 +1,11 @@
-
-
-
-
-
+
+
+
+ $(NetCoreAppToolCurrent)
+
+
+
false
@@ -105,8 +108,4 @@
-
-
-
-
diff --git a/src/coreclr/dependencies.props b/src/coreclr/dependencies.props
deleted file mode 100644
index 31713f8f7257ff987c0465489fd54d473044a2ed..0000000000000000000000000000000000000000
--- a/src/coreclr/dependencies.props
+++ /dev/null
@@ -1,44 +0,0 @@
-
-
-
-
- 5d3c9a7c54c1c59b764de0e2dfb6bbb4ce29476c
-
-
-
-
- 1.0.0-beta-build0015
- 2.0.49
- 1.0.4-preview6.19326.1
- 0.2.61701
- 2.2.0
-
-
- 2.1.0-preview3-26416-01
-
-
-
-
- build-info/dotnet/
- master
- $(MSBuildThisFileFullPath)
-
-
-
-
- $(BaseDotNetBuildInfo)coreclr/$(DependencyBranch)
- $(CoreClrCurrentRef)
-
-
-
- https://raw.githubusercontent.com/dotnet/versions
-
-
-
-
-
-
-
diff --git a/src/coreclr/dir.common.props b/src/coreclr/dir.common.props
deleted file mode 100644
index ffd190f9947b495f366109b770d732b5548973ab..0000000000000000000000000000000000000000
--- a/src/coreclr/dir.common.props
+++ /dev/null
@@ -1,56 +0,0 @@
-
-
-
-
-
- $(MSBuildThisFileDirectory)
-
-
-
-
-
-
- $(__BuildArch)
- x64
-
- $(__BuildType)
- Debug
- Debug
- Release
- Checked
-
- $(TargetArchitecture)
-
- $(TargetOS).$(TargetArchitecture).$(Configuration)
-
-
-
-
- $(MSBuildThisFileDirectory)
-
- $(RepoRoot)artifacts\obj\coreclr\$(MSBuildProjectName)\
-
- $(ProjectDir)src\
- $(ArtifactsDir)bin\coreclr\$(PlatformConfigPathPart)\
-
-
- $(RuntimeBinDir).nuget\
-
-
-
-
- Portable
-
-
-
-
- false
-
-
-
-
-
diff --git a/src/coreclr/runtime.proj b/src/coreclr/runtime.proj
index f92e3864633430ed4de497c9be9d642bcb6385a2..28f3555eafeae64d9e51e2821a1b78072eef90d6 100644
--- a/src/coreclr/runtime.proj
+++ b/src/coreclr/runtime.proj
@@ -1,8 +1,11 @@
-
-
-
+
+
+
+ $(NetCoreAppToolCurrent)
+
-
+
<_CoreClrBuildArg Condition="'$(TargetArchitecture)' != ''" Include="-$(TargetArchitecture)" />
<_CoreClrBuildArg Include="$(CMakeArgs)" />
@@ -36,10 +39,7 @@
-
+
-
-
-
-
diff --git a/src/installer/Directory.Build.props b/src/installer/Directory.Build.props
index 15472af36dcb9547ee8d93d68159b626858133a4..6506d42f9bb9e61f37d5a42a2062bdc1fed96293 100644
--- a/src/installer/Directory.Build.props
+++ b/src/installer/Directory.Build.props
@@ -1,5 +1,4 @@
-
- true
-
-
-
- $(BuildArchitecture)
- x64
- $(TargetArchitecture)
-
-
-
-
- Portable
+ true
+
+ $(TargetArchitecture)
@@ -46,14 +36,10 @@
- true
- false
$(DefineConstants),DEBUG,TRACE
- true
- true
$(DefineConstants),TRACE
diff --git a/src/installer/managed/CommonManaged.props b/src/installer/managed/CommonManaged.props
index 803db57b7c9a2d7e42ac298b8087fa7764f696bc..573218cf62d09fcc8c585c8f87918a819ab464ed 100644
--- a/src/installer/managed/CommonManaged.props
+++ b/src/installer/managed/CommonManaged.props
@@ -15,7 +15,6 @@
MicrosoftAspNetCore
- true
true
diff --git a/src/installer/publish/Directory.Build.props b/src/installer/publish/Directory.Build.props
index de832e525302d35a6bf7daddc56cea4b2f8f2398..982caf65d4f04d4df75cf0bef7b801ba3bdf6b04 100644
--- a/src/installer/publish/Directory.Build.props
+++ b/src/installer/publish/Directory.Build.props
@@ -13,6 +13,10 @@
+
+ dotnet
+ $(ContainerName)
+
https://dotnetcli.blob.core.windows.net/
.sha512
@@ -24,7 +28,7 @@
-
+
diff --git a/src/installer/tests/Assets/TestUtils/TestProjects.props b/src/installer/tests/Assets/TestUtils/TestProjects.props
index 72150d0f0b5239f008fbe872c8ebfd0799f24918..969dc3cc0129e50d5078ce0ea0441b56a0a6af4e 100644
--- a/src/installer/tests/Assets/TestUtils/TestProjects.props
+++ b/src/installer/tests/Assets/TestUtils/TestProjects.props
@@ -2,23 +2,16 @@
-
-
+ net6.0
+
+ false
$(TestTargetRid)
-
-
-
- 1.0.0.0
-
-
+
\ No newline at end of file
diff --git a/src/installer/tests/Assets/TestUtils/TestProjects.targets b/src/installer/tests/Assets/TestUtils/TestProjects.targets
index baecdb67e01f1f21471ef2b7efbfdde5618938fb..175962ee44ea39292a200620f146ca82f7bfd6d2 100644
--- a/src/installer/tests/Assets/TestUtils/TestProjects.targets
+++ b/src/installer/tests/Assets/TestUtils/TestProjects.targets
@@ -4,7 +4,7 @@
provides basic info needed for restore and build with the vanilla SDK.
-->
- $(NetCoreAppCurrentVersion)
+ 6.0
+ <_sepChar>$([System.IO.Path]::DirectorySeparatorChar)
+ true
+ $(MSBuildProjectName)$(_sepChar)ref
+
-
- true
-
-
$(RepositoryEngineeringDir)BeforeTargetFrameworkInference.targets
$([System.Text.RegularExpressions.Regex]::IsMatch($(MSBuildProjectDirectory), 'src%24'))
- true
$(LibrariesProjectRoot)OSGroups.json
false
@@ -23,12 +24,11 @@
-
- Debug
$([System.Text.RegularExpressions.Regex]::Replace('$(TargetFramework)', '(-[^;]+)', ''))
net45;net451;net452;net46;net461;net462;net47;net471;net472
$(AdditionalBuildTargetFrameworks);netstandard2.0
+
$(BuildTargetFramework)-$(TargetOS)-$(Configuration)-$(TargetArchitecture)
$(NetCoreAppCurrent)-$(TargetOS)-$(Configuration)-$(TargetArchitecture)
@@ -62,11 +62,6 @@
$([MSBuild]::NormalizeDirectory('$(LibrariesProjectRoot)', 'pkg'))
-
-
- AnyCPU
-
-
$(IsSourceProject)
$(IsSourceProject)
@@ -85,39 +80,17 @@
true
-
-
- true
-
-
-
-
$([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'ref'))
-
- $([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', '$(MSBuildProjectName)'))
- $([MSBuild]::NormalizeDirectory('$(ArtifactsObjDir)', '$(MSBuildProjectName)'))
- $([MSBuild]::NormalizeDirectory('$(ArtifactsObjDir)', '$(MSBuildProjectName)', 'ref'))
- $([MSBuild]::NormalizeDirectory('$(AssemblyBinDirOutputPath)', 'ref'))
+
-
- portable
-
Open
@@ -127,34 +100,14 @@
false
-
-
-
-
- true
- false
- $(DefineConstants),TRACE,DEBUG
-
-
-
-
- true
- true
- $(DefineConstants),TRACE
-
-
-
-
- true
false
- strict;nullablePublicOnly
false
true
@@ -207,9 +160,6 @@
$([MSBuild]::NormalizeDirectory('$(CommonPathRoot)', 'tests'))
-
-
-
true
diff --git a/src/libraries/Directory.Build.targets b/src/libraries/Directory.Build.targets
index 1ff4f7f0bfff4a11600d0457f4f0d29d6b93c61b..1a4b02100282969e2ad821f53785ae3183b11a6e 100644
--- a/src/libraries/Directory.Build.targets
+++ b/src/libraries/Directory.Build.targets
@@ -1,5 +1,14 @@
+
+
+ MicrosoftAspNetCore
+ Open
+ $(TestStrongNameKeyId)
+
+
+
@@ -30,26 +39,6 @@
('$(IsReferenceAssembly)' == 'true' or '$(IsSourceProject)' == 'true')">true
-
-
- MicrosoftAspNetCore
- Open
- $(TestStrongNameKeyId)
-
-
-
-
-
-
- $([MSBuild]::NormalizePath('$(ArtifactsDir)', 'packages', '$(Configuration)'))
- $([MSBuild]::NormalizeDirectory('$(ArtifactsPackagesDir)', 'Shipping'))
- $([MSBuild]::NormalizeDirectory('$(ArtifactsPackagesDir)', 'NonShipping'))
-
- $(ArtifactsShippingPackagesDir)
- $(ArtifactsNonShippingPackagesDir)
-
-
@@ -286,5 +275,4 @@
-
diff --git a/src/libraries/NetCoreAppLibrary.props b/src/libraries/NetCoreAppLibrary.props
index 6bd027958addea05e5b398c4a98f8b5e6d51764b..bbdbe325e4b34362817848d25483af3797dd1d64 100644
--- a/src/libraries/NetCoreAppLibrary.props
+++ b/src/libraries/NetCoreAppLibrary.props
@@ -160,4 +160,7 @@
+
+ true
+
\ No newline at end of file
diff --git a/src/libraries/System.Private.DataContractSerialization/src/System.Private.DataContractSerialization.csproj b/src/libraries/System.Private.DataContractSerialization/src/System.Private.DataContractSerialization.csproj
index 0eec0d2fdb81bfbeaedbf544c276ee9adfbbf20e..24b46e79bd99a26fb0bee6e878f535dcdbf5e447 100644
--- a/src/libraries/System.Private.DataContractSerialization/src/System.Private.DataContractSerialization.csproj
+++ b/src/libraries/System.Private.DataContractSerialization/src/System.Private.DataContractSerialization.csproj
@@ -2,7 +2,6 @@
$(NoWarn);1634;1691;649
true
- true
$(DefineConstants);FEATURE_SERIALIZATION
$(NetCoreAppCurrent)
diff --git a/src/libraries/System.Runtime.CompilerServices.Unsafe/src/System.Runtime.CompilerServices.Unsafe.ilproj b/src/libraries/System.Runtime.CompilerServices.Unsafe/src/System.Runtime.CompilerServices.Unsafe.ilproj
index dbfb6fb94c1a6082f38fbb4fd98ae7e9a2518872..71f1a02ea6a6999ddaea46d5a88ae22122375923 100644
--- a/src/libraries/System.Runtime.CompilerServices.Unsafe/src/System.Runtime.CompilerServices.Unsafe.ilproj
+++ b/src/libraries/System.Runtime.CompilerServices.Unsafe/src/System.Runtime.CompilerServices.Unsafe.ilproj
@@ -22,9 +22,10 @@
-
-
+
+
+
true
- $([MSBuild]::NormalizeDirectory('$(ArtifactsObjDir)', '$(OutDirName)'))
- $(BaseIntermediateOutputPath)$(TargetFramework)-$(Configuration)
$(NetCoreAppCurrent)
@@ -21,8 +19,7 @@
$(NetCoreAppCurrentRuntimePath)Microsoft.Win32.*.dll;
$(NetCoreAppCurrentRuntimePath)netstandard.dll"
Exclude="$(NetCoreAppCurrentRuntimePath)$(MSBuildProjectName).dll;
- $(NetCoreAppCurrentRuntimePath)System.*.Native.dll"
- />
+ $(NetCoreAppCurrentRuntimePath)System.*.Native.dll" />
diff --git a/src/mono/Directory.Build.props b/src/mono/Directory.Build.props
index 319ae93e9f762fa5c567a2b9c86d7d5f64f704b2..7d83083b9358a69553c87594ef269372688d1ea5 100644
--- a/src/mono/Directory.Build.props
+++ b/src/mono/Directory.Build.props
@@ -1,25 +1,14 @@
- true
+ true
-
-
-
-
- $([System.Runtime.InteropServices.RuntimeInformation]::ProcessArchitecture.ToString().ToLowerInvariant)
- $(HostArch)
- $(TargetArchitecture)
- $(TargetOS).$(Platform).$(Configuration)
-
+
-
- $(MSBuildThisFileDirectory)
- $([MSBuild]::NormalizeDirectory('$(ProjectDir)', 'src'))
- $([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'mono', '$(PlatformConfigPathPart)'))
-
$([MSBuild]::NormalizeDirectory('$(ArtifactsObjDir)', 'mono', '$(MSBuildProjectName)'))
+ $(BaseIntermediateOutputPath)$(Configuration)\
+ $(BaseIntermediateOutputPath)$(PlatformName)\$(Configuration)\
@@ -42,29 +31,14 @@
21
-
-
- Portable
-
-
false
-
-
-
-
- false
-
-
-
-
- strict;nullablePublicOnly
-
-
+ $(TargetOS).$(Platform).$(Configuration)
+ $([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'mono', '$(TargetOS).$(Platform).$(Configuration)'))
$([MSBuild]::NormalizeDirectory('$(ArtifactsObjDir)', 'mono', '$(PlatformConfigPathPart)'))
$([MSBuild]::NormalizeDirectory('$(MonoObjDir)', 'llvm'))
$([MSBuild]::NormalizeDirectory('$(MonoObjDir)', 'cross', 'llvm'))
diff --git a/src/mono/Directory.Build.targets b/src/mono/Directory.Build.targets
index 736370c38dbabb16d3c92c6f9f4ed84b2f3589dc..fb807fd715fea8db775f720e0c9dd2137694b456 100644
--- a/src/mono/Directory.Build.targets
+++ b/src/mono/Directory.Build.targets
@@ -1,17 +1,6 @@
-
-
-
-
-
- Microsoft%AE .NET
-
-
- $(ProductVersion)
- $(InformationalVersion)-$(VersionSuffix)
-
diff --git a/src/mono/llvm/llvm-init.proj b/src/mono/llvm/llvm-init.proj
index b0cd9dc7b9458ee7ac93005c7c99faa8220d5e8a..3012500d0ca7ef22a3669d3a1e275abae97d8370 100644
--- a/src/mono/llvm/llvm-init.proj
+++ b/src/mono/llvm/llvm-init.proj
@@ -1,33 +1,32 @@
-
$(NetCoreAppToolCurrent)
- linux
- osx.10.12
- win
- $(runtimelinuxx64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion)
- $(runtimewinx64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion)
- $(runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion)
- $(runtimelinuxx64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion)
- $(runtimewinx64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion)
- $(runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion)
+ linux
+ osx.10.12
+ win
+ $(runtimelinuxx64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion)
+ $(runtimewinx64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion)
+ $(runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion)
+ $(runtimelinuxx64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion)
+ $(runtimewinx64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion)
+ $(runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion)
- $(TargetArchitecture)
- $(HostArch)
+ $(TargetArchitecture)
+ $(BuildArchitecture)
-
-
+
+
@@ -36,8 +35,8 @@
-
-
+
+
@@ -48,5 +47,4 @@
-
diff --git a/src/mono/mono.proj b/src/mono/mono.proj
index 2038dab8fda6dfa22a2d56a6e870e8735c7af706..8bc7108838d69a98e8dea6c7e753d3e347ceb782 100644
--- a/src/mono/mono.proj
+++ b/src/mono/mono.proj
@@ -47,7 +47,7 @@
-
+
diff --git a/src/mono/netcore/System.Private.CoreLib/System.Private.CoreLib.csproj b/src/mono/netcore/System.Private.CoreLib/System.Private.CoreLib.csproj
index 72ba24d3d9165f6c464e3381e5e4f97a0d093a77..d9fc6e0a7a2178ff93905339dac2c7ac395c2941 100644
--- a/src/mono/netcore/System.Private.CoreLib/System.Private.CoreLib.csproj
+++ b/src/mono/netcore/System.Private.CoreLib/System.Private.CoreLib.csproj
@@ -10,10 +10,6 @@
false
$(NetCoreAppCurrent)
-
- Portable
- true
-
$(RuntimeBinDir)IL/
Debug;Release;Checked
@@ -35,6 +31,8 @@
true
v4.0.30319
+
+ $(ProductVersion)
true
$(NoWarn),0419,0649
enable
@@ -88,7 +86,6 @@
- true
SilverlightPlatform
diff --git a/src/mono/netcore/sample/iOS/Program.csproj b/src/mono/netcore/sample/iOS/Program.csproj
index a300148a88a37076213007c6d77eab5c53523d2d..a873f64da64412c6e9f73aa5eb7eb6f782d767f6 100644
--- a/src/mono/netcore/sample/iOS/Program.csproj
+++ b/src/mono/netcore/sample/iOS/Program.csproj
@@ -2,7 +2,6 @@
Exe
bin
- Portable
$(NetCoreAppToolCurrent)
iOS
$(ArtifactsBinDir)microsoft.netcore.app.runtime.ios-$(TargetArchitecture)\$(Configuration)\runtimes\ios-$(TargetArchitecture)\
diff --git a/src/mono/wasm/debugger/tests/debugger-test/debugger-test.csproj b/src/mono/wasm/debugger/tests/debugger-test/debugger-test.csproj
index 5122122d948bbc330ccd684233d7087cf4226f96..3a2fc8fb37ed8964728e206fab9e85bea10fc99d 100644
--- a/src/mono/wasm/debugger/tests/debugger-test/debugger-test.csproj
+++ b/src/mono/wasm/debugger/tests/debugger-test/debugger-test.csproj
@@ -1,11 +1,9 @@
true
- Library
219
true
false
- portable
diff --git a/src/mono/wasm/debugger/tests/lazy-debugger-test/lazy-debugger-test.csproj b/src/mono/wasm/debugger/tests/lazy-debugger-test/lazy-debugger-test.csproj
index 3e9cf0c143665a7e6e00a492361eedc52bb8ba49..104e755ef8f763e86c5390d8614575b40dba0506 100644
--- a/src/mono/wasm/debugger/tests/lazy-debugger-test/lazy-debugger-test.csproj
+++ b/src/mono/wasm/debugger/tests/lazy-debugger-test/lazy-debugger-test.csproj
@@ -4,6 +4,5 @@
Library
219
false
- portable
diff --git a/src/mono/wasm/wasm.proj b/src/mono/wasm/wasm.proj
index dedeef8d609523ae60135e5978102681d58401d5..1993f1d252f08af80fc0ba4cf4079dd53d606a98 100644
--- a/src/mono/wasm/wasm.proj
+++ b/src/mono/wasm/wasm.proj
@@ -22,7 +22,7 @@
-
+
diff --git a/src/tasks/WasmAppBuilder/WasmAppBuilder.csproj b/src/tasks/WasmAppBuilder/WasmAppBuilder.csproj
index 1c8d831d0dfe2348a060b734364428325876c271..1427b291bb9369c86e287a2fc9b3a7dba8372a66 100644
--- a/src/tasks/WasmAppBuilder/WasmAppBuilder.csproj
+++ b/src/tasks/WasmAppBuilder/WasmAppBuilder.csproj
@@ -1,7 +1,6 @@
$(NetCoreAppToolCurrent)
- Library
false
enable
$(NoWarn),CA1050
diff --git a/src/tasks/tasks.proj b/src/tasks/tasks.proj
index 4922e0dda06767fce17e555d022d5563abe3f908..ac868c66d419c8b4fac67fe9e3d7f45905338266 100644
--- a/src/tasks/tasks.proj
+++ b/src/tasks/tasks.proj
@@ -5,7 +5,7 @@
Condition="'$(TargetOS)' != 'Android'" />
-
diff --git a/src/tests/Common/external/external.csproj b/src/tests/Common/external/external.csproj
index e889fb69383f4d982a6b6a8959df5ea614cb5406..5b21bf541b0c96bae4f9baa603e050cef00f9790 100644
--- a/src/tests/Common/external/external.csproj
+++ b/src/tests/Common/external/external.csproj
@@ -78,7 +78,7 @@
-
+
@@ -89,7 +89,7 @@
false
- $(MicrosoftDotNetXUnitConsoleRunnerPackage)
+ Microsoft.DotNet.XUnitConsoleRunner
$(MicrosoftDotNetXUnitConsoleRunnerVersion)
diff --git a/src/tests/Common/helixpublishwitharcade.proj b/src/tests/Common/helixpublishwitharcade.proj
index 4104f3dc4dd8bc9c28dbec9b26dfa149571a24b5..82119af141dd068835697a3e3b5f7370f4cdda77 100644
--- a/src/tests/Common/helixpublishwitharcade.proj
+++ b/src/tests/Common/helixpublishwitharcade.proj
@@ -180,7 +180,7 @@
- <_XUnitConsoleRunnerFiles Include="$(NuGetPackageRoot)$(MicrosoftDotNetXUnitConsoleRunnerPackage)\$(MicrosoftDotNetXUnitConsoleRunnerVersion)\**\xunit.console.*" />
+ <_XUnitConsoleRunnerFiles Include="$(NuGetPackageRoot)Microsoft.DotNet.XUnitConsoleRunner\$(MicrosoftDotNetXUnitConsoleRunnerVersion)\**\xunit.console.*" />
diff --git a/src/tests/Common/scripts/scripts.csproj b/src/tests/Common/scripts/scripts.csproj
index 91a9fbba9e76e52906e6509447de90f65206960b..c7b9426b098610afd092347439c7adb84b837e6f 100644
--- a/src/tests/Common/scripts/scripts.csproj
+++ b/src/tests/Common/scripts/scripts.csproj
@@ -14,7 +14,7 @@
1.0.0-alpha-build0040
-
+
$(MicrosoftDotNetXUnitConsoleRunnerVersion)
diff --git a/src/tests/Common/xunitconsolerunner.depproj b/src/tests/Common/xunitconsolerunner.depproj
index 9afad38da5295da1374484efd53bcca71541ec6c..73db22f392f79bbc2c9158b44d7005bbebc39904 100644
--- a/src/tests/Common/xunitconsolerunner.depproj
+++ b/src/tests/Common/xunitconsolerunner.depproj
@@ -4,6 +4,6 @@
-
+
diff --git a/src/tests/Directory.Build.props b/src/tests/Directory.Build.props
index 30bf6a62966e0c3af5bbdf40820269fa92cd543d..70f887117c172204f1868ebc39f971acfd6744a9 100644
--- a/src/tests/Directory.Build.props
+++ b/src/tests/Directory.Build.props
@@ -66,19 +66,16 @@
- true
false
full
$(DefineConstants);DEBUG;TRACE;XUNIT_PERF
- true
true
pdbonly
$(DefineConstants);TRACE;XUNIT_PERF
- true
true
full
$(DefineConstants);DEBUG;TRACE;XUNIT_PERF
@@ -142,4 +139,10 @@
true
+
+
+ 2.1.0-preview3-26416-01
+
diff --git a/src/tests/performance/Scenario/JitBench/JitBench.csproj b/src/tests/performance/Scenario/JitBench/JitBench.csproj
index 605402f6d37a37c594bd3b0888663068efdac823..edf4df2f93062334bf8b56f4adb411e8d717c2b4 100644
--- a/src/tests/performance/Scenario/JitBench/JitBench.csproj
+++ b/src/tests/performance/Scenario/JitBench/JitBench.csproj
@@ -32,7 +32,7 @@
-
+
diff --git a/src/tests/performance/Scenario/JitBench/unofficial_dotnet/JitBench.csproj b/src/tests/performance/Scenario/JitBench/unofficial_dotnet/JitBench.csproj
index 81ad5b9512c1ef5adfa7351bba104b91034fa844..6beb6cfff07dcd3a8a3af551a33292702cbf548f 100644
--- a/src/tests/performance/Scenario/JitBench/unofficial_dotnet/JitBench.csproj
+++ b/src/tests/performance/Scenario/JitBench/unofficial_dotnet/JitBench.csproj
@@ -39,7 +39,7 @@
-
+
diff --git a/src/tests/run.proj b/src/tests/run.proj
index c85deaa0eb58a38ad0168c520e284c71834c6a04..93f290e2e48f3049dc5b9c2e3e26edfebeadebfc 100644
--- a/src/tests/run.proj
+++ b/src/tests/run.proj
@@ -117,7 +117,7 @@ $(_XunitEpilog)
-
+