diff --git a/Directory.Build.targets b/Directory.Build.targets index 6ea2934354f7..e7501159d6f6 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -154,12 +154,6 @@ - $(DefaultNetCoreTargetFramework) - <_DefaultTargetFrameworkIdentifier>$([MSBuild]::GetTargetFrameworkIdentifier('$(DefaultNetCoreTargetFramework)')) - <_DefaultTargetFrameworkVersionNoV>$([MSBuild]::GetTargetFrameworkVersion('$(DefaultNetCoreTargetFramework)', 2)) - netcoreapp$(_DefaultTargetFrameworkVersionNoV) - false + https://github.com/dotnet/efcore - 6449203147298f03b34d227de1a5b48f62060bf1 + dd315f672b4c7f9b63b776afb432f5b3e585e7ea - + https://github.com/dotnet/efcore - 6449203147298f03b34d227de1a5b48f62060bf1 + dd315f672b4c7f9b63b776afb432f5b3e585e7ea - + https://github.com/dotnet/efcore - 6449203147298f03b34d227de1a5b48f62060bf1 + dd315f672b4c7f9b63b776afb432f5b3e585e7ea - + https://github.com/dotnet/efcore - 6449203147298f03b34d227de1a5b48f62060bf1 + dd315f672b4c7f9b63b776afb432f5b3e585e7ea - + https://github.com/dotnet/efcore - 6449203147298f03b34d227de1a5b48f62060bf1 + dd315f672b4c7f9b63b776afb432f5b3e585e7ea - + https://github.com/dotnet/efcore - 6449203147298f03b34d227de1a5b48f62060bf1 + dd315f672b4c7f9b63b776afb432f5b3e585e7ea - + https://github.com/dotnet/efcore - 6449203147298f03b34d227de1a5b48f62060bf1 + dd315f672b4c7f9b63b776afb432f5b3e585e7ea - + https://github.com/dotnet/efcore - 6449203147298f03b34d227de1a5b48f62060bf1 + dd315f672b4c7f9b63b776afb432f5b3e585e7ea - + https://github.com/dotnet/runtime - f584c7401a24781b4c8e8e2a8097b85462ee4941 + 95a4476b91827e6f707744fab6e9d87df870407a - + https://github.com/dotnet/runtime - f584c7401a24781b4c8e8e2a8097b85462ee4941 + 95a4476b91827e6f707744fab6e9d87df870407a - + https://github.com/dotnet/runtime - f584c7401a24781b4c8e8e2a8097b85462ee4941 + 95a4476b91827e6f707744fab6e9d87df870407a - + https://github.com/dotnet/runtime - f584c7401a24781b4c8e8e2a8097b85462ee4941 + 95a4476b91827e6f707744fab6e9d87df870407a - + https://github.com/dotnet/runtime - f584c7401a24781b4c8e8e2a8097b85462ee4941 + 95a4476b91827e6f707744fab6e9d87df870407a - + https://github.com/dotnet/runtime - f584c7401a24781b4c8e8e2a8097b85462ee4941 + 95a4476b91827e6f707744fab6e9d87df870407a - + https://github.com/dotnet/runtime - f584c7401a24781b4c8e8e2a8097b85462ee4941 + 95a4476b91827e6f707744fab6e9d87df870407a - + https://github.com/dotnet/runtime - f584c7401a24781b4c8e8e2a8097b85462ee4941 + 95a4476b91827e6f707744fab6e9d87df870407a - + https://github.com/dotnet/runtime - f584c7401a24781b4c8e8e2a8097b85462ee4941 + 95a4476b91827e6f707744fab6e9d87df870407a - + https://github.com/dotnet/runtime - f584c7401a24781b4c8e8e2a8097b85462ee4941 + 95a4476b91827e6f707744fab6e9d87df870407a - + https://github.com/dotnet/runtime - f584c7401a24781b4c8e8e2a8097b85462ee4941 + 95a4476b91827e6f707744fab6e9d87df870407a - + https://github.com/dotnet/runtime - f584c7401a24781b4c8e8e2a8097b85462ee4941 + 95a4476b91827e6f707744fab6e9d87df870407a - + https://github.com/dotnet/runtime - f584c7401a24781b4c8e8e2a8097b85462ee4941 + 95a4476b91827e6f707744fab6e9d87df870407a - + https://github.com/dotnet/runtime - f584c7401a24781b4c8e8e2a8097b85462ee4941 + 95a4476b91827e6f707744fab6e9d87df870407a - + https://github.com/dotnet/runtime - f584c7401a24781b4c8e8e2a8097b85462ee4941 + 95a4476b91827e6f707744fab6e9d87df870407a - + https://github.com/dotnet/runtime - f584c7401a24781b4c8e8e2a8097b85462ee4941 + 95a4476b91827e6f707744fab6e9d87df870407a - + https://github.com/dotnet/runtime - f584c7401a24781b4c8e8e2a8097b85462ee4941 + 95a4476b91827e6f707744fab6e9d87df870407a - + https://github.com/dotnet/runtime - f584c7401a24781b4c8e8e2a8097b85462ee4941 + 95a4476b91827e6f707744fab6e9d87df870407a - + https://github.com/dotnet/runtime - f584c7401a24781b4c8e8e2a8097b85462ee4941 + 95a4476b91827e6f707744fab6e9d87df870407a - + https://github.com/dotnet/runtime - f584c7401a24781b4c8e8e2a8097b85462ee4941 + 95a4476b91827e6f707744fab6e9d87df870407a - + https://github.com/dotnet/runtime - f584c7401a24781b4c8e8e2a8097b85462ee4941 + 95a4476b91827e6f707744fab6e9d87df870407a - + https://github.com/dotnet/runtime - f584c7401a24781b4c8e8e2a8097b85462ee4941 + 95a4476b91827e6f707744fab6e9d87df870407a - + https://github.com/dotnet/runtime - f584c7401a24781b4c8e8e2a8097b85462ee4941 + 95a4476b91827e6f707744fab6e9d87df870407a - + https://github.com/dotnet/runtime - f584c7401a24781b4c8e8e2a8097b85462ee4941 + 95a4476b91827e6f707744fab6e9d87df870407a - + https://github.com/dotnet/runtime - f584c7401a24781b4c8e8e2a8097b85462ee4941 + 95a4476b91827e6f707744fab6e9d87df870407a - + https://github.com/dotnet/runtime - f584c7401a24781b4c8e8e2a8097b85462ee4941 + 95a4476b91827e6f707744fab6e9d87df870407a - + https://github.com/dotnet/runtime - f584c7401a24781b4c8e8e2a8097b85462ee4941 + 95a4476b91827e6f707744fab6e9d87df870407a - + https://github.com/dotnet/runtime - f584c7401a24781b4c8e8e2a8097b85462ee4941 + 95a4476b91827e6f707744fab6e9d87df870407a - + https://github.com/dotnet/runtime - f584c7401a24781b4c8e8e2a8097b85462ee4941 + 95a4476b91827e6f707744fab6e9d87df870407a - + https://github.com/dotnet/runtime - f584c7401a24781b4c8e8e2a8097b85462ee4941 + 95a4476b91827e6f707744fab6e9d87df870407a - + https://github.com/dotnet/runtime - f584c7401a24781b4c8e8e2a8097b85462ee4941 + 95a4476b91827e6f707744fab6e9d87df870407a - + https://github.com/dotnet/runtime - f584c7401a24781b4c8e8e2a8097b85462ee4941 + 95a4476b91827e6f707744fab6e9d87df870407a - + https://github.com/dotnet/runtime - f584c7401a24781b4c8e8e2a8097b85462ee4941 + 95a4476b91827e6f707744fab6e9d87df870407a - + https://github.com/dotnet/runtime - f584c7401a24781b4c8e8e2a8097b85462ee4941 + 95a4476b91827e6f707744fab6e9d87df870407a - + https://github.com/dotnet/runtime - f584c7401a24781b4c8e8e2a8097b85462ee4941 + 95a4476b91827e6f707744fab6e9d87df870407a - + https://github.com/dotnet/runtime - f584c7401a24781b4c8e8e2a8097b85462ee4941 + 95a4476b91827e6f707744fab6e9d87df870407a - + https://github.com/dotnet/runtime - f584c7401a24781b4c8e8e2a8097b85462ee4941 + 95a4476b91827e6f707744fab6e9d87df870407a - + https://github.com/dotnet/runtime - f584c7401a24781b4c8e8e2a8097b85462ee4941 + 95a4476b91827e6f707744fab6e9d87df870407a - + https://github.com/dotnet/runtime - f584c7401a24781b4c8e8e2a8097b85462ee4941 + 95a4476b91827e6f707744fab6e9d87df870407a - + https://github.com/dotnet/runtime - f584c7401a24781b4c8e8e2a8097b85462ee4941 + 95a4476b91827e6f707744fab6e9d87df870407a - + https://github.com/dotnet/runtime - f584c7401a24781b4c8e8e2a8097b85462ee4941 + 95a4476b91827e6f707744fab6e9d87df870407a - + https://github.com/dotnet/runtime - f584c7401a24781b4c8e8e2a8097b85462ee4941 + 95a4476b91827e6f707744fab6e9d87df870407a - + https://github.com/dotnet/runtime - f584c7401a24781b4c8e8e2a8097b85462ee4941 + 95a4476b91827e6f707744fab6e9d87df870407a - + https://github.com/dotnet/runtime - f584c7401a24781b4c8e8e2a8097b85462ee4941 + 95a4476b91827e6f707744fab6e9d87df870407a - + https://github.com/dotnet/runtime - f584c7401a24781b4c8e8e2a8097b85462ee4941 + 95a4476b91827e6f707744fab6e9d87df870407a - + https://github.com/dotnet/runtime - f584c7401a24781b4c8e8e2a8097b85462ee4941 + 95a4476b91827e6f707744fab6e9d87df870407a - + https://github.com/dotnet/runtime - f584c7401a24781b4c8e8e2a8097b85462ee4941 + 95a4476b91827e6f707744fab6e9d87df870407a - + https://github.com/dotnet/runtime - f584c7401a24781b4c8e8e2a8097b85462ee4941 + 95a4476b91827e6f707744fab6e9d87df870407a - + https://github.com/dotnet/runtime - f584c7401a24781b4c8e8e2a8097b85462ee4941 + 95a4476b91827e6f707744fab6e9d87df870407a - + https://github.com/dotnet/runtime - f584c7401a24781b4c8e8e2a8097b85462ee4941 + 95a4476b91827e6f707744fab6e9d87df870407a - + https://github.com/dotnet/runtime - f584c7401a24781b4c8e8e2a8097b85462ee4941 + 95a4476b91827e6f707744fab6e9d87df870407a - + https://github.com/dotnet/runtime - f584c7401a24781b4c8e8e2a8097b85462ee4941 + 95a4476b91827e6f707744fab6e9d87df870407a - + https://github.com/dotnet/runtime - f584c7401a24781b4c8e8e2a8097b85462ee4941 + 95a4476b91827e6f707744fab6e9d87df870407a - + https://github.com/dotnet/runtime - f584c7401a24781b4c8e8e2a8097b85462ee4941 + 95a4476b91827e6f707744fab6e9d87df870407a - + https://github.com/dotnet/runtime - f584c7401a24781b4c8e8e2a8097b85462ee4941 + 95a4476b91827e6f707744fab6e9d87df870407a - + https://github.com/dotnet/runtime - f584c7401a24781b4c8e8e2a8097b85462ee4941 + 95a4476b91827e6f707744fab6e9d87df870407a - + https://github.com/dotnet/runtime - f584c7401a24781b4c8e8e2a8097b85462ee4941 + 95a4476b91827e6f707744fab6e9d87df870407a - + https://github.com/dotnet/runtime - f584c7401a24781b4c8e8e2a8097b85462ee4941 + 95a4476b91827e6f707744fab6e9d87df870407a - + https://github.com/dotnet/runtime - f584c7401a24781b4c8e8e2a8097b85462ee4941 + 95a4476b91827e6f707744fab6e9d87df870407a - + https://github.com/dotnet/runtime - f584c7401a24781b4c8e8e2a8097b85462ee4941 + 95a4476b91827e6f707744fab6e9d87df870407a https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index b5bb6243a38a..27c605753fe9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -65,76 +65,76 @@ --> - 6.0.0-preview.6.21276.1 - 6.0.0-preview.6.21276.1 - 6.0.0-preview.6.21276.1 - 6.0.0-preview.6.21276.1 - 6.0.0-preview.6.21276.1 - 6.0.0-preview.6.21276.1 - 6.0.0-preview.6.21276.1 - 6.0.0-preview.6.21276.1 - 6.0.0-preview.6.21276.1 - 6.0.0-preview.6.21276.1 - 6.0.0-preview.6.21276.1 - 6.0.0-preview.6.21276.1 - 6.0.0-preview.6.21276.1 - 6.0.0-preview.6.21276.1 - 6.0.0-preview.6.21276.1 - 6.0.0-preview.6.21276.1 - 6.0.0-preview.6.21276.1 - 6.0.0-preview.6.21276.1 - 6.0.0-preview.6.21276.1 - 6.0.0-preview.6.21276.1 - 6.0.0-preview.6.21276.1 - 6.0.0-preview.6.21276.1 - 6.0.0-preview.6.21276.1 - 6.0.0-preview.6.21276.1 - 6.0.0-preview.6.21276.1 - 6.0.0-preview.6.21276.1 - 6.0.0-preview.6.21276.1 - 6.0.0-preview.6.21276.1 - 6.0.0-preview.6.21276.1 - 6.0.0-preview.6.21276.1 - 6.0.0-preview.6.21276.1 - 6.0.0-preview.6.21276.1 - 6.0.0-preview.6.21276.1 - 6.0.0-preview.6.21276.1 - 6.0.0-preview.6.21276.1 - 6.0.0-preview.6.21276.1 - 6.0.0-preview.6.21276.1 - 6.0.0-preview.6.21276.1 - 6.0.0-preview.6.21276.1 - 6.0.0-preview.6.21276.1 - 6.0.0-preview.6.21276.1 - 6.0.0-preview.6.21276.1 - 6.0.0-preview.6.21276.1 - 6.0.0-preview.6.21276.1 - 6.0.0-preview.6.21276.1 - 6.0.0-preview.6.21276.1 - 6.0.0-preview.6.21276.1 - 6.0.0-preview.6.21276.1 - 6.0.0-preview.6.21276.1 - 6.0.0-preview.6.21276.1 - 6.0.0-preview.6.21276.1 - 6.0.0-preview.6.21276.1 - 6.0.0-preview.6.21276.1 - 6.0.0-preview.6.21276.1 - 6.0.0-preview.6.21276.1 - 6.0.0-preview.6.21276.1 - 6.0.0-preview.6.21276.1 - 6.0.0-preview.6.21276.1 - 6.0.0-preview.6.21276.1 + 6.0.0-preview.6.21278.10 + 6.0.0-preview.6.21278.10 + 6.0.0-preview.6.21278.10 + 6.0.0-preview.6.21278.10 + 6.0.0-preview.6.21278.10 + 6.0.0-preview.6.21278.10 + 6.0.0-preview.6.21278.10 + 6.0.0-preview.6.21278.10 + 6.0.0-preview.6.21278.10 + 6.0.0-preview.6.21278.10 + 6.0.0-preview.6.21278.10 + 6.0.0-preview.6.21278.10 + 6.0.0-preview.6.21278.10 + 6.0.0-preview.6.21278.10 + 6.0.0-preview.6.21278.10 + 6.0.0-preview.6.21278.10 + 6.0.0-preview.6.21278.10 + 6.0.0-preview.6.21278.10 + 6.0.0-preview.6.21278.10 + 6.0.0-preview.6.21278.10 + 6.0.0-preview.6.21278.10 + 6.0.0-preview.6.21278.10 + 6.0.0-preview.6.21278.10 + 6.0.0-preview.6.21278.10 + 6.0.0-preview.6.21278.10 + 6.0.0-preview.6.21278.10 + 6.0.0-preview.6.21278.10 + 6.0.0-preview.6.21278.10 + 6.0.0-preview.6.21278.10 + 6.0.0-preview.6.21278.10 + 6.0.0-preview.6.21278.10 + 6.0.0-preview.6.21278.10 + 6.0.0-preview.6.21278.10 + 6.0.0-preview.6.21278.10 + 6.0.0-preview.6.21278.10 + 6.0.0-preview.6.21278.10 + 6.0.0-preview.6.21278.10 + 6.0.0-preview.6.21278.10 + 6.0.0-preview.6.21278.10 + 6.0.0-preview.6.21278.10 + 6.0.0-preview.6.21278.10 + 6.0.0-preview.6.21278.10 + 6.0.0-preview.6.21278.10 + 6.0.0-preview.6.21278.10 + 6.0.0-preview.6.21278.10 + 6.0.0-preview.6.21278.10 + 6.0.0-preview.6.21278.10 + 6.0.0-preview.6.21278.10 + 6.0.0-preview.6.21278.10 + 6.0.0-preview.6.21278.10 + 6.0.0-preview.6.21278.10 + 6.0.0-preview.6.21278.10 + 6.0.0-preview.6.21278.10 + 6.0.0-preview.6.21278.10 + 6.0.0-preview.6.21278.10 + 6.0.0-preview.6.21278.10 + 6.0.0-preview.6.21278.10 + 6.0.0-preview.6.21278.10 + 6.0.0-preview.6.21278.10 - 6.0.0-preview.6.21276.1 + 6.0.0-preview.6.21278.10 - 6.0.0-preview.6.21274.4 - 6.0.0-preview.6.21274.4 - 6.0.0-preview.6.21274.4 - 6.0.0-preview.6.21274.4 - 6.0.0-preview.6.21274.4 - 6.0.0-preview.6.21274.4 - 6.0.0-preview.6.21274.4 - 6.0.0-preview.6.21274.4 + 6.0.0-preview.6.21278.1 + 6.0.0-preview.6.21278.1 + 6.0.0-preview.6.21278.1 + 6.0.0-preview.6.21278.1 + 6.0.0-preview.6.21278.1 + 6.0.0-preview.6.21278.1 + 6.0.0-preview.6.21278.1 + 6.0.0-preview.6.21278.1 6.0.0-beta.21271.3 diff --git a/eng/tools/GenerateFiles/Directory.Build.targets.in b/eng/tools/GenerateFiles/Directory.Build.targets.in index 00383240d228..72b61969c194 100644 --- a/eng/tools/GenerateFiles/Directory.Build.targets.in +++ b/eng/tools/GenerateFiles/Directory.Build.targets.in @@ -7,24 +7,24 @@ Condition=" '$(UpdateAspNetCoreKnownFramework)' == '' ">true - + + !(@(KnownAppHostPack->AnyHaveMetadataValue('TargetFramework', '${DefaultNetCoreTargetFramework}')))" /> + !(@(KnownFrameworkReference->AnyHaveMetadataValue('TargetFramework', '${DefaultNetCoreTargetFramework}')))" /> diff --git a/eng/tools/GenerateFiles/GenerateFiles.csproj b/eng/tools/GenerateFiles/GenerateFiles.csproj index c633f6256aaf..13eb916ee2ca 100644 --- a/eng/tools/GenerateFiles/GenerateFiles.csproj +++ b/eng/tools/GenerateFiles/GenerateFiles.csproj @@ -9,7 +9,6 @@ <_TemplateProperties> DefaultNetCoreTargetFramework=$(DefaultNetCoreTargetFramework); - KnownAppHostPackOrFrameworkReferenceTfm=$(KnownAppHostPackOrFrameworkReferenceTfm); MicrosoftAspNetCoreAppRefVersion=$(TargetingPackVersion); MicrosoftAspNetCoreAppRuntimeVersion=$(SharedFxVersion); MicrosoftNETCoreAppRefVersion=$(MicrosoftNETCoreAppRefVersion);