diff --git a/Directory.Build.targets b/Directory.Build.targets index 519185d7180a..1bd3fa1170ef 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -37,8 +37,8 @@ $(VersionPrefix) $(PackageBrandingVersion) $(BrandingVersionSuffix.Trim()) - $(VersionPrefix) - $(VersionPrefix)-$(VersionSuffix.Replace('.','-')) + $(VersionPrefix) + $(VersionPrefix)-$(VersionSuffix.Replace('.','-')) $(Version) @@ -49,7 +49,7 @@ $(SharedFxVersion) $(TargetingPackVersionPrefix) - $(SiteExtensionPackageVersion) + $(SiteExtensionVersion) @@ -155,7 +155,7 @@ $(MicrosoftNETCoreAppRuntimeVersion) - $(MicrosoftNETCoreAppRefPackageVersion) + $(MicrosoftNETCoreAppRefVersion) @@ -169,7 +169,7 @@ diff --git a/docs/ReferenceResolution.md b/docs/ReferenceResolution.md index 8e94b2a86589..cd8c706e1e3e 100644 --- a/docs/ReferenceResolution.md +++ b/docs/ReferenceResolution.md @@ -54,7 +54,7 @@ Steps for adding a new package dependency to an existing project. Let's say I'm 1. Add the package to the .csproj file using `` 2. Add an entry to [eng/Dependencies.props](/eng/Dependencies.props) e.g. `` 3. If this package comes from another dotnet team and should be updated automatically by our bot… - 1. Add an entry to [eng/Versions.props](/eng/Versions.props) like this `0.0.1-beta-1`. + 1. Add an entry to [eng/Versions.props](/eng/Versions.props) like this `0.0.1-beta-1`. 2. Add an entry to [eng/Version.Details.xml](/eng/Version.Details.xml) like this: ```xml diff --git a/eng/Dependencies.props b/eng/Dependencies.props index 07684202d905..1484df08a4bf 100644 --- a/eng/Dependencies.props +++ b/eng/Dependencies.props @@ -196,7 +196,7 @@ and are generated based on the last package release. - $(%(VersionName)PackageVersion) + $(%(VersionName)Version) - $(DefaultNetCoreTargetFramework) - true - artifacts\manifests\ - true - - - 3650 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/eng/SharedFramework.External.props b/eng/SharedFramework.External.props index a43f82e80353..93c87f9d9776 100644 --- a/eng/SharedFramework.External.props +++ b/eng/SharedFramework.External.props @@ -7,41 +7,41 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - <_TransitiveExternalAspNetCoreAppReference Include="Microsoft.Win32.SystemEvents" Version="$(MicrosoftWin32SystemEventsPackageVersion)" /> - <_TransitiveExternalAspNetCoreAppReference Include="System.Drawing.Common" Version="$(SystemDrawingCommonPackageVersion)" /> - <_TransitiveExternalAspNetCoreAppReference Include="System.Security.Cryptography.Pkcs" Version="$(SystemSecurityCryptographyPkcsPackageVersion)" /> + <_TransitiveExternalAspNetCoreAppReference Include="Microsoft.Win32.SystemEvents" Version="$(MicrosoftWin32SystemEventsVersion)" /> + <_TransitiveExternalAspNetCoreAppReference Include="System.Drawing.Common" Version="$(SystemDrawingCommonVersion)" /> + <_TransitiveExternalAspNetCoreAppReference Include="System.Security.Cryptography.Pkcs" Version="$(SystemSecurityCryptographyPkcsVersion)" /> - <_TransitiveExternalAspNetCoreAppReference Include="System.Diagnostics.EventLog" Version="$(SystemDiagnosticsEventLogPackageVersion)" /> - <_TransitiveExternalAspNetCoreAppReference Include="System.Security.Permissions" Version="$(SystemSecurityPermissionsPackageVersion)" /> - <_TransitiveExternalAspNetCoreAppReference Include="System.Windows.Extensions" Version="$(SystemWindowsExtensionsPackageVersion)" /> + <_TransitiveExternalAspNetCoreAppReference Include="System.Diagnostics.EventLog" Version="$(SystemDiagnosticsEventLogVersion)" /> + <_TransitiveExternalAspNetCoreAppReference Include="System.Security.Permissions" Version="$(SystemSecurityPermissionsVersion)" /> + <_TransitiveExternalAspNetCoreAppReference Include="System.Windows.Extensions" Version="$(SystemWindowsExtensionsVersion)" /> diff --git a/eng/Versions.props b/eng/Versions.props index 44bd5949b9ab..5a0c2935abd8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -64,85 +64,85 @@ --> - 6.0.0-alpha.1.20560.10 - 6.0.0-alpha.1.20560.10 - 6.0.0-alpha.1.20560.10 - 6.0.0-alpha.1.20560.10 - 6.0.0-alpha.1.20560.10 - 6.0.0-alpha.1.20560.10 - 6.0.0-alpha.1.20560.10 - 6.0.0-alpha.1.20560.10 - 6.0.0-alpha.1.20560.10 - 6.0.0-alpha.1.20560.10 - 6.0.0-alpha.1.20560.10 - 6.0.0-alpha.1.20560.10 - 6.0.0-alpha.1.20560.10 - 6.0.0-alpha.1.20560.10 - 6.0.0-alpha.1.20560.10 - 6.0.0-alpha.1.20560.10 - 6.0.0-alpha.1.20560.10 - 6.0.0-alpha.1.20560.10 - 6.0.0-alpha.1.20560.10 - 6.0.0-alpha.1.20560.10 - 6.0.0-alpha.1.20560.10 - 6.0.0-alpha.1.20560.10 - 6.0.0-alpha.1.20560.10 - 6.0.0-alpha.1.20560.10 - 6.0.0-alpha.1.20560.10 - 6.0.0-alpha.1.20560.10 - 6.0.0-alpha.1.20560.10 - 6.0.0-alpha.1.20560.10 - 6.0.0-alpha.1.20560.10 - 6.0.0-alpha.1.20560.10 - 6.0.0-alpha.1.20560.10 - 6.0.0-alpha.1.20560.10 - 6.0.0-alpha.1.20560.10 - 6.0.0-alpha.1.20560.10 - 6.0.0-alpha.1.20560.10 - 6.0.0-alpha.1.20560.10 - 6.0.0-alpha.1.20560.10 - 6.0.0-alpha.1.20560.10 - 6.0.0-alpha.1.20560.10 - 6.0.0-alpha.1.20560.10 - 6.0.0-alpha.1.20560.10 - 6.0.0-alpha.1.20560.10 - 6.0.0-alpha.1.20560.10 - 6.0.0-alpha.1.20560.10 - 6.0.0-alpha.1.20560.10 - 6.0.0-alpha.1.20560.10 - 6.0.0-alpha.1.20560.10 - 6.0.0-alpha.1.20560.10 - 6.0.0-alpha.1.20560.10 - 6.0.0-alpha.1.20560.10 - 6.0.0-alpha.1.20560.10 - 6.0.0-alpha.1.20560.10 - 6.0.0-alpha.1.20560.10 - 6.0.0-alpha.1.20560.10 + 6.0.0-alpha.1.20560.10 + 6.0.0-alpha.1.20560.10 + 6.0.0-alpha.1.20560.10 + 6.0.0-alpha.1.20560.10 + 6.0.0-alpha.1.20560.10 + 6.0.0-alpha.1.20560.10 + 6.0.0-alpha.1.20560.10 + 6.0.0-alpha.1.20560.10 + 6.0.0-alpha.1.20560.10 + 6.0.0-alpha.1.20560.10 + 6.0.0-alpha.1.20560.10 + 6.0.0-alpha.1.20560.10 + 6.0.0-alpha.1.20560.10 + 6.0.0-alpha.1.20560.10 + 6.0.0-alpha.1.20560.10 + 6.0.0-alpha.1.20560.10 + 6.0.0-alpha.1.20560.10 + 6.0.0-alpha.1.20560.10 + 6.0.0-alpha.1.20560.10 + 6.0.0-alpha.1.20560.10 + 6.0.0-alpha.1.20560.10 + 6.0.0-alpha.1.20560.10 + 6.0.0-alpha.1.20560.10 + 6.0.0-alpha.1.20560.10 + 6.0.0-alpha.1.20560.10 + 6.0.0-alpha.1.20560.10 + 6.0.0-alpha.1.20560.10 + 6.0.0-alpha.1.20560.10 + 6.0.0-alpha.1.20560.10 + 6.0.0-alpha.1.20560.10 + 6.0.0-alpha.1.20560.10 + 6.0.0-alpha.1.20560.10 + 6.0.0-alpha.1.20560.10 + 6.0.0-alpha.1.20560.10 + 6.0.0-alpha.1.20560.10 + 6.0.0-alpha.1.20560.10 + 6.0.0-alpha.1.20560.10 + 6.0.0-alpha.1.20560.10 + 6.0.0-alpha.1.20560.10 + 6.0.0-alpha.1.20560.10 + 6.0.0-alpha.1.20560.10 + 6.0.0-alpha.1.20560.10 + 6.0.0-alpha.1.20560.10 + 6.0.0-alpha.1.20560.10 + 6.0.0-alpha.1.20560.10 + 6.0.0-alpha.1.20560.10 + 6.0.0-alpha.1.20560.10 + 6.0.0-alpha.1.20560.10 + 6.0.0-alpha.1.20560.10 + 6.0.0-alpha.1.20560.10 + 6.0.0-alpha.1.20560.10 + 6.0.0-alpha.1.20560.10 + 6.0.0-alpha.1.20560.10 + 6.0.0-alpha.1.20560.10 - 6.0.0-alpha.1.20560.10 - 6.0.0-alpha.1.20560.10 - 6.0.0-alpha.1.20560.10 - 6.0.0-alpha.1.20560.10 - 6.0.0-alpha.1.20560.10 - 6.0.0-alpha.1.20560.10 - 6.0.0-alpha.1.20560.10 - 6.0.0-alpha.1.20560.10 - 6.0.0-alpha.1.20560.10 - 6.0.0-alpha.1.20560.10 - 6.0.0-alpha.1.20560.10 + 6.0.0-alpha.1.20560.10 + 6.0.0-alpha.1.20560.10 + 6.0.0-alpha.1.20560.10 + 6.0.0-alpha.1.20560.10 + 6.0.0-alpha.1.20560.10 + 6.0.0-alpha.1.20560.10 + 6.0.0-alpha.1.20560.10 + 6.0.0-alpha.1.20560.10 + 6.0.0-alpha.1.20560.10 + 6.0.0-alpha.1.20560.10 + 6.0.0-alpha.1.20560.10 - 6.0.0-alpha.1.20560.10 + 6.0.0-alpha.1.20560.10 - 6.0.0-alpha.1.20560.6 - 6.0.0-alpha.1.20560.6 - 6.0.0-alpha.1.20560.6 - 6.0.0-alpha.1.20560.6 - 6.0.0-alpha.1.20560.6 - 6.0.0-alpha.1.20560.6 - 6.0.0-alpha.1.20560.6 - 6.0.0-alpha.1.20560.6 + 6.0.0-alpha.1.20560.6 + 6.0.0-alpha.1.20560.6 + 6.0.0-alpha.1.20560.6 + 6.0.0-alpha.1.20560.6 + 6.0.0-alpha.1.20560.6 + 6.0.0-alpha.1.20560.6 + 6.0.0-alpha.1.20560.6 + 6.0.0-alpha.1.20560.6 - 6.0.0-beta.20552.5 + 6.0.0-beta.20552.5 - $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) + $(MicrosoftNETCoreAppRuntimewinx64Version) - 3.8.0-3.20458.6 + 3.8.0-5.20519.18 - 5.0.0-preview.4.20180.4 + 5.0.0-preview.4.20180.4 - 3.0.0-build-20190530.3 - 1.0.0-beta-64023-03 + 3.0.0-build-20190530.3 15.9.3032 - 4.7.0 - 2.0.3 - 4.5.0 - 4.4.0 - 0.3.0-alpha.19317.1 - 4.3.0 - 4.3.4 - 4.3.0 - 4.3.0 - 4.5.3 - 4.5.0 + 4.7.0 + 2.0.3 + 4.5.0 + 4.4.0 + 0.3.0-alpha.19317.1 + 4.3.0 + 4.3.4 + 4.3.0 + 4.3.0 + 4.5.3 + 4.5.0 - 1.10.0 - 5.2.6 - 3.1.1-preview4.19614.4 + 1.10.0 + 5.2.6 + 3.1.1-preview4.19614.4 - 1.0.0 - 15.8.166 - 1.2.0 - 15.8.166 - 1.2.6 - 15.8.166 - 3.7.0 - 3.7.0 - 3.7.0 - 3.3.0 - 3.0.0 - 1.0.0-20200708.1 - 3.19.8 - 6.7.1 - 6.7.1 - 6.7.1 - 2.2.1 - 1.0.1 - 3.0.1 - 3.0.1 - 11.1.0 - 1.4.0 - 6.7.1 - 5.7.0 + 1.0.0 + 15.8.166 + 1.2.0 + 15.8.166 + 1.2.6 + 15.8.166 + 3.7.0 + 3.7.0 + 3.7.0 + 3.3.0 + 3.0.0 + 1.0.0-20200708.1 + 3.19.8 + 6.7.1 + 6.7.1 + 6.7.1 + 2.2.1 + 1.0.1 + 3.0.1 + 3.0.1 + 11.1.0 + 1.4.0 + 6.7.1 + 5.7.0 - 2.1.1 - 2.2.0 - 3.1.10-servicing-20520-4 - $(MicrosoftAspNetCoreAzureAppServicesSiteExtension31PackageVersion) - $(MicrosoftAspNetCoreAzureAppServicesSiteExtension31PackageVersion) - 5.0.0-rtm-20529-7 - $(MicrosoftAspNetCoreAzureAppServicesSiteExtension50PackageVersion) - $(MicrosoftAspNetCoreAzureAppServicesSiteExtension50PackageVersion) + 2.1.1 + 2.2.0 + 3.1.10-servicing-20520-4 + $(MicrosoftAspNetCoreAzureAppServicesSiteExtension31Version) + $(MicrosoftAspNetCoreAzureAppServicesSiteExtension31Version) + 5.0.0-rtm-20529-7 + $(MicrosoftAspNetCoreAzureAppServicesSiteExtension50Version) + $(MicrosoftAspNetCoreAzureAppServicesSiteExtension50Version) - 0.9.9 - 0.12.1 - 4.2.1 - 2.3.0 - 4.2.1 - 3.13.0 - 2.32.0 - 2.32.0 - 2.32.0 - 2.32.0 - 4.1.0 - 4.1.0 - 4.1.0 - 4.1.0 - 4.1.0 - 2.1.90 - 1.1.0 - 1.1.0 - 1.1.0 - $(MessagePackPackageVersion) - 4.10.0 - 0.11.2 - 1.0.2 - 12.0.2 - 13.0.4 - 4.0.0-alpha05 - 17.17134.0 - 86.0.4240.2200-beta - 4.0.0-alpha05 - 1.4.0 - 4.0.0 - 2.0.593 - 3.1.1 - 5.6.3 - 2.0.3 - 0.10.0 + 0.9.9 + 0.12.1 + 4.2.1 + 2.3.0 + 4.2.1 + 3.13.0 + 2.32.0 + 2.32.0 + 2.32.0 + 2.32.0 + 4.1.0 + 4.1.0 + 4.1.0 + 4.1.0 + 4.1.0 + 2.1.90 + 1.1.0 + 1.1.0 + 1.1.0 + $(MessagePackVersion) + 4.10.0 + 0.11.2 + 1.0.2 + 12.0.2 + 13.0.4 + 4.0.0-alpha05 + 17.17134.0 + 86.0.4240.2200-beta + 4.0.0-alpha05 + 1.4.0 + 4.0.0 + 2.0.593 + 3.1.1 + 5.6.3 + 2.0.3 + 0.10.0 2.4.1 - $(XunitVersion) - $(XunitVersion) - $(XunitVersion) + $(XunitVersion) + $(XunitVersion) + $(XunitVersion) 2.4.3 - 1.0.19249.1 + 1.0.19249.1 diff --git a/eng/Workarounds.targets b/eng/Workarounds.targets index b7353f92da39..ae39388581e4 100644 --- a/eng/Workarounds.targets +++ b/eng/Workarounds.targets @@ -11,7 +11,7 @@ Update="Microsoft.NETCore.App" Condition=" '$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' AND '$(TargetLatestDotNetRuntime)' != 'false' " RuntimeFrameworkVersion="$(MicrosoftNETCoreAppRuntimeVersion)" - TargetingPackVersion="$(MicrosoftNETCoreAppRefPackageVersion)" /> + TargetingPackVersion="$(MicrosoftNETCoreAppRefVersion)" /> - + diff --git a/eng/scripts/CodeCheck.ps1 b/eng/scripts/CodeCheck.ps1 index 94ab74ac8be9..509cdf84d685 100644 --- a/eng/scripts/CodeCheck.ps1 +++ b/eng/scripts/CodeCheck.ps1 @@ -110,7 +110,7 @@ try { else { $varName = $dep.Name -replace '\.','' $varName = $varName -replace '\-','' - $varName = "${varName}PackageVersion" + $varName = "${varName}Version" $versionVar = $versionProps.SelectSingleNode("//PropertyGroup[`@Label=`"Automated`"]/$varName") $actualVersion = $versionVar.InnerText diff --git a/eng/targets/Helix.targets b/eng/targets/Helix.targets index e91b573dba29..0d55eb1cdad5 100644 --- a/eng/targets/Helix.targets +++ b/eng/targets/Helix.targets @@ -162,8 +162,8 @@ When the targeting pack builds, it has exactly the same version as the shared framework. Passing SharedFxVersion because that's needed even when the targeting pack isn't building. --> - call runtests.cmd $(TargetFileName) $(NETCoreSdkVersion) $(MicrosoftNETCoreAppInternalPackageVersion) $(SharedFxVersion) $(_HelixFriendlyNameTargetQueue) $(TargetArchitecture) $(RunQuarantinedTests) $(DotnetEfPackageVersion) $(HelixTimeout) $(DotNetRuntimeSourceFeedKey) - ./runtests.sh $(TargetFileName) $(NETCoreSdkVersion) $(MicrosoftNETCoreAppInternalPackageVersion) $(SharedFxVersion) $(_HelixFriendlyNameTargetQueue) $(TargetArchitecture) $(RunQuarantinedTests) $(DotnetEfPackageVersion) $(HelixTimeout) $(DotNetRuntimeSourceFeedKey) + call runtests.cmd $(TargetFileName) $(NETCoreSdkVersion) $(MicrosoftNETCoreAppInternalVersion) $(SharedFxVersion) $(_HelixFriendlyNameTargetQueue) $(TargetArchitecture) $(RunQuarantinedTests) $(DotnetEfVersion) $(HelixTimeout) $(DotNetRuntimeSourceFeedKey) + ./runtests.sh $(TargetFileName) $(NETCoreSdkVersion) $(MicrosoftNETCoreAppInternalVersion) $(SharedFxVersion) $(_HelixFriendlyNameTargetQueue) $(TargetArchitecture) $(RunQuarantinedTests) $(DotnetEfVersion) $(HelixTimeout) $(DotNetRuntimeSourceFeedKey) $(HelixCommand) $(HelixTimeout) diff --git a/eng/targets/Npm.Common.targets b/eng/targets/Npm.Common.targets index 696d23402b00..0604d1f0c036 100644 --- a/eng/targets/Npm.Common.targets +++ b/eng/targets/Npm.Common.targets @@ -122,8 +122,8 @@ $(PackageId) $(PackageVersionForPackageVersionInfo) $(VersionSuffix) - - $(PackageId.Replace('.',''))PackageVersion + + $(PackageId.Replace('.',''))dVersion diff --git a/eng/targets/Packaging.targets b/eng/targets/Packaging.targets index aa4b272cba53..7bbcc6a94618 100644 --- a/eng/targets/Packaging.targets +++ b/eng/targets/Packaging.targets @@ -18,7 +18,7 @@ $(PackageId) $(PackageVersionForPackageVersionInfo) $(VersionSuffix) - $(PackageId.Replace('.',''))PackageVersion + $(PackageId.Replace('.',''))Version diff --git a/eng/targets/ResolveReferences.targets b/eng/targets/ResolveReferences.targets index 197491fd5a7e..9e3f81b89b2a 100644 --- a/eng/targets/ResolveReferences.targets +++ b/eng/targets/ResolveReferences.targets @@ -259,7 +259,7 @@ + TargetingPackVersion="${MicrosoftNETCoreAppRefVersion}" /> diff --git a/eng/tools/GenerateFiles/GenerateFiles.csproj b/eng/tools/GenerateFiles/GenerateFiles.csproj index 42bcca694b9f..48ce680ae176 100644 --- a/eng/tools/GenerateFiles/GenerateFiles.csproj +++ b/eng/tools/GenerateFiles/GenerateFiles.csproj @@ -9,11 +9,11 @@ <_TemplateProperties> DefaultNetCoreTargetFramework=$(DefaultNetCoreTargetFramework); KnownAppHostPackOrFrameworkReferenceTfm=$(KnownAppHostPackOrFrameworkReferenceTfm); - MicrosoftAspNetCoreAppRefPackageVersion=$(TargetingPackVersion); - MicrosoftAspNetCoreAppRuntimePackageVersion=$(SharedFxVersion); - MicrosoftNETCoreAppRefPackageVersion=$(MicrosoftNETCoreAppRefPackageVersion); + MicrosoftAspNetCoreAppRefVersion=$(TargetingPackVersion); + MicrosoftAspNetCoreAppRuntimeVersion=$(SharedFxVersion); + MicrosoftNETCoreAppRefVersion=$(MicrosoftNETCoreAppRefVersion); MicrosoftNETCoreAppRuntimeVersion=$(MicrosoftNETCoreAppRuntimeVersion); - MicrosoftNetCompilersToolsetPackageVersion=$(MicrosoftNetCompilersToolsetPackageVersion); + MicrosoftNetCompilersToolsetVersion=$(MicrosoftNetCompilersToolsetVersion); SupportedRuntimeIdentifiers=$(SupportedRuntimeIdentifiers.Trim()) diff --git a/global.json b/global.json index 2526c387f8f0..3518cdae0a77 100644 --- a/global.json +++ b/global.json @@ -7,10 +7,10 @@ "runtimes": { "dotnet/x64": [ "2.1.18", - "$(MicrosoftNETCoreAppInternalPackageVersion)" + "$(MicrosoftNETCoreAppInternalVersion)" ], "dotnet/x86": [ - "$(MicrosoftNETCoreAppInternalPackageVersion)" + "$(MicrosoftNETCoreAppInternalVersion)" ], "aspnetcore/x64": [ "3.1.4" diff --git a/src/Components/Components/src/Microsoft.AspNetCore.Components.csproj b/src/Components/Components/src/Microsoft.AspNetCore.Components.csproj index 7bd73bc5a640..c44f5f6e9927 100644 --- a/src/Components/Components/src/Microsoft.AspNetCore.Components.csproj +++ b/src/Components/Components/src/Microsoft.AspNetCore.Components.csproj @@ -39,8 +39,8 @@ - - + + @@ -51,7 +51,7 @@ - + diff --git a/src/Components/Components/src/Microsoft.AspNetCore.Components.netcoreapp.nuspec b/src/Components/Components/src/Microsoft.AspNetCore.Components.netcoreapp.nuspec index 2a1dfc4323ea..bc983db2fa0d 100644 --- a/src/Components/Components/src/Microsoft.AspNetCore.Components.netcoreapp.nuspec +++ b/src/Components/Components/src/Microsoft.AspNetCore.Components.netcoreapp.nuspec @@ -4,8 +4,8 @@ $CommonMetadataElements$ - - + + diff --git a/src/Components/WebAssembly/Sdk/testassets/Directory.Build.props b/src/Components/WebAssembly/Sdk/testassets/Directory.Build.props index 40a4aeaa1373..1ec1949f749f 100644 --- a/src/Components/WebAssembly/Sdk/testassets/Directory.Build.props +++ b/src/Components/WebAssembly/Sdk/testassets/Directory.Build.props @@ -15,7 +15,7 @@ We'll fall back to whatever the current SDK provides in regards to Roslyn's Microsoft.Net.Compilers.Toolset. --> false - true + true false diff --git a/src/Components/benchmarkapps/BlazingPizza.Server/BlazingPizza.Server.csproj b/src/Components/benchmarkapps/BlazingPizza.Server/BlazingPizza.Server.csproj index 7e4b840a096b..5446337063ef 100644 --- a/src/Components/benchmarkapps/BlazingPizza.Server/BlazingPizza.Server.csproj +++ b/src/Components/benchmarkapps/BlazingPizza.Server/BlazingPizza.Server.csproj @@ -9,8 +9,8 @@ - - + + diff --git a/src/FileProviders/Embedded/src/Microsoft.Extensions.FileProviders.Embedded.csproj b/src/FileProviders/Embedded/src/Microsoft.Extensions.FileProviders.Embedded.csproj index 5802aee04053..33dfb0f7bf03 100644 --- a/src/FileProviders/Embedded/src/Microsoft.Extensions.FileProviders.Embedded.csproj +++ b/src/FileProviders/Embedded/src/Microsoft.Extensions.FileProviders.Embedded.csproj @@ -30,7 +30,7 @@ - + diff --git a/src/FileProviders/Embedded/src/Microsoft.Extensions.FileProviders.Embedded.multitarget.nuspec b/src/FileProviders/Embedded/src/Microsoft.Extensions.FileProviders.Embedded.multitarget.nuspec index a89083327b9c..7df41c5eff33 100644 --- a/src/FileProviders/Embedded/src/Microsoft.Extensions.FileProviders.Embedded.multitarget.nuspec +++ b/src/FileProviders/Embedded/src/Microsoft.Extensions.FileProviders.Embedded.multitarget.nuspec @@ -4,10 +4,10 @@ $CommonMetadataElements$ - + - + diff --git a/src/FileProviders/Embedded/src/Microsoft.Extensions.FileProviders.Embedded.netcoreapp.nuspec b/src/FileProviders/Embedded/src/Microsoft.Extensions.FileProviders.Embedded.netcoreapp.nuspec index 9bf3b2da2ab1..8e3f50ccf505 100644 --- a/src/FileProviders/Embedded/src/Microsoft.Extensions.FileProviders.Embedded.netcoreapp.nuspec +++ b/src/FileProviders/Embedded/src/Microsoft.Extensions.FileProviders.Embedded.netcoreapp.nuspec @@ -4,7 +4,7 @@ $CommonMetadataElements$ - + diff --git a/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj b/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj index dd7368806f96..b1e2c92ec56e 100644 --- a/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj +++ b/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj @@ -31,8 +31,8 @@ This package is an internal implementation of the .NET Core SDK and is not meant runtimes/$(RuntimeIdentifier)/native/ dotnet-runtime-$(MicrosoftNETCoreAppRuntimeVersion)-$(TargetRuntimeIdentifier)$(ArchiveExtension) - $(DotNetAssetRootUrl)Runtime/$(MicrosoftNETCoreAppInternalPackageVersion)/$(DotNetRuntimeArchiveFileName) - $(DotNetPrivateAssetRootUrl)Runtime/$(MicrosoftNETCoreAppInternalPackageVersion)/$(DotNetRuntimeArchiveFileName) + $(DotNetAssetRootUrl)Runtime/$(MicrosoftNETCoreAppInternalVersion)/$(DotNetRuntimeArchiveFileName) + $(DotNetPrivateAssetRootUrl)Runtime/$(MicrosoftNETCoreAppInternalVersion)/$(DotNetRuntimeArchiveFileName) $(BaseIntermediateOutputPath)$(DotNetRuntimeArchiveFileName) diff --git a/src/Http/Routing/test/testassets/Benchmarks/Benchmarks.csproj b/src/Http/Routing/test/testassets/Benchmarks/Benchmarks.csproj index 6f70f9b391ff..d387bdc912aa 100644 --- a/src/Http/Routing/test/testassets/Benchmarks/Benchmarks.csproj +++ b/src/Http/Routing/test/testassets/Benchmarks/Benchmarks.csproj @@ -19,9 +19,9 @@ + DefaultRuntimeFrameworkVersion="$(MicrosoftAspNetCoreAppVersion)" + LatestRuntimeFrameworkVersion="$(MicrosoftAspNetCoreAppVersion)" + TargetingPackVersion="$(MicrosoftAspNetCoreAppVersion)" /> diff --git a/src/Installers/Debian/TargetingPack/Debian.TargetingPack.debproj b/src/Installers/Debian/TargetingPack/Debian.TargetingPack.debproj index 373149c92fc6..a8da4cc11c54 100644 --- a/src/Installers/Debian/TargetingPack/Debian.TargetingPack.debproj +++ b/src/Installers/Debian/TargetingPack/Debian.TargetingPack.debproj @@ -14,9 +14,9 @@ Provides a default set of APIs for building an ASP.NET Core $(AspNetCoreMajorMinorVersion) application. Contains reference assemblies, documentation, and other design-time assets. - $(MicrosoftNETCoreAppRefPackageVersion) + $(MicrosoftNETCoreAppRefVersion) $(DotnetTargetingPackDependencyVersion.Substring(0, $(DotnetTargetingPackDependencyVersion.IndexOf('-'))))~$(DotnetTargetingPackDependencyVersion.Substring($([MSBuild]::Add($(DotnetTargetingPackDependencyVersion.IndexOf('-')), 1)))) - $(MicrosoftNETCoreAppRefPackageVersion.Split('.')[0]).$(MicrosoftNETCoreAppRefPackageVersion.Split('.')[1]) + $(MicrosoftNETCoreAppRefVersion.Split('.')[0]).$(MicrosoftNETCoreAppRefVersion.Split('.')[1]) $(SharedFxProductName) $(SharedFxDescription) diff --git a/src/Installers/Rpm/TargetingPack/Rpm.TargetingPack.rpmproj b/src/Installers/Rpm/TargetingPack/Rpm.TargetingPack.rpmproj index aa0af5374884..0b2bc1cb7144 100644 --- a/src/Installers/Rpm/TargetingPack/Rpm.TargetingPack.rpmproj +++ b/src/Installers/Rpm/TargetingPack/Rpm.TargetingPack.rpmproj @@ -13,7 +13,7 @@ ASP.NET Core Targeting Pack Provides a default set of APIs for building an ASP.NET Core $(AspNetCoreMajorMinorVersion) application. Contains reference assemblies, documentation, and other design-time assets. - $(MicrosoftNETCoreAppRefPackageVersion.Split('.')[0]).$(MicrosoftNETCoreAppRefPackageVersion.Split('.')[1]) + $(MicrosoftNETCoreAppRefVersion.Split('.')[0]).$(MicrosoftNETCoreAppRefVersion.Split('.')[1]) @@ -23,7 +23,7 @@ - + diff --git a/src/Installers/Windows/WindowsHostingBundle/Product.targets b/src/Installers/Windows/WindowsHostingBundle/Product.targets index bb09f9c65c6d..119d397bdd5e 100644 --- a/src/Installers/Windows/WindowsHostingBundle/Product.targets +++ b/src/Installers/Windows/WindowsHostingBundle/Product.targets @@ -28,10 +28,10 @@ - + dotnet-runtime-$(MicrosoftNETCoreAppRuntimeVersion)-win-x64.exe - + dotnet-runtime-$(MicrosoftNETCoreAppRuntimeVersion)-win-x86.exe diff --git a/src/Installers/Windows/Wix.targets b/src/Installers/Windows/Wix.targets index 07c4e8db730e..c038754c8ffd 100644 --- a/src/Installers/Windows/Wix.targets +++ b/src/Installers/Windows/Wix.targets @@ -30,12 +30,12 @@ - + - $(NuGetPackageRoot)microsoft.dotnet.build.tasks.installers\$(MicrosoftDotNetBuildTasksInstallersPackageVersion)\tools\netcoreapp2.1\Microsoft.DotNet.Build.Tasks.Installers.dll - $(NuGetPackageRoot)microsoft.dotnet.build.tasks.installers\$(MicrosoftDotNetBuildTasksInstallersPackageVersion)\tools\net472\Microsoft.DotNet.Build.Tasks.Installers.dll + $(NuGetPackageRoot)microsoft.dotnet.build.tasks.installers\$(MicrosoftDotNetBuildTasksInstallersVersion)\tools\netcoreapp2.1\Microsoft.DotNet.Build.Tasks.Installers.dll + $(NuGetPackageRoot)microsoft.dotnet.build.tasks.installers\$(MicrosoftDotNetBuildTasksInstallersVersion)\tools\net472\Microsoft.DotNet.Build.Tasks.Installers.dll diff --git a/src/Middleware/ConcurrencyLimiter/sample/ConcurrencyLimiterSample.csproj b/src/Middleware/ConcurrencyLimiter/sample/ConcurrencyLimiterSample.csproj index d23f5807dfad..6a6eaa1d0444 100644 --- a/src/Middleware/ConcurrencyLimiter/sample/ConcurrencyLimiterSample.csproj +++ b/src/Middleware/ConcurrencyLimiter/sample/ConcurrencyLimiterSample.csproj @@ -12,10 +12,10 @@ - + - - + + diff --git a/src/Middleware/WebSockets/test/Directory.Build.props b/src/Middleware/WebSockets/test/Directory.Build.props index d5cd124cc9fe..8cee69988aa8 100644 --- a/src/Middleware/WebSockets/test/Directory.Build.props +++ b/src/Middleware/WebSockets/test/Directory.Build.props @@ -13,15 +13,15 @@ - 2.2.0 - 2.2.0 - 2.2.0 - 2.2.0 - 2.2.0 - 0.6.0-rtm-final - 2.2.0 - 2.2.0 - 2.2.0 + 2.2.0 + 2.2.0 + 2.2.0 + 2.2.0 + 2.2.0 + 0.6.0-rtm-final + 2.2.0 + 2.2.0 + 2.2.0 diff --git a/src/Mvc/benchmarkapps/BasicApi/BasicApi.csproj b/src/Mvc/benchmarkapps/BasicApi/BasicApi.csproj index f92709260cfa..637877b42c38 100644 --- a/src/Mvc/benchmarkapps/BasicApi/BasicApi.csproj +++ b/src/Mvc/benchmarkapps/BasicApi/BasicApi.csproj @@ -35,11 +35,11 @@ - - + + - + diff --git a/src/Mvc/benchmarkapps/BasicViews/BasicViews.csproj b/src/Mvc/benchmarkapps/BasicViews/BasicViews.csproj index 31d09a0c1c90..b7d9ae3d2bfa 100644 --- a/src/Mvc/benchmarkapps/BasicViews/BasicViews.csproj +++ b/src/Mvc/benchmarkapps/BasicViews/BasicViews.csproj @@ -36,7 +36,7 @@ These references are used when running on the Benchmarks Server. --> - - + + diff --git a/src/Mvc/benchmarkapps/RazorRendering/RazorRendering.csproj b/src/Mvc/benchmarkapps/RazorRendering/RazorRendering.csproj index 704906abe2eb..7382f24fbe16 100644 --- a/src/Mvc/benchmarkapps/RazorRendering/RazorRendering.csproj +++ b/src/Mvc/benchmarkapps/RazorRendering/RazorRendering.csproj @@ -17,8 +17,8 @@ These references are used when running on the Benchmarks Server. --> - - + + diff --git a/src/ProjectTemplates/BlazorTemplates.Tests/BlazorTemplates.Tests.csproj b/src/ProjectTemplates/BlazorTemplates.Tests/BlazorTemplates.Tests.csproj index 32166b40fc95..ccdb4360abdf 100644 --- a/src/ProjectTemplates/BlazorTemplates.Tests/BlazorTemplates.Tests.csproj +++ b/src/ProjectTemplates/BlazorTemplates.Tests/BlazorTemplates.Tests.csproj @@ -45,7 +45,7 @@ <_Parameter1>DotNetEfFullPath - <_Parameter2>$([MSBuild]::EnsureTrailingSlash('$(NuGetPackageRoot)'))dotnet-ef/$(DotnetEfPackageVersion)/tools/netcoreapp3.1/any/dotnet-ef.dll + <_Parameter2>$([MSBuild]::EnsureTrailingSlash('$(NuGetPackageRoot)'))dotnet-ef/$(DotnetEfVersion)/tools/netcoreapp3.1/any/dotnet-ef.dll <_Parameter1>TestPackageRestorePath diff --git a/src/ProjectTemplates/BlazorTemplates.Tests/Infrastructure/GenerateTestProps.targets b/src/ProjectTemplates/BlazorTemplates.Tests/Infrastructure/GenerateTestProps.targets index 98d765308e5e..b586d79c9ee2 100644 --- a/src/ProjectTemplates/BlazorTemplates.Tests/Infrastructure/GenerateTestProps.targets +++ b/src/ProjectTemplates/BlazorTemplates.Tests/Infrastructure/GenerateTestProps.targets @@ -6,13 +6,13 @@ RestoreAdditionalProjectSources=$([MSBuild]::Escape("$(RestoreAdditionalProjectSources);$(ArtifactsShippingPackagesDir);$(ArtifactsNonShippingPackagesDir)")); - MicrosoftNetCompilersToolsetPackageVersion=$(MicrosoftNetCompilersToolsetPackageVersion); + MicrosoftNetCompilersToolsetVersion=$(MicrosoftNetCompilersToolsetVersion); MicrosoftNETCoreAppRuntimeVersion=$(MicrosoftNETCoreAppRuntimeVersion); - MicrosoftNETCoreAppRefPackageVersion=$(MicrosoftNETCoreAppRefPackageVersion); - MicrosoftNETCorePlatformsPackageVersion=$(MicrosoftNETCorePlatformsPackageVersion); - MicrosoftNETSdkRazorPackageVersion=$(MicrosoftNETSdkRazorPackageVersion); - MicrosoftAspNetCoreAppRefPackageVersion=$(TargetingPackVersion); - MicrosoftAspNetCoreAppRuntimePackageVersion=$(SharedFxVersion); + MicrosoftNETCoreAppRefVersion=$(MicrosoftNETCoreAppRefVersion); + MicrosoftNETCorePlatformsVersion=$(MicrosoftNETCorePlatformsVersion); + MicrosoftNETSdkRazorVersion=$(MicrosoftNETSdkRazorVersion); + MicrosoftAspNetCoreAppRefVersion=$(TargetingPackVersion); + MicrosoftAspNetCoreAppRuntimeVersion=$(SharedFxVersion); SupportedRuntimeIdentifiers=$(SupportedRuntimeIdentifiers.Trim()); DefaultNetCoreTargetFramework=$(DefaultNetCoreTargetFramework); KnownAppHostPackOrFrameworkReferenceTfm=$(KnownAppHostPackOrFrameworkReferenceTfm); diff --git a/src/ProjectTemplates/BlazorTemplates.Tests/Infrastructure/TemplateTests.props.in b/src/ProjectTemplates/BlazorTemplates.Tests/Infrastructure/TemplateTests.props.in index c9f0981b9b6c..8d9cff4a798c 100644 --- a/src/ProjectTemplates/BlazorTemplates.Tests/Infrastructure/TemplateTests.props.in +++ b/src/ProjectTemplates/BlazorTemplates.Tests/Infrastructure/TemplateTests.props.in @@ -14,13 +14,13 @@ Update="Microsoft.NETCore.App" DefaultRuntimeFrameworkVersion="${MicrosoftNETCoreAppRuntimeVersion}" LatestRuntimeFrameworkVersion="${MicrosoftNETCoreAppRuntimeVersion}" - TargetingPackVersion="${MicrosoftNETCoreAppRefPackageVersion}" /> + TargetingPackVersion="${MicrosoftNETCoreAppRefVersion}" /> @@ -40,7 +40,7 @@ diff --git a/src/ProjectTemplates/GenerateContent.targets b/src/ProjectTemplates/GenerateContent.targets index 0de73148b3ed..8f119173d797 100644 --- a/src/ProjectTemplates/GenerateContent.targets +++ b/src/ProjectTemplates/GenerateContent.targets @@ -8,7 +8,7 @@ $(GeneratedContentProperties); - MicrosoftAspNetCoreAppPackageVersion=$(SharedFxVersion); + MicrosoftAspNetCoreAppVersion=$(SharedFxVersion); diff --git a/src/ProjectTemplates/Web.ProjectTemplates/BlazorServerWeb-CSharp.csproj.in b/src/ProjectTemplates/Web.ProjectTemplates/BlazorServerWeb-CSharp.csproj.in index f3438cdf1e15..fb2add30603f 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/BlazorServerWeb-CSharp.csproj.in +++ b/src/ProjectTemplates/Web.ProjectTemplates/BlazorServerWeb-CSharp.csproj.in @@ -17,17 +17,17 @@ - - - - - - - - - - - + + + + + + + + + + + diff --git a/src/ProjectTemplates/Web.ProjectTemplates/ComponentsWebAssembly-CSharp.Client.csproj.in b/src/ProjectTemplates/Web.ProjectTemplates/ComponentsWebAssembly-CSharp.Client.csproj.in index f7a592ba6194..6f627c605e50 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/ComponentsWebAssembly-CSharp.Client.csproj.in +++ b/src/ProjectTemplates/Web.ProjectTemplates/ComponentsWebAssembly-CSharp.Client.csproj.in @@ -11,12 +11,12 @@ - - - - - - + + + + + + diff --git a/src/ProjectTemplates/Web.ProjectTemplates/ComponentsWebAssembly-CSharp.Server.csproj.in b/src/ProjectTemplates/Web.ProjectTemplates/ComponentsWebAssembly-CSharp.Server.csproj.in index ba858d25b457..67f34756c0fc 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/ComponentsWebAssembly-CSharp.Server.csproj.in +++ b/src/ProjectTemplates/Web.ProjectTemplates/ComponentsWebAssembly-CSharp.Server.csproj.in @@ -11,7 +11,7 @@ - + @@ -27,22 +27,22 @@ - - - - - - - + + + + + + + - - - - - + + + + + diff --git a/src/ProjectTemplates/Web.ProjectTemplates/GrpcService-CSharp.csproj.in b/src/ProjectTemplates/Web.ProjectTemplates/GrpcService-CSharp.csproj.in index 60e843ffc0fd..f7a69fba22f2 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/GrpcService-CSharp.csproj.in +++ b/src/ProjectTemplates/Web.ProjectTemplates/GrpcService-CSharp.csproj.in @@ -9,7 +9,7 @@ - + diff --git a/src/ProjectTemplates/Web.ProjectTemplates/Microsoft.DotNet.Web.ProjectTemplates.csproj b/src/ProjectTemplates/Web.ProjectTemplates/Microsoft.DotNet.Web.ProjectTemplates.csproj index 396b74c39690..c470339dc3fa 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/Microsoft.DotNet.Web.ProjectTemplates.csproj +++ b/src/ProjectTemplates/Web.ProjectTemplates/Microsoft.DotNet.Web.ProjectTemplates.csproj @@ -11,20 +11,20 @@ DefaultNetCoreTargetFramework=$(DefaultNetCoreTargetFramework); - GrpcAspNetCorePackageVersion=$(GrpcAspNetCorePackageVersion); - MicrosoftAspNetCoreMvcRazorRuntimeCompilationPackageVersion=$(MicrosoftAspNetCoreMvcRazorRuntimeCompilationPackageVersion); - MicrosoftEntityFrameworkCoreSqlitePackageVersion=$(MicrosoftEntityFrameworkCoreSqlitePackageVersion); - MicrosoftEntityFrameworkCoreSqlServerPackageVersion=$(MicrosoftEntityFrameworkCoreSqlServerPackageVersion); - MicrosoftEntityFrameworkCoreToolsPackageVersion=$(MicrosoftEntityFrameworkCoreToolsPackageVersion); - MicrosoftExtensionsHostingPackageVersion=$(MicrosoftExtensionsHostingPackageVersion); - MicrosoftExtensionsHttpPackageVersion=$(MicrosoftExtensionsHttpPackageVersion); - MicrosoftIdentityWebPackageVersion=$(MicrosoftIdentityWebPackageVersion); - MicrosoftIdentityWebMicrosoftGraphPackageVersion=$(MicrosoftIdentityWebMicrosoftGraphPackageVersion); - MicrosoftIdentityWebUIPackageVersion=$(MicrosoftIdentityWebUIPackageVersion); + GrpcAspNetCoreVersion=$(GrpcAspNetCoreVersion); + MicrosoftAspNetCoreMvcRazorRuntimeCompilationVersion=$(MicrosoftAspNetCoreMvcRazorRuntimeCompilationVersion); + MicrosoftEntityFrameworkCoreSqliteVersion=$(MicrosoftEntityFrameworkCoreSqliteVersion); + MicrosoftEntityFrameworkCoreSqlServerVersion=$(MicrosoftEntityFrameworkCoreSqlServerVersion); + MicrosoftEntityFrameworkCoreToolsVersion=$(MicrosoftEntityFrameworkCoreToolsVersion); + MicrosoftExtensionsHostingVersion=$(MicrosoftExtensionsHostingVersion); + MicrosoftExtensionsHttpVersion=$(MicrosoftExtensionsHttpVersion); + MicrosoftIdentityWebVersion=$(MicrosoftIdentityWebVersion); + MicrosoftIdentityWebMicrosoftGraphVersion=$(MicrosoftIdentityWebMicrosoftGraphVersion); + MicrosoftIdentityWebUIVersion=$(MicrosoftIdentityWebUIVersion); MicrosoftNETCoreAppRuntimeVersion=$(MicrosoftNETCoreAppRuntimeVersion); - SystemNetHttpJsonPackageVersion=$(SystemNetHttpJsonPackageVersion); - MicrosoftGraphPackageVersion=$(MicrosoftGraphPackageVersion); - SwashbuckleAspNetCorePackageVersion=$(SwashbuckleAspNetCorePackageVersion); + SystemNetHttpJsonVersion=$(SystemNetHttpJsonVersion); + MicrosoftGraphVersion=$(MicrosoftGraphVersion); + SwashbuckleAspNetCoreVersion=$(SwashbuckleAspNetCoreVersion); diff --git a/src/ProjectTemplates/Web.ProjectTemplates/RazorClassLibrary-CSharp.csproj.in b/src/ProjectTemplates/Web.ProjectTemplates/RazorClassLibrary-CSharp.csproj.in index 3ddb38c8ba6b..298bcecd8dd1 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/RazorClassLibrary-CSharp.csproj.in +++ b/src/ProjectTemplates/Web.ProjectTemplates/RazorClassLibrary-CSharp.csproj.in @@ -9,13 +9,13 @@ - + - + diff --git a/src/ProjectTemplates/Web.ProjectTemplates/RazorPagesWeb-CSharp.csproj.in b/src/ProjectTemplates/Web.ProjectTemplates/RazorPagesWeb-CSharp.csproj.in index 64dea4a5dcaf..5869c4f86890 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/RazorPagesWeb-CSharp.csproj.in +++ b/src/ProjectTemplates/Web.ProjectTemplates/RazorPagesWeb-CSharp.csproj.in @@ -16,18 +16,18 @@ - - - - - - - - - - - - + + + + + + + + + + + + diff --git a/src/ProjectTemplates/Web.ProjectTemplates/StarterWeb-CSharp.csproj.in b/src/ProjectTemplates/Web.ProjectTemplates/StarterWeb-CSharp.csproj.in index 7730bea9c897..2da0a7fcb7d4 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/StarterWeb-CSharp.csproj.in +++ b/src/ProjectTemplates/Web.ProjectTemplates/StarterWeb-CSharp.csproj.in @@ -16,18 +16,18 @@ - - - - - - - - - - - - + + + + + + + + + + + + diff --git a/src/ProjectTemplates/Web.ProjectTemplates/StarterWeb-FSharp.fsproj.in b/src/ProjectTemplates/Web.ProjectTemplates/StarterWeb-FSharp.fsproj.in index 0c33c1025c20..c6ddfee52e47 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/StarterWeb-FSharp.fsproj.in +++ b/src/ProjectTemplates/Web.ProjectTemplates/StarterWeb-FSharp.fsproj.in @@ -14,7 +14,7 @@ - + diff --git a/src/ProjectTemplates/Web.ProjectTemplates/WebApi-CSharp.csproj.in b/src/ProjectTemplates/Web.ProjectTemplates/WebApi-CSharp.csproj.in index bbf520f99c3a..71cf4ecb67bc 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/WebApi-CSharp.csproj.in +++ b/src/ProjectTemplates/Web.ProjectTemplates/WebApi-CSharp.csproj.in @@ -9,11 +9,11 @@ - - - - - + + + + + diff --git a/src/ProjectTemplates/Web.ProjectTemplates/Worker-CSharp.csproj.in b/src/ProjectTemplates/Web.ProjectTemplates/Worker-CSharp.csproj.in index 3e486cf4de2a..284920b4f68c 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/Worker-CSharp.csproj.in +++ b/src/ProjectTemplates/Web.ProjectTemplates/Worker-CSharp.csproj.in @@ -8,6 +8,6 @@ - + diff --git a/src/ProjectTemplates/Web.ProjectTemplates/Worker-FSharp.fsproj.in b/src/ProjectTemplates/Web.ProjectTemplates/Worker-FSharp.fsproj.in index da9f1118cffe..c3905c0a7424 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/Worker-FSharp.fsproj.in +++ b/src/ProjectTemplates/Web.ProjectTemplates/Worker-FSharp.fsproj.in @@ -7,13 +7,13 @@ Company.Application1 - + - + diff --git a/src/ProjectTemplates/Web.Spa.ProjectTemplates/Angular-CSharp.csproj.in b/src/ProjectTemplates/Web.Spa.ProjectTemplates/Angular-CSharp.csproj.in index 950d707d4256..d4c7a9a742b0 100644 --- a/src/ProjectTemplates/Web.Spa.ProjectTemplates/Angular-CSharp.csproj.in +++ b/src/ProjectTemplates/Web.Spa.ProjectTemplates/Angular-CSharp.csproj.in @@ -15,15 +15,15 @@ - - - - - - - - - + + + + + + + + + diff --git a/src/ProjectTemplates/Web.Spa.ProjectTemplates/Microsoft.DotNet.Web.Spa.ProjectTemplates.csproj b/src/ProjectTemplates/Web.Spa.ProjectTemplates/Microsoft.DotNet.Web.Spa.ProjectTemplates.csproj index e9341c91b1f9..5276a1e2a5c3 100644 --- a/src/ProjectTemplates/Web.Spa.ProjectTemplates/Microsoft.DotNet.Web.Spa.ProjectTemplates.csproj +++ b/src/ProjectTemplates/Web.Spa.ProjectTemplates/Microsoft.DotNet.Web.Spa.ProjectTemplates.csproj @@ -13,11 +13,11 @@ DefaultNetCoreTargetFramework=$(DefaultNetCoreTargetFramework); - MicrosoftEntityFrameworkCoreSqlitePackageVersion=$(MicrosoftEntityFrameworkCoreSqlitePackageVersion); - MicrosoftEntityFrameworkCoreRelationalPackageVersion=$(MicrosoftEntityFrameworkCoreRelationalPackageVersion); - MicrosoftEntityFrameworkCoreSqlServerPackageVersion=$(MicrosoftEntityFrameworkCoreSqlServerPackageVersion); - MicrosoftEntityFrameworkCoreToolsPackageVersion=$(MicrosoftEntityFrameworkCoreToolsPackageVersion); - MicrosoftExtensionsHostingPackageVersion=$(MicrosoftExtensionsHostingPackageVersion); + MicrosoftEntityFrameworkCoreSqliteVersion=$(MicrosoftEntityFrameworkCoreSqliteVersion); + MicrosoftEntityFrameworkCoreRelationalVersion=$(MicrosoftEntityFrameworkCoreRelationalVersion); + MicrosoftEntityFrameworkCoreSqlServerVersion=$(MicrosoftEntityFrameworkCoreSqlServerVersion); + MicrosoftEntityFrameworkCoreToolsVersion=$(MicrosoftEntityFrameworkCoreToolsVersion); + MicrosoftExtensionsHostingVersion=$(MicrosoftExtensionsHostingVersion); MicrosoftNETCoreAppRuntimeVersion=$(MicrosoftNETCoreAppRuntimeVersion); diff --git a/src/ProjectTemplates/Web.Spa.ProjectTemplates/React-CSharp.csproj.in b/src/ProjectTemplates/Web.Spa.ProjectTemplates/React-CSharp.csproj.in index 568276606580..0d73e5dd85d5 100644 --- a/src/ProjectTemplates/Web.Spa.ProjectTemplates/React-CSharp.csproj.in +++ b/src/ProjectTemplates/Web.Spa.ProjectTemplates/React-CSharp.csproj.in @@ -12,15 +12,15 @@ - - - - - - - - - + + + + + + + + + diff --git a/src/ProjectTemplates/Web.Spa.ProjectTemplates/ReactRedux-CSharp.csproj.in b/src/ProjectTemplates/Web.Spa.ProjectTemplates/ReactRedux-CSharp.csproj.in index 0d361bd2e4c7..b1c073f62abe 100644 --- a/src/ProjectTemplates/Web.Spa.ProjectTemplates/ReactRedux-CSharp.csproj.in +++ b/src/ProjectTemplates/Web.Spa.ProjectTemplates/ReactRedux-CSharp.csproj.in @@ -12,7 +12,7 @@ - + diff --git a/src/ProjectTemplates/scripts/Test-Template.ps1 b/src/ProjectTemplates/scripts/Test-Template.ps1 index 0093ff126932..7b397e2314d5 100644 --- a/src/ProjectTemplates/scripts/Test-Template.ps1 +++ b/src/ProjectTemplates/scripts/Test-Template.ps1 @@ -34,7 +34,7 @@ function Test-Template($templateName, $templateArgs, $templateNupkg, $isSPA) { $projContent = $projContent -replace ('', " - + true diff --git a/src/ProjectTemplates/test/Infrastructure/GenerateTestProps.targets b/src/ProjectTemplates/test/Infrastructure/GenerateTestProps.targets index 98d765308e5e..b586d79c9ee2 100644 --- a/src/ProjectTemplates/test/Infrastructure/GenerateTestProps.targets +++ b/src/ProjectTemplates/test/Infrastructure/GenerateTestProps.targets @@ -6,13 +6,13 @@ RestoreAdditionalProjectSources=$([MSBuild]::Escape("$(RestoreAdditionalProjectSources);$(ArtifactsShippingPackagesDir);$(ArtifactsNonShippingPackagesDir)")); - MicrosoftNetCompilersToolsetPackageVersion=$(MicrosoftNetCompilersToolsetPackageVersion); + MicrosoftNetCompilersToolsetVersion=$(MicrosoftNetCompilersToolsetVersion); MicrosoftNETCoreAppRuntimeVersion=$(MicrosoftNETCoreAppRuntimeVersion); - MicrosoftNETCoreAppRefPackageVersion=$(MicrosoftNETCoreAppRefPackageVersion); - MicrosoftNETCorePlatformsPackageVersion=$(MicrosoftNETCorePlatformsPackageVersion); - MicrosoftNETSdkRazorPackageVersion=$(MicrosoftNETSdkRazorPackageVersion); - MicrosoftAspNetCoreAppRefPackageVersion=$(TargetingPackVersion); - MicrosoftAspNetCoreAppRuntimePackageVersion=$(SharedFxVersion); + MicrosoftNETCoreAppRefVersion=$(MicrosoftNETCoreAppRefVersion); + MicrosoftNETCorePlatformsVersion=$(MicrosoftNETCorePlatformsVersion); + MicrosoftNETSdkRazorVersion=$(MicrosoftNETSdkRazorVersion); + MicrosoftAspNetCoreAppRefVersion=$(TargetingPackVersion); + MicrosoftAspNetCoreAppRuntimeVersion=$(SharedFxVersion); SupportedRuntimeIdentifiers=$(SupportedRuntimeIdentifiers.Trim()); DefaultNetCoreTargetFramework=$(DefaultNetCoreTargetFramework); KnownAppHostPackOrFrameworkReferenceTfm=$(KnownAppHostPackOrFrameworkReferenceTfm); diff --git a/src/ProjectTemplates/test/Infrastructure/TemplateTests.props.in b/src/ProjectTemplates/test/Infrastructure/TemplateTests.props.in index 368a99213ff1..53cf386efd27 100644 --- a/src/ProjectTemplates/test/Infrastructure/TemplateTests.props.in +++ b/src/ProjectTemplates/test/Infrastructure/TemplateTests.props.in @@ -13,13 +13,13 @@ Update="Microsoft.NETCore.App" DefaultRuntimeFrameworkVersion="${MicrosoftNETCoreAppRuntimeVersion}" LatestRuntimeFrameworkVersion="${MicrosoftNETCoreAppRuntimeVersion}" - TargetingPackVersion="${MicrosoftNETCoreAppRefPackageVersion}" /> + TargetingPackVersion="${MicrosoftNETCoreAppRefVersion}" /> @@ -39,7 +39,7 @@ diff --git a/src/ProjectTemplates/test/ProjectTemplates.Tests.csproj b/src/ProjectTemplates/test/ProjectTemplates.Tests.csproj index 429a3b952e0d..d0299bb2107b 100644 --- a/src/ProjectTemplates/test/ProjectTemplates.Tests.csproj +++ b/src/ProjectTemplates/test/ProjectTemplates.Tests.csproj @@ -64,7 +64,7 @@ <_Parameter1>DotNetEfFullPath - <_Parameter2>$([MSBuild]::EnsureTrailingSlash('$(NuGetPackageRoot)'))dotnet-ef/$(DotnetEfPackageVersion)/tools/netcoreapp3.1/any/dotnet-ef.dll + <_Parameter2>$([MSBuild]::EnsureTrailingSlash('$(NuGetPackageRoot)'))dotnet-ef/$(DotnetEfVersion)/tools/netcoreapp3.1/any/dotnet-ef.dll <_Parameter1>TestPackageRestorePath diff --git a/src/ProjectTemplates/testassets/DotNetToolsInstaller/DotNetToolsInstaller.csproj b/src/ProjectTemplates/testassets/DotNetToolsInstaller/DotNetToolsInstaller.csproj index b8a12824f4df..85e9326e569d 100644 --- a/src/ProjectTemplates/testassets/DotNetToolsInstaller/DotNetToolsInstaller.csproj +++ b/src/ProjectTemplates/testassets/DotNetToolsInstaller/DotNetToolsInstaller.csproj @@ -12,7 +12,7 @@ - + diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/integrationtests/MSBuildIntegrationTestBase.cs b/src/Razor/Microsoft.NET.Sdk.Razor/integrationtests/MSBuildIntegrationTestBase.cs index cc9fd1009a45..e1106f6df697 100644 --- a/src/Razor/Microsoft.NET.Sdk.Razor/integrationtests/MSBuildIntegrationTestBase.cs +++ b/src/Razor/Microsoft.NET.Sdk.Razor/integrationtests/MSBuildIntegrationTestBase.cs @@ -74,7 +74,7 @@ internal Task DotnetMSBuild( "/p:RunningAsTest=true", $"/p:MicrosoftNETCoreAppRuntimeVersion={BuildVariables.MicrosoftNETCoreAppRuntimeVersion}", - $"/p:MicrosoftNetCompilersToolsetPackageVersion={BuildVariables.MicrosoftNetCompilersToolsetPackageVersion}", + $"/p:MicrosoftNetCompilersToolsetVersion={BuildVariables.MicrosoftNetCompilersToolsetVersion}", $"/p:RazorSdkDirectoryRoot={BuildVariables.RazorSdkDirectoryRoot}", $"/p:RepoRoot={BuildVariables.RepoRoot}", }; diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/integrationtests/Microsoft.NET.Sdk.Razor.IntegrationTests.csproj b/src/Razor/Microsoft.NET.Sdk.Razor/integrationtests/Microsoft.NET.Sdk.Razor.IntegrationTests.csproj index a26b2c2cffdf..718c37315a76 100644 --- a/src/Razor/Microsoft.NET.Sdk.Razor/integrationtests/Microsoft.NET.Sdk.Razor.IntegrationTests.csproj +++ b/src/Razor/Microsoft.NET.Sdk.Razor/integrationtests/Microsoft.NET.Sdk.Razor.IntegrationTests.csproj @@ -55,9 +55,9 @@ - - - + + + diff --git a/src/Razor/test/testassets/Directory.Build.props b/src/Razor/test/testassets/Directory.Build.props index c731613fd8b7..bd7edf6bf49b 100644 --- a/src/Razor/test/testassets/Directory.Build.props +++ b/src/Razor/test/testassets/Directory.Build.props @@ -7,7 +7,7 @@ We'll fall back to whatever the current SDK provides in regards to Roslyn's Microsoft.Net.Compilers.Toolset. --> false - true + true false @@ -43,7 +43,7 @@ diff --git a/src/Shared/MSBuild.Testing/BuildVariables.cs b/src/Shared/MSBuild.Testing/BuildVariables.cs index b659ba918c7a..eb6389c104c8 100644 --- a/src/Shared/MSBuild.Testing/BuildVariables.cs +++ b/src/Shared/MSBuild.Testing/BuildVariables.cs @@ -15,7 +15,7 @@ internal static partial class BuildVariables public static string MicrosoftNETCoreAppRuntimeVersion => TestAssemblyMetadata.SingleOrDefault(a => a.Key == "MicrosoftNETCoreAppRuntimeVersion").Value; - public static string MicrosoftNetCompilersToolsetPackageVersion => TestAssemblyMetadata.SingleOrDefault(a => a.Key == "MicrosoftNetCompilersToolsetPackageVersion").Value; + public static string MicrosoftNetCompilersToolsetVersion => TestAssemblyMetadata.SingleOrDefault(a => a.Key == "MicrosoftNetCompilersToolsetVersion").Value; public static string RazorSdkDirectoryRoot => TestAssemblyMetadata.SingleOrDefault(a => a.Key == "RazorSdkDirectoryRoot").Value; diff --git a/src/Shared/MSBuild.Testing/MSBuild.Testing.targets b/src/Shared/MSBuild.Testing/MSBuild.Testing.targets index 8868a23d9791..b1003dee592c 100644 --- a/src/Shared/MSBuild.Testing/MSBuild.Testing.targets +++ b/src/Shared/MSBuild.Testing/MSBuild.Testing.targets @@ -27,8 +27,8 @@ - <_Parameter1>MicrosoftNetCompilersToolsetPackageVersion - <_Parameter2>$(MicrosoftNetCompilersToolsetPackageVersion) + <_Parameter1>MicrosoftNetCompilersToolsetVersion + <_Parameter2>$(MicrosoftNetCompilersToolsetVersion) @@ -50,4 +50,4 @@ - \ No newline at end of file + diff --git a/src/Shared/MSBuild.Testing/MSBuildProcessManager.cs b/src/Shared/MSBuild.Testing/MSBuildProcessManager.cs index 251f4ec7f738..e77295952ab0 100644 --- a/src/Shared/MSBuild.Testing/MSBuildProcessManager.cs +++ b/src/Shared/MSBuild.Testing/MSBuildProcessManager.cs @@ -35,7 +35,7 @@ internal static Task DotnetMSBuild( "/p:RunningAsTest=true", $"/p:MicrosoftNETCoreAppRuntimeVersion={BuildVariables.MicrosoftNETCoreAppRuntimeVersion}", - $"/p:MicrosoftNetCompilersToolsetPackageVersion={BuildVariables.MicrosoftNetCompilersToolsetPackageVersion}", + $"/p:MicrosoftNetCompilersToolsetVersion={BuildVariables.MicrosoftNetCompilersToolsetVersion}", $"/p:RazorSdkDirectoryRoot={BuildVariables.RazorSdkDirectoryRoot}", $"/p:BlazorWebAssemblySdkDirectoryRoot={BuildVariables.BlazorWebAssemblySdkDirectoryRoot}", $"/p:RepoRoot={BuildVariables.RepoRoot}", diff --git a/src/SignalR/common/Shared/JsonUtils.cs b/src/SignalR/common/Shared/JsonUtils.cs index f1591cae84c1..f9fb94029582 100644 --- a/src/SignalR/common/Shared/JsonUtils.cs +++ b/src/SignalR/common/Shared/JsonUtils.cs @@ -47,18 +47,6 @@ public static JObject GetObject(JToken token) return (JObject)token; } - public static T GetOptionalProperty(JObject json, string property, JTokenType expectedType = JTokenType.None, T defaultValue = default) - { - var prop = json[property]; - - if (prop == null) - { - return defaultValue; - } - - return GetValue(property, expectedType, prop); - } - public static T GetRequiredProperty(JObject json, string property, JTokenType expectedType = JTokenType.None) { var prop = json[property]; diff --git a/src/SiteExtensions/Sdk/HostingStartup/HostingStartup.csproj b/src/SiteExtensions/Sdk/HostingStartup/HostingStartup.csproj index 471247e37812..0c7a832d4588 100644 --- a/src/SiteExtensions/Sdk/HostingStartup/HostingStartup.csproj +++ b/src/SiteExtensions/Sdk/HostingStartup/HostingStartup.csproj @@ -8,7 +8,7 @@ - + diff --git a/src/SiteExtensions/Sdk/SiteExtension.targets b/src/SiteExtensions/Sdk/SiteExtension.targets index e11ead7af3ec..943385b70041 100644 --- a/src/SiteExtensions/Sdk/SiteExtension.targets +++ b/src/SiteExtensions/Sdk/SiteExtension.targets @@ -83,9 +83,9 @@ Properties=" __DummyTarget=Restore; HostingStartupPackageName=%(_HostingStartupPackageReference.Identity); - HostingStartupPackageVersion=%(_HostingStartupPackageReference.Version); + HostingStartupVersion=%(_HostingStartupPackageReference.Version); RuntimeFrameworkVersion=$(HostingStartupRuntimeFrameworkVersion); - MicrosoftAspNetCoreAppPackageVersion=$(SharedFxVersion); + MicrosoftAspNetCoreAppVersion=$(SharedFxVersion); UseAppHost=false; NoBuild=false; RestoreAdditionalProjectSources=$(_RsRestoreSources)" /> @@ -95,9 +95,9 @@ Properties=" PublishDir=%(_HostingStartupPackageReference.WorkingDirectory)\p; HostingStartupPackageName=%(_HostingStartupPackageReference.Identity); - HostingStartupPackageVersion=%(_HostingStartupPackageReference.Version); + HostingStartupVersion=%(_HostingStartupPackageReference.Version); RuntimeFrameworkVersion=$(HostingStartupRuntimeFrameworkVersion); - MicrosoftAspNetCoreAppPackageVersion=$(SharedFxVersion); + MicrosoftAspNetCoreAppVersion=$(SharedFxVersion); UseAppHost=false; NoBuild=false; IncludeMainProjectInDepsFile=false" /> diff --git a/src/Tools/Microsoft.dotnet-openapi/src/Microsoft.dotnet-openapi.csproj b/src/Tools/Microsoft.dotnet-openapi/src/Microsoft.dotnet-openapi.csproj index 9f811292276b..b6f683433336 100644 --- a/src/Tools/Microsoft.dotnet-openapi/src/Microsoft.dotnet-openapi.csproj +++ b/src/Tools/Microsoft.dotnet-openapi/src/Microsoft.dotnet-openapi.csproj @@ -24,12 +24,12 @@ <_Parameter1>NSwag.ApiDescription.Client - <_Parameter2>$(NSwagApiDescriptionClientPackageVersion) + <_Parameter2>$(NSwagApiDescriptionClientVersion) <_Parameter3>NSwagCSharp;NSwagTypeScript <_Parameter1>Newtonsoft.Json - <_Parameter2>$(NewtonsoftJsonPackageVersion) + <_Parameter2>$(NewtonsoftJsonVersion) <_Parameter3>NSwagCSharp;NSwagTypeScript