diff --git a/.azure/pipelines/ci.yml b/.azure/pipelines/ci.yml index 48f6535fbe..28fae2b366 100644 --- a/.azure/pipelines/ci.yml +++ b/.azure/pipelines/ci.yml @@ -40,10 +40,10 @@ jobs: agentOs: Windows steps: - script: "echo ##vso[build.addbuildtag]daily-build" - condition: and(ne(variables['Build.Reason'], 'PullRequest'), ne(variables['IsFinalBuild'], 'true')) + condition: and(ne(variables['Build.Reason'], 'PullRequest'), notin(variables['DotNetFinalVersionKind'], 'release', 'prerelease')) displayName: 'Set CI tags' - script: "echo ##vso[build.addbuildtag]release-candidate" - condition: and(ne(variables['Build.Reason'], 'PullRequest'), eq(variables['IsFinalBuild'], 'true')) + condition: and(ne(variables['Build.Reason'], 'PullRequest'), in(variables['DotNetFinalVersionKind'], 'release', 'prerelease')) displayName: 'Set CI tags' # !!! NOTE !!! Some of these steps have disabled code signing. # This is intentional to workaround https://github.com/dotnet/arcade/issues/1957 which always re-submits for code-signing, even diff --git a/Directory.Build.props b/Directory.Build.props index 3331e894f6..bf91ebeb50 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,65 +1,48 @@  - - - - - + + + $([MSBuild]::MakeRelative($(RepoRoot), $(MSBuildProjectDirectory))) + + false + true + $(MSBuildProjectName)-ref + + true + true + false + true + true + true + true + false + + + + Microsoft ASP.NET Core + MicrosoftAspNetCore - Microsoft - Microsoft Corporation. - © Microsoft Corporation. All rights reserved. - en-US - - - - https://raw.githubusercontent.com/aspnet/AspNetCore/2.0.0/LICENSE.txt - Apache-2.0 + Apache-2.0 nugetaspnet@microsoft.com https://go.microsoft.com/fwlink/?LinkID=288859 https://asp.net - true - true + $(MSBuildProjectDirectory) - false true netcoreapp$(AspNetCoreMajorVersion).$(AspNetCoreMinorVersion) - - $(Product) $(PackageVersion) Shared Framework - Shared Framework for hosting of Microsoft ASP.NET Core applications. It is open source, cross-platform and is supported by Microsoft. We hope you enjoy using it! If you do, please consider joining the active community of developers that are contributing to the project on GitHub ($(RepositoryUrl)). We happily accept issues and PRs. - - aspnetcore-runtime - aspnetcore-targeting-pack - - $(RuntimeInstallerBaseName)-internal true - - $(NoWarn);NU5125 - - $(NoWarn);NU5105 $(WarningsNotAsErrors);CS1591 @@ -75,28 +58,36 @@ $(RepoRoot)src\submodules\googletest\ true - - false true - - - - - + + Microsoft.AspNetCore.App + Shared Framework for hosting of Microsoft ASP.NET Core applications. It is open source, cross-platform and is supported by Microsoft. We hope you enjoy using it! If you do, please consider joining the active community of developers that are contributing to the project on GitHub ($(RepositoryUrl)). We happily accept issues and PRs. + + Microsoft.AspNetCore.App.Ref + aspnetcore-runtime + aspnetcore-targeting-pack + + + false + + + $(RuntimeInstallerBaseName)-internal + - + - Debug - AnyCPU - $(Platform) win osx linux @@ -119,73 +110,28 @@ true - - true - false - - false - true - $(MSBuildProjectName)-ref - - - $(MSBuildThisFileDirectory)artifacts\ - $(ArtifactsDir)obj\ - $(ArtifactsDir)bin\ - $(ArtifactsDir)$(Configuration)\ - $(ArtifactsDir)packages\$(Configuration)\ - $(ArtifactsPackagesDir)Shipping\ - $(ArtifactsPackagesDir)NonShipping\ $(ArtifactsDir)installers\$(Configuration)\ - $(ArtifactsDir)VSSetup\$(Configuration)\ - - - - $(MSBuildProjectName) - - $([System.IO.Path]::GetFullPath('$(ArtifactsBinDir)$(OutDirName)\')) - $(BaseOutputPath)$(Configuration)\ - $(BaseOutputPath)$(PlatformName)\$(Configuration)\ - - $([System.IO.Path]::GetFullPath('$(ArtifactsObjDir)$(OutDirName)\')) - $(BaseIntermediateOutputPath)$(Configuration)\ - $(BaseIntermediateOutputPath)$(PlatformName)\$(Configuration)\ - - - $(RepoRoot).dotnet\$(TargetArchitecture)\ - $(RepoRoot).dotnet\ + $(RepoRoot).dotnet\ $(LocalDotNetRoot)packs\ - - - $([MSBuild]::MakeRelative($(RepoRoot), $(MSBuildProjectDirectory))) - - true - true - true - true - true - true - - - diff --git a/Directory.Build.targets b/Directory.Build.targets index 2486a20a85..925f9c404d 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -1,5 +1,4 @@ - false + - $(ArtifactsShippingPackagesDir) - $(ArtifactsNonShippingPackagesDir) + + + + + $(PreReleaseBrandingLabel) Build $(VersionSuffix) + $(VersionPrefix) + $(PackageBrandingVersion) $(BrandingVersionSuffix.Trim()) + + $(Version) + $(PackageVersion) + + $(TargetingPackVersionPrefix) + $(TargetingPackVersionPrefix)-$(VersionSuffix) + + $(Product) $(PackageVersion) Shared Framework + + + true @@ -68,14 +84,9 @@ true false - - false - true false - $(MicrosoftNETCoreAppPackageVersion) - true @@ -104,35 +115,6 @@ - - - - - - - <_Pattern>(https://dnceng%40dev\.azure\.com/dnceng/internal/_git|https://dev\.azure\.com/dnceng/internal/_git|https://dnceng\.visualstudio\.com/internal/_git|dnceng%40vs-ssh\.visualstudio\.com:v3/dnceng/internal|git%40ssh\.dev\.azure\.com:v3/dnceng/internal)/([^/-]+)-(.+) - <_Replacement>https://github.com/$2/$3 - - - - $([System.Text.RegularExpressions.Regex]::Replace($(ScmRepositoryUrl), $(_Pattern), $(_Replacement))) - - - - - $([System.Text.RegularExpressions.Regex]::Replace(%(SourceRoot.ScmRepositoryUrl), $(_Pattern), $(_Replacement))) - - - - diff --git a/NuGet.config b/NuGet.config index ec4b3c5a33..e2a1c6baae 100644 --- a/NuGet.config +++ b/NuGet.config @@ -3,10 +3,11 @@ + diff --git a/activate.ps1 b/activate.ps1 index 194ac8d349..bc6f326e8b 100644 --- a/activate.ps1 +++ b/activate.ps1 @@ -37,7 +37,8 @@ deactivate -init $_OLD_PATH = $env:PATH # Tell dotnet where to find itself -$env:DOTNET_ROOT = "$PSScriptRoot\.dotnet\x64" +$env:DOTNET_ROOT = "$PSScriptRoot\.dotnet" +${env:DOTNET_ROOT(x86)} = "$PSScriptRoot\.dotnet\x86" # Tell dotnet not to look beyond the DOTNET_ROOT folder for more dotnet things $env:DOTNET_MULTILEVEL_LOOKUP = 0 # Put dotnet first on PATH diff --git a/build.cmd b/build.cmd index 592b5d0f95..a66a229fb0 100644 --- a/build.cmd +++ b/build.cmd @@ -1,2 +1,3 @@ @ECHO OFF +SETLOCAL PowerShell -NoProfile -NoLogo -ExecutionPolicy unrestricted -Command "[System.Threading.Thread]::CurrentThread.CurrentCulture = ''; [System.Threading.Thread]::CurrentThread.CurrentUICulture = ''; try { & '%~dp0build.ps1' %*; exit $LASTEXITCODE } catch { write-host $_; exit 1 }" diff --git a/build.ps1 b/build.ps1 index 726946a89b..77fc54f167 100644 --- a/build.ps1 +++ b/build.ps1 @@ -348,6 +348,10 @@ if ($RunBuild -and ($All -or $BuildJava) -and -not $NoBuildJava) { } } + if ($env:PATH -notlike "*${env:JAVA_HOME}*") { + $env:PATH = "$(Join-Path $env:JAVA_HOME bin);${env:PATH}" + } + if (-not $foundJdk) { Write-Error "Could not find the JDK. Either run $PSScriptRoot\eng\scripts\InstallJdk.ps1 to install for this repo, or install the JDK globally on your machine (see $PSScriptRoot\docs\BuildFromSource.md for details)." } @@ -357,6 +361,7 @@ Import-Module -Force -Scope Local (Join-Path $korebuildPath 'KoreBuild.psd1') try { $env:KOREBUILD_KEEPGLOBALJSON = 1 + $env:KOREBUILD_DISABLE_DOTNET_ARCH = 1 Set-KoreBuildSettings -ToolsSource $ToolsSource -DotNetHome $DotNetHome -RepoPath $PSScriptRoot -ConfigFile $ConfigFile -CI:$CI if ($ForceCoreMsbuild) { $global:KoreBuildSettings.MSBuildType = 'core' diff --git a/build/AzureIntegration.targets b/build/AzureIntegration.targets index 3992669300..900b431d11 100644 --- a/build/AzureIntegration.targets +++ b/build/AzureIntegration.targets @@ -6,12 +6,8 @@ - AspNetUniverseBuildOffline=true; RepoRoot=$(AzureIntegrationProjectRoot); - VersionSuffix=$(VersionSuffix); - BuildNumberSuffix=$(BuildNumberSuffix); Configuration=$(Configuration); - IsFinalBuild=$(IsFinalBuild); diff --git a/build/repo.props b/build/repo.props index 681ba52b0a..904e16d261 100644 --- a/build/repo.props +++ b/build/repo.props @@ -19,8 +19,6 @@ false - false - $(ArtifactsDir)packages\$(Configuration)\ $(ArtifactsPackagesDir)Shipping\ $(ArtifactsPackagesDir)NonShipping\ diff --git a/build/repo.targets b/build/repo.targets index fe9c1c7a3d..df94a22d00 100644 --- a/build/repo.targets +++ b/build/repo.targets @@ -4,9 +4,6 @@ - - $(BuildProperties);BuildToolsTaskAssembly=$(_BuildToolsAssembly) - Prepare diff --git a/build/runtimes.props b/build/runtimes.props index 50b5a3f111..0c890e31f2 100644 --- a/build/runtimes.props +++ b/build/runtimes.props @@ -1,9 +1,6 @@ - - - diff --git a/build/sources.props b/build/sources.props deleted file mode 100644 index decee683d3..0000000000 --- a/build/sources.props +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - $(DotNetAdditionalRestoreSources); - $(DotNetRestoreSources); - - - - $(RestoreSources); - https://dotnetfeed.blob.core.windows.net/aspnet-blazor/index.json; - https://dotnetfeed.blob.core.windows.net/aspnet-extensions/index.json; - https://dotnetfeed.blob.core.windows.net/aspnet-entityframeworkcore/index.json; - https://dotnetfeed.blob.core.windows.net/aspnet-aspnetcore-tooling/index.json; - https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json; - https://dotnet.myget.org/F/roslyn/api/v3/index.json; - https://grpc.jfrog.io/grpc/api/nuget/v3/grpc-nuget-dev; - https://api.nuget.org/v3/index.json; - - - - $(RestoreSources); - https://dotnet.myget.org/F/aspnetcore-tools/api/v3/index.json; - - - - $(RestoreSources); - https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json; - - - - https://dotnetcli.blob.core.windows.net/dotnet/ - - diff --git a/build/tasks/RepoTasks.csproj b/build/tasks/RepoTasks.csproj index c9264a2afe..24dc25d2eb 100644 --- a/build/tasks/RepoTasks.csproj +++ b/build/tasks/RepoTasks.csproj @@ -11,7 +11,6 @@ - diff --git a/docs/BuildFromSource.md b/docs/BuildFromSource.md index 656bdf9d46..1d8850adc5 100644 --- a/docs/BuildFromSource.md +++ b/docs/BuildFromSource.md @@ -182,7 +182,6 @@ Common properties include: Property | Description -------------------------|------------------------------------------------------------------------------------------------------------- -BuildNumberSuffix | (string). A specific build number, typically from a CI counter, which is appended to the pre-release label. Configuration | `Debug` or `Release`. Default = `Debug`. TargetArchitecture | The CPU architecture to build for (x64, x86, arm, arm64). TargetOsName | The base runtime identifier to build for (win, linux, osx, linux-musl). diff --git a/docs/PreparingPatchUpdates.md b/docs/PreparingPatchUpdates.md index 17f8102539..ee153b4d03 100644 --- a/docs/PreparingPatchUpdates.md +++ b/docs/PreparingPatchUpdates.md @@ -3,7 +3,7 @@ Preparing new servicing updates In order to prepare this repo to build a new servicing update, the following changes need to be made. -* Increment the patch version in the [version.props](/version.props) file in the repository root. +* Increment the patch version in the [eng/Versions.props](/eng/Versions.props) file in the repository root. ```diff - 7 diff --git a/eng/AspNetCore.snk b/eng/AspNetCore.snk deleted file mode 100644 index e10e4889c1..0000000000 Binary files a/eng/AspNetCore.snk and /dev/null differ diff --git a/eng/Dependencies.props b/eng/Dependencies.props index 623fd62c5a..b7a2b5ab52 100644 --- a/eng/Dependencies.props +++ b/eng/Dependencies.props @@ -117,7 +117,6 @@ and are generated based on the last package release. - @@ -164,9 +163,6 @@ and are generated based on the last package release. - - - diff --git a/eng/Versions.props b/eng/Versions.props index 41cb537d43..e21a249bbf 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -5,9 +5,46 @@ --> + + 3 + 0 + 0 + 7 + preview$(PreReleasePreviewNumber) + Preview $(PreReleasePreviewNumber) + $(AspNetCoreMajorVersion).$(AspNetCoreMinorVersion) + + + false + + + true + + $(AspNetCoreMajorVersion).$(AspNetCoreMinorVersion).$(AspNetCorePatchVersion) + + $(VersionPrefix) + + $(AspNetCoreMajorVersion).$(AspNetCoreMinorVersion).0 + + 0.3.$(AspNetCorePatchVersion) + + + $([MSBuild]::Add(10, $(AspNetCoreMajorVersion))) + $(AspNetCoreMinorVersion) + $(AspNetCorePatchVersion) + + + $(AspNetCoreMajorVersion).$(AspNetCoreMinorVersion).$([MSBuild]::Subtract($(AspNetCorePatchVersion), 1)) + + + true true + + true + + false - $(KoreBuildVersion) - 3.0.0-build-20190515.1 - 1.0.0-preview.1 - 15.9.0 - 1.0.0-beta2-18618-05 - 1.0.0-beta2-18618-05 + 3.0.0-build-20190530.3 1.0.0-beta-64023-03 + 15.9.3032 4.5.0 4.4.0 @@ -207,8 +240,25 @@ $(XunitVersion) $(XunitVersion) $(XunitVersion) - $(XunitVersion) - $(XunitVersion) - $(XunitVersion) + + + + + $(RestoreSources); + https://dotnetfeed.blob.core.windows.net/aspnet-blazor/index.json; + https://dotnetfeed.blob.core.windows.net/aspnet-extensions/index.json; + https://dotnetfeed.blob.core.windows.net/aspnet-entityframeworkcore/index.json; + https://dotnetfeed.blob.core.windows.net/aspnet-aspnetcore-tooling/index.json; + https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json; + https://grpc.jfrog.io/grpc/api/nuget/v3/grpc-nuget-dev; + + + + $(RestoreSources); + https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json; + + + + https://dotnetcli.blob.core.windows.net/dotnet/ diff --git a/eng/Workarounds.props b/eng/Workarounds.props index 3bcf633f86..0668b92981 100644 --- a/eng/Workarounds.props +++ b/eng/Workarounds.props @@ -12,4 +12,36 @@ <_ProjectExtensionsWereImported>true $(WixInstallPath)\wix2010.targets + + + + + + + portable + + + + + $(RepoRoot)NuGet.config + + + + + + $(RestoreSources); + https://dotnet.myget.org/F/roslyn-tools/api/v3/index.json; + + + + + + false + diff --git a/eng/Workarounds.targets b/eng/Workarounds.targets index 3e1a269c7d..a217240bb8 100644 --- a/eng/Workarounds.targets +++ b/eng/Workarounds.targets @@ -31,4 +31,16 @@ false + + + + + + + + $(RestoreSources); + https://dotnet.myget.org/F/aspnetcore-tools/api/v3/index.json; + + + diff --git a/eng/scripts/CodeCheck.ps1 b/eng/scripts/CodeCheck.ps1 index ddb80e9065..a6c50e73d9 100644 --- a/eng/scripts/CodeCheck.ps1 +++ b/eng/scripts/CodeCheck.ps1 @@ -166,7 +166,7 @@ try { Write-Host "Re-generating package baselines" $dotnet = 'dotnet' if ($ci) { - $dotnet = "$repoRoot/.dotnet/x64/dotnet.exe" + $dotnet = "$repoRoot/.dotnet/dotnet.exe" } Invoke-Block { & $dotnet run -p "$repoRoot/eng/tools/BaselineGenerator/" diff --git a/eng/targets/CSharp.Common.props b/eng/targets/CSharp.Common.props index d6c2383b35..3a365b3e1f 100644 --- a/eng/targets/CSharp.Common.props +++ b/eng/targets/CSharp.Common.props @@ -2,28 +2,14 @@ 8.0 - $(MSBuildThisFileDirectory)..\AspNetCore.snk - true - - - SHA256 strict - - - false - false - false - false - true - - - + @@ -31,25 +17,12 @@ Use the Razor SDK as a package reference. The version of the .NET Core SDK we build with often contains a version of the Razor SDK several versions older than latest. To avoid a cyclical dependency, this package reference is added to override the bundled version. --> - - - - - - - - - + - - - - - diff --git a/eng/targets/CSharp.Common.targets b/eng/targets/CSharp.Common.targets index 3abfab3383..877665a63b 100644 --- a/eng/targets/CSharp.Common.targets +++ b/eng/targets/CSharp.Common.targets @@ -28,12 +28,6 @@ - - - $(VersionPrefix).$(FileRevisionVersion) - - - diff --git a/eng/targets/Cpp.Common.props b/eng/targets/Cpp.Common.props index faa8049b61..782441b4d4 100644 --- a/eng/targets/Cpp.Common.props +++ b/eng/targets/Cpp.Common.props @@ -5,8 +5,7 @@ true false - - $(OutputPath) + $(IntermediateOutputPath) diff --git a/eng/tools/BaselineGenerator/BaselineGenerator.csproj b/eng/tools/BaselineGenerator/BaselineGenerator.csproj index 4ee217963a..79fd9175cf 100644 --- a/eng/tools/BaselineGenerator/BaselineGenerator.csproj +++ b/eng/tools/BaselineGenerator/BaselineGenerator.csproj @@ -2,7 +2,7 @@ Exe - netcoreapp2.1 + netcoreapp3.0 -s https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json $(MSBuildThisFileDirectory)../../ diff --git a/eng/tools/Directory.Build.props b/eng/tools/Directory.Build.props index fda3ea0cbe..f75adf7e4d 100644 --- a/eng/tools/Directory.Build.props +++ b/eng/tools/Directory.Build.props @@ -1,3 +1,2 @@  - diff --git a/eng/tools/XplatPackageSigner/sign-packages.cmd b/eng/tools/XplatPackageSigner/sign-packages.cmd index 53b5a44ec6..b5a689dfc0 100644 --- a/eng/tools/XplatPackageSigner/sign-packages.cmd +++ b/eng/tools/XplatPackageSigner/sign-packages.cmd @@ -10,6 +10,6 @@ IF "%DirToSign%"=="" ( ) SET RepoRoot=%~dp0..\..\.. -SET Project=%~dp0\XplatPackageSigner.proj +SET Project=%~dp0XplatPackageSigner.proj %RepoRoot%\build.cmd -NoRestore -projects %project% /p:DirectoryToSign=%DirToSign% /bl:%RepoRoot%\artifacts\log\XplatSign.binlog diff --git a/korebuild-lock.txt b/korebuild-lock.txt index 04df499b68..cb6baecc02 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:3.0.0-build-20190515.1 -commithash:ec244eafdc277b29813c81e19e9e9768cad8839a +version:3.0.0-build-20190606.1 +commithash:2229c5dff7ca6384e7c17148a6da1aaee161f44d diff --git a/restore.cmd b/restore.cmd index 45e272ec1f..5e09500d3e 100644 --- a/restore.cmd +++ b/restore.cmd @@ -1,2 +1,3 @@ @ECHO OFF +SETLOCAL PowerShell -NoProfile -NoLogo -ExecutionPolicy unrestricted -Command "[System.Threading.Thread]::CurrentThread.CurrentCulture = ''; [System.Threading.Thread]::CurrentThread.CurrentUICulture = '';& '%~dp0build.ps1' -all -nobuild -restore %*; exit $LASTEXITCODE" diff --git a/src/Analyzers/Analyzers/src/Microsoft.AspNetCore.Analyzers.csproj b/src/Analyzers/Analyzers/src/Microsoft.AspNetCore.Analyzers.csproj index 5d67f77e3a..2a6daa68bd 100644 --- a/src/Analyzers/Analyzers/src/Microsoft.AspNetCore.Analyzers.csproj +++ b/src/Analyzers/Analyzers/src/Microsoft.AspNetCore.Analyzers.csproj @@ -21,26 +21,9 @@ - - - - - id=$(PackageId); - version=$(PackageVersion); - authors=$(Authors); - description=$(Description); - tags=$(PackageTags.Replace(';', ' ')); - licenseUrl=$(PackageLicenseUrl); - projectUrl=$(PackageProjectUrl); - iconUrl=$(PackageIconUrl); - repositoryUrl=$(RepositoryUrl); - repositoryCommit=$(SourceRevisionId); - copyright=$(Copyright); - - OutputBinary=$(OutputPath)$(AssemblyName).dll; - OutputSymbol=$(OutputPath)$(AssemblyName).pdb; - - - + + + + diff --git a/src/Analyzers/Analyzers/src/Microsoft.AspNetCore.Analyzers.nuspec b/src/Analyzers/Analyzers/src/Microsoft.AspNetCore.Analyzers.nuspec index 5f9d436f73..f906ece217 100644 --- a/src/Analyzers/Analyzers/src/Microsoft.AspNetCore.Analyzers.nuspec +++ b/src/Analyzers/Analyzers/src/Microsoft.AspNetCore.Analyzers.nuspec @@ -1,20 +1,7 @@  - $id$ - $version$ - $authors$ - true - $licenseUrl$ - $projectUrl$ - $iconUrl$ - $description$ - $copyright$ - $tags$ - - - - + $CommonMetadataElements$ diff --git a/src/Analyzers/build.cmd b/src/Analyzers/build.cmd index 033fe6f614..2406296662 100644 --- a/src/Analyzers/build.cmd +++ b/src/Analyzers/build.cmd @@ -1,3 +1,3 @@ @ECHO OFF SET RepoRoot=%~dp0..\.. -%RepoRoot%\build.cmd -projects %~dp0\**\*.*proj %* +%RepoRoot%\build.cmd -projects %~dp0**\*.*proj %* diff --git a/src/Analyzers/shared/FeatureDetection/Microsoft.AspNetCore.Analyzers.FeatureDetection.Sources.csproj b/src/Analyzers/shared/FeatureDetection/Microsoft.AspNetCore.Analyzers.FeatureDetection.Sources.csproj index 0edebfb6d2..53f07e744a 100644 --- a/src/Analyzers/shared/FeatureDetection/Microsoft.AspNetCore.Analyzers.FeatureDetection.Sources.csproj +++ b/src/Analyzers/shared/FeatureDetection/Microsoft.AspNetCore.Analyzers.FeatureDetection.Sources.csproj @@ -7,6 +7,7 @@ netstandard1.0 true false + true true true false diff --git a/src/Antiforgery/build.cmd b/src/Antiforgery/build.cmd index 033fe6f614..2406296662 100644 --- a/src/Antiforgery/build.cmd +++ b/src/Antiforgery/build.cmd @@ -1,3 +1,3 @@ @ECHO OFF SET RepoRoot=%~dp0..\.. -%RepoRoot%\build.cmd -projects %~dp0\**\*.*proj %* +%RepoRoot%\build.cmd -projects %~dp0**\*.*proj %* diff --git a/src/Azure/build.cmd b/src/Azure/build.cmd index 033fe6f614..2406296662 100644 --- a/src/Azure/build.cmd +++ b/src/Azure/build.cmd @@ -1,3 +1,3 @@ @ECHO OFF SET RepoRoot=%~dp0..\.. -%RepoRoot%\build.cmd -projects %~dp0\**\*.*proj %* +%RepoRoot%\build.cmd -projects %~dp0**\*.*proj %* diff --git a/src/Components/Blazor/BlazorExtension/src/Directory.Build.targets b/src/Components/Blazor/BlazorExtension/src/Directory.Build.targets deleted file mode 100644 index 36bf3b3d23..0000000000 --- a/src/Components/Blazor/BlazorExtension/src/Directory.Build.targets +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/src/Components/Blazor/BlazorExtension/src/Microsoft.VisualStudio.BlazorExtension.csproj b/src/Components/Blazor/BlazorExtension/src/Microsoft.VisualStudio.BlazorExtension.csproj index 3ade16c4dd..abc1310fda 100644 --- a/src/Components/Blazor/BlazorExtension/src/Microsoft.VisualStudio.BlazorExtension.csproj +++ b/src/Components/Blazor/BlazorExtension/src/Microsoft.VisualStudio.BlazorExtension.csproj @@ -1,15 +1,11 @@ - + + net472 RoslynDev - - Program - $(DevEnvDir)devenv.exe - /rootsuffix $(VSSDKTargetPlatformRegRootSuffix) /log - - false + false $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) @@ -28,7 +24,7 @@ false true true - false + false true @@ -40,30 +36,6 @@ BEGIN INTERESTING STUFF --> - - - 16.0 - 424242.424242 - $(BuildNumberSuffix.Replace('-', '.')) - $(VsixVersionPrefix).$(VsixVersionSuffix) - - $(VsixVersion) - - - - - $(VisualStudioSetupOutputPath)$(MSBuildProjectName).vsix - - - - + + + 16.0.$(VersionSuffixDateStamp).$(VersionSuffixBuildOfTheDay) + + 42.42.42.4242424 + $(VsixVersion) + diff --git a/src/Components/Blazor/BlazorExtension/src/source.extension.vsixmanifest b/src/Components/Blazor/BlazorExtension/src/source.extension.vsixmanifest index 64d36b9b99..78244bc951 100644 --- a/src/Components/Blazor/BlazorExtension/src/source.extension.vsixmanifest +++ b/src/Components/Blazor/BlazorExtension/src/source.extension.vsixmanifest @@ -1,7 +1,7 @@  - + Blazor Provides Visual Studio support for Blazor Content\LICENSE.txt diff --git a/src/Components/Blazor/Build/src/Microsoft.AspNetCore.Blazor.Build.csproj b/src/Components/Blazor/Build/src/Microsoft.AspNetCore.Blazor.Build.csproj index 4d5d245f45..3549878daf 100644 --- a/src/Components/Blazor/Build/src/Microsoft.AspNetCore.Blazor.Build.csproj +++ b/src/Components/Blazor/Build/src/Microsoft.AspNetCore.Blazor.Build.csproj @@ -4,7 +4,6 @@ netcoreapp3.0 Build mechanism for ASP.NET Core Blazor applications. Exe - true true false @@ -13,30 +12,18 @@ false + $(GenerateNuspecDependsOn);Publish true Microsoft.AspNetCore.Blazor.Build.nuspec - obj\publish\ - $(IntermediatePackDir)$(TargetFramework)/ - - - - false - - configuration=$(Configuration); - version=$(PackageVersion); - publishDir=$([MSBuild]::NormalizeDirectory($(IntermediatePackDir))); - componentsversion=$(ComponentsPackageVersion); - razorversion=$(MicrosoftAspNetCoreRazorDesignPackageVersion); - blazormonoversion=$(MicrosoftAspNetCoreBlazorMonoPackageVersion); - repositorycommit=$(SourceRevisionId); - - - <_TargetFramework Include="$(TargetFramework)" /> - - - + + + + + + + diff --git a/src/Components/Blazor/Build/src/Microsoft.AspNetCore.Blazor.Build.nuspec b/src/Components/Blazor/Build/src/Microsoft.AspNetCore.Blazor.Build.nuspec index 78a3bb0111..d52a9d631e 100644 --- a/src/Components/Blazor/Build/src/Microsoft.AspNetCore.Blazor.Build.nuspec +++ b/src/Components/Blazor/Build/src/Microsoft.AspNetCore.Blazor.Build.nuspec @@ -1,17 +1,7 @@ - Microsoft.AspNetCore.Blazor.Build - $version$ - Microsoft - © Microsoft Corporation. All rights reserved. - Build mechanism for ASP.NET Core Components. - aspnet components - https://go.microsoft.com/fwlink/?LinkID=288859 - https://raw.githubusercontent.com/aspnet/Home/2.0.0/LICENSE.txt - https://asp.net/ - - true + $CommonMetadataElements$ @@ -20,7 +10,7 @@ - + diff --git a/src/Components/Blazor/DevServer/src/Microsoft.AspNetCore.Blazor.DevServer.csproj b/src/Components/Blazor/DevServer/src/Microsoft.AspNetCore.Blazor.DevServer.csproj index 47023e0d9b..ebdf87801f 100644 --- a/src/Components/Blazor/DevServer/src/Microsoft.AspNetCore.Blazor.DevServer.csproj +++ b/src/Components/Blazor/DevServer/src/Microsoft.AspNetCore.Blazor.DevServer.csproj @@ -3,7 +3,6 @@ netcoreapp3.0 Exe - true blazor-devserver Microsoft.AspNetCore.Blazor.DevServer true @@ -24,27 +23,15 @@ + $(GenerateNuspecDependsOn);publish true - obj\publish\ - $(IntermediatePackDir)$(TargetFramework)\ Microsoft.AspNetCore.Blazor.DevServer.nuspec - - - - false - - packageId=$(PackageId); - description=$(Description); - publishDir=$([MSBuild]::NormalizeDirectory($(PublishDir))); - componentsrootdir=..\..\..\; - blazorversion=$(PackageVersion); - repositorycommit=$(SourceRevisionId); - - - <_TargetFramework Include="$(TargetFramework)" /> - - - + + + + + + diff --git a/src/Components/Blazor/DevServer/src/Microsoft.AspNetCore.Blazor.DevServer.nuspec b/src/Components/Blazor/DevServer/src/Microsoft.AspNetCore.Blazor.DevServer.nuspec index 41f4080270..5142ba2080 100644 --- a/src/Components/Blazor/DevServer/src/Microsoft.AspNetCore.Blazor.DevServer.nuspec +++ b/src/Components/Blazor/DevServer/src/Microsoft.AspNetCore.Blazor.DevServer.nuspec @@ -1,21 +1,7 @@  - $packageId$ - $blazorversion$ - Microsoft - Microsoft - true - https://raw.githubusercontent.com/aspnet/AspNetCore/2.0.0/LICENSE.txt - https://asp.net/ - https://go.microsoft.com/fwlink/?LinkID=288859 - $description$ - -This package was built from the source code at https://github.com/aspnet/AspNetCore/tree/$repositorycommit$ - © Microsoft Corporation. All rights reserved. - aspnetcore components - true - + $CommonMetadataElements$ diff --git a/src/Components/Blazor/Directory.Build.props b/src/Components/Blazor/Directory.Build.targets similarity index 70% rename from src/Components/Blazor/Directory.Build.props rename to src/Components/Blazor/Directory.Build.targets index d1e60bbeab..178608d3e5 100644 --- a/src/Components/Blazor/Directory.Build.props +++ b/src/Components/Blazor/Directory.Build.targets @@ -1,5 +1,5 @@ - + $(PackageVersion) diff --git a/src/Components/Blazor/Templates/src/Directory.Build.props b/src/Components/Blazor/Templates/src/Directory.Build.props index c5666650b9..ed5e015014 100644 --- a/src/Components/Blazor/Templates/src/Directory.Build.props +++ b/src/Components/Blazor/Templates/src/Directory.Build.props @@ -3,9 +3,10 @@ false + false - + 0.8.0-preview-19064-0339 3.0.0-preview-19064-0339 diff --git a/src/Components/Blazor/Templates/src/Directory.Build.targets b/src/Components/Blazor/Templates/src/Directory.Build.targets index d69d2a5ba4..7c6f423add 100644 --- a/src/Components/Blazor/Templates/src/Directory.Build.targets +++ b/src/Components/Blazor/Templates/src/Directory.Build.targets @@ -1,9 +1,17 @@ - - false - false - - + + + + + TemplateBlazorVersion=$(PackageVersion); + TemplateComponentsVersion=$(ComponentsPackageVersion); + RepositoryCommit=$(SourceRevisionId); + + + diff --git a/src/Components/Blazor/Templates/src/Microsoft.AspNetCore.Blazor.Templates.csproj b/src/Components/Blazor/Templates/src/Microsoft.AspNetCore.Blazor.Templates.csproj index f33d8fcc67..26c91bd897 100644 --- a/src/Components/Blazor/Templates/src/Microsoft.AspNetCore.Blazor.Templates.csproj +++ b/src/Components/Blazor/Templates/src/Microsoft.AspNetCore.Blazor.Templates.csproj @@ -6,8 +6,9 @@ False False False - 2008 + $(NoWarn);2008 Templates for ASP.NET Core Blazor projects. + aspnet;templates;blazor;spa false @@ -35,13 +36,13 @@ $(GeneratedContentProperties) - - + diff --git a/src/Components/Blazor/Templates/src/Microsoft.AspNetCore.Blazor.Templates.nuspec b/src/Components/Blazor/Templates/src/Microsoft.AspNetCore.Blazor.Templates.nuspec index 2699c2de4b..70b93d7253 100644 --- a/src/Components/Blazor/Templates/src/Microsoft.AspNetCore.Blazor.Templates.nuspec +++ b/src/Components/Blazor/Templates/src/Microsoft.AspNetCore.Blazor.Templates.nuspec @@ -1,18 +1,7 @@ - Microsoft.AspNetCore.Blazor.Templates - $version$ - Microsoft - Templates for ASP.NET Core Blazor - http://go.microsoft.com/fwlink/?LinkID=288859 - en-US - https://asp.net/ - - https://www.microsoft.com/web/webpi/eula/net_library_eula_enu.htm - © Microsoft Corporation. All rights reserved. - true - aspnet templates blazor spa + $CommonMetadataElements$ diff --git a/src/Components/Blazor/Templates/src/SetPackageProperties.targets b/src/Components/Blazor/Templates/src/SetPackageProperties.targets deleted file mode 100644 index 0a6c6dd5ba..0000000000 --- a/src/Components/Blazor/Templates/src/SetPackageProperties.targets +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - $(NuspecProperties); - version=$(PackageVersion); - - - - - - - - - TemplateBlazorVersion=$(PackageVersion); - TemplateComponentsVersion=$(ComponentsPackageVersion); - RepositoryCommit=$(SourceRevisionId); - - - - diff --git a/src/Components/build.cmd b/src/Components/build.cmd index 033fe6f614..2406296662 100644 --- a/src/Components/build.cmd +++ b/src/Components/build.cmd @@ -1,3 +1,3 @@ @ECHO OFF SET RepoRoot=%~dp0..\.. -%RepoRoot%\build.cmd -projects %~dp0\**\*.*proj %* +%RepoRoot%\build.cmd -projects %~dp0**\*.*proj %* diff --git a/src/DataProtection/build.cmd b/src/DataProtection/build.cmd index 033fe6f614..2406296662 100644 --- a/src/DataProtection/build.cmd +++ b/src/DataProtection/build.cmd @@ -1,3 +1,3 @@ @ECHO OFF SET RepoRoot=%~dp0..\.. -%RepoRoot%\build.cmd -projects %~dp0\**\*.*proj %* +%RepoRoot%\build.cmd -projects %~dp0**\*.*proj %* diff --git a/src/Framework/ref/Microsoft.AspNetCore.App.Ref.csproj b/src/Framework/ref/Microsoft.AspNetCore.App.Ref.csproj index 7a0d9cfe80..c188613871 100644 --- a/src/Framework/ref/Microsoft.AspNetCore.App.Ref.csproj +++ b/src/Framework/ref/Microsoft.AspNetCore.App.Ref.csproj @@ -7,7 +7,7 @@ true false $(TargetingPackName) - $(TargetingPackVersion) + $(TargetingPackVersionPrefix) Provides a default set of APIs for building an ASP.NET Core application. Contains reference assemblies, documentation, and other design-time assets. @@ -18,14 +18,6 @@ This package is an internal implementation of the .NET Core SDK and is not meant DotnetPlatform ref/$(TargetFramework)/ - packs\Microsoft.AspNetCore.App.Ref\$(PackageVersion)\ - $(TargetingPackLayoutRoot)$(TargetingPackSubPath) - $(LocalDotNetRoot)$(TargetingPackSubPath) - - aspnetcore-targeting-pack-$(PackageVersion).zip - aspnetcore-targeting-pack-$(PackageVersion).tar.gz - $(InstallersOutputPath)$(ArchiveOutputFileName) - false @@ -60,6 +52,16 @@ This package is an internal implementation of the .NET Core SDK and is not meant + + packs\Microsoft.AspNetCore.App.Ref\$(PackageVersion)\ + $(TargetingPackLayoutRoot)$(TargetingPackSubPath) + $(LocalDotNetRoot)$(TargetingPackSubPath) + + aspnetcore-targeting-pack-$(PackageVersion).zip + aspnetcore-targeting-pack-$(PackageVersion).tar.gz + $(InstallersOutputPath)$(ArchiveOutputFileName) + + diff --git a/src/Framework/src/Microsoft.AspNetCore.App.Runtime.csproj b/src/Framework/src/Microsoft.AspNetCore.App.Runtime.csproj index bb4784bb94..0a6b4f5bed 100644 --- a/src/Framework/src/Microsoft.AspNetCore.App.Runtime.csproj +++ b/src/Framework/src/Microsoft.AspNetCore.App.Runtime.csproj @@ -7,7 +7,6 @@ false $(MSBuildProjectName).$(RuntimeIdentifier) - $(SharedFxVersion) true false Provides a default set of APIs for building an ASP.NET Core application. Contains assets used for self-contained deployments. @@ -19,15 +18,6 @@ This package is an internal implementation of the .NET Core SDK and is not meant true DotnetPlatform - shared\$(SharedFxName)\$(SharedFxVersion)\ - $(SharedFrameworkLayoutRoot)$(SharedRuntimeSubPath) - $(RedistSharedFrameworkLayoutRoot)$(SharedRuntimeSubPath) - $(LocalDotNetRoot)$(SharedRuntimeSubPath) - - $(InternalInstallerBaseName)-$(PackageVersion)-$(TargetRuntimeIdentifier)$(ArchiveExtension) - $(InstallersOutputPath)$(InternalArchiveOutputFileName) - $(RuntimeInstallerBaseName)-$(PackageVersion)-$(TargetRuntimeIdentifier)$(ArchiveExtension) - $(InstallersOutputPath)$(BundleArchiveOutputFileName) aspnetcore_base_runtime.version @@ -138,6 +128,18 @@ This package is an internal implementation of the .NET Core SDK and is not meant + + shared\$(SharedFxName)\$(SharedFxVersion)\ + $(SharedFrameworkLayoutRoot)$(SharedRuntimeSubPath) + $(RedistSharedFrameworkLayoutRoot)$(SharedRuntimeSubPath) + $(LocalDotNetRoot)$(SharedRuntimeSubPath) + + $(InternalInstallerBaseName)-$(PackageVersion)-$(TargetRuntimeIdentifier)$(ArchiveExtension) + $(InstallersOutputPath)$(InternalArchiveOutputFileName) + $(RuntimeInstallerBaseName)-$(PackageVersion)-$(TargetRuntimeIdentifier)$(ArchiveExtension) + $(InstallersOutputPath)$(RedistArchiveOutputFileName) + + @@ -183,9 +185,6 @@ This package is an internal implementation of the .NET Core SDK and is not meant - - - diff --git a/src/Framework/test/Microsoft.AspNetCore.App.UnitTests.csproj b/src/Framework/test/Microsoft.AspNetCore.App.UnitTests.csproj index 87365c13b8..f2052f95eb 100644 --- a/src/Framework/test/Microsoft.AspNetCore.App.UnitTests.csproj +++ b/src/Framework/test/Microsoft.AspNetCore.App.UnitTests.csproj @@ -25,7 +25,7 @@ <_Parameter1>MicrosoftNETCoreAppPackageVersion - <_Parameter2>$(RuntimeFrameworkVersion) + <_Parameter2>$(MicrosoftNETCoreAppPackageVersion) <_Parameter1>SharedFxDependencies diff --git a/src/Http/build.cmd b/src/Http/build.cmd index 033fe6f614..2406296662 100644 --- a/src/Http/build.cmd +++ b/src/Http/build.cmd @@ -1,3 +1,3 @@ @ECHO OFF SET RepoRoot=%~dp0..\.. -%RepoRoot%\build.cmd -projects %~dp0\**\*.*proj %* +%RepoRoot%\build.cmd -projects %~dp0**\*.*proj %* diff --git a/src/Identity/build.cmd b/src/Identity/build.cmd index 033fe6f614..2406296662 100644 --- a/src/Identity/build.cmd +++ b/src/Identity/build.cmd @@ -1,3 +1,3 @@ @ECHO OFF SET RepoRoot=%~dp0..\.. -%RepoRoot%\build.cmd -projects %~dp0\**\*.*proj %* +%RepoRoot%\build.cmd -projects %~dp0**\*.*proj %* diff --git a/src/Installers/Debian/Directory.Build.props b/src/Installers/Debian/Directory.Build.props index d967c46c68..9d46b71673 100644 --- a/src/Installers/Debian/Directory.Build.props +++ b/src/Installers/Debian/Directory.Build.props @@ -1,8 +1,6 @@ - - true $(InstallersOutputPath) diff --git a/src/Installers/Debian/Directory.Build.targets b/src/Installers/Debian/Directory.Build.targets index 5a5c19191e..ca3400af75 100644 --- a/src/Installers/Debian/Directory.Build.targets +++ b/src/Installers/Debian/Directory.Build.targets @@ -33,10 +33,10 @@ DebianPackageInstallRoot=$(DebianPackageInstallRoot); MaintainerEmail=$(MaintainerEmail); PackageId=$(PackageId); - PackageLicenseType=$(PackageLicenseType); + PackageLicenseExpression=$(PackageLicenseExpression); PackageProjectUrl=$(PackageProjectUrl); PackageRevision=$(PackageRevision); - PackageVersion=$(PackageVersion); + PackageVersion=$(DebPackageVersion); PackageSummary=$(PackageSummary); PackageDescription=$(PackageDescription); @@ -51,7 +51,7 @@ - $(PackageId)_$(PackageVersion)-$(PackageRevision)_$(DebianPackageArch).deb + $(PackageId)_$(DebPackageVersion)-$(PackageRevision)_$(DebianPackageArch).deb diff --git a/src/Installers/Debian/Runtime/Debian.Runtime.debproj b/src/Installers/Debian/Runtime/Debian.Runtime.debproj index 6baf4c265a..233d954c56 100644 --- a/src/Installers/Debian/Runtime/Debian.Runtime.debproj +++ b/src/Installers/Debian/Runtime/Debian.Runtime.debproj @@ -5,19 +5,12 @@ - $(RuntimeInstallerBaseName)-$(SharedFxVersion)-x64.deb $(SharedFrameworkLayoutRoot) $(RuntimeInstallerBaseName)-$(AspNetCoreMajorVersion).$(AspNetCoreMinorVersion) - - $(AspNetCoreMajorVersion).$(AspNetCoreMinorVersion).$(AspNetCorePatchVersion) - - $(PackageVersion)~$(VersionSuffix) - 1 - - + $(MicrosoftNETCoreAppPackageVersion) $(DotnetRuntimeDependencyVersion.Substring(0, $(DotnetRuntimeDependencyVersion.IndexOf('-'))))~$(DotnetRuntimeDependencyVersion.Substring($([MSBuild]::Add($(DotnetRuntimeDependencyVersion.IndexOf('-')), 1)))) @@ -36,4 +29,14 @@ + + + $(RuntimeInstallerBaseName)-$(SharedFxVersion)-x64.deb + $(TargetDir)$(TargetFileName) + + $(VersionPrefix) + + $(DebPackageVersion)~$(VersionSuffix) + 1 + diff --git a/src/Installers/Debian/Runtime/debian_config.json.in b/src/Installers/Debian/Runtime/debian_config.json.in index c8c33f681e..d9c36fb33d 100644 --- a/src/Installers/Debian/Runtime/debian_config.json.in +++ b/src/Installers/Debian/Runtime/debian_config.json.in @@ -24,7 +24,7 @@ "copyright": "Microsoft", "license": { - "type": "${PackageLicenseType}", + "type": "${PackageLicenseExpression}", "full_text": "Copyright (c) .NET Foundation. All rights reserved.\n\nLicensed under the Apache License, Version 2.0 (the \"License\"); you may not use\nthese files except in compliance with the License. You may obtain a copy of the\nLicense at\n\nhttp://www.apache.org/licenses/LICENSE-2.0\n\nUnless required by applicable law or agreed to in writing, software distributed\nunder the License is distributed on an \"AS IS\" BASIS, WITHOUT WARRANTIES OR\nCONDITIONS OF ANY KIND, either express or implied. See the License for the\nspecific language governing permissions and limitations under the License." }, diff --git a/src/Installers/Debian/TargetingPack/Debian.TargetingPack.debproj b/src/Installers/Debian/TargetingPack/Debian.TargetingPack.debproj index 7b78c9f52b..ee170b3e7b 100644 --- a/src/Installers/Debian/TargetingPack/Debian.TargetingPack.debproj +++ b/src/Installers/Debian/TargetingPack/Debian.TargetingPack.debproj @@ -5,17 +5,11 @@ - $(TargetingPackInstallerBaseName)-$(TargetingPackVersion).deb $(TargetingPackLayoutRoot) $(TargetingPackInstallerBaseName)-$(AspNetCoreMajorVersion).$(AspNetCoreMinorVersion) - $(TargetingPackVersionPrefix) - - $(PackageVersion)~$(VersionSuffix) - 1 - ASP.NET Core Targeting Pack Provides a default set of APIs for building an ASP.NET Core $(AspNetCoreMajorVersion).$(AspNetCoreMinorVersion) application. Contains reference assemblies, documentation, and other design-time assets. @@ -30,6 +24,14 @@ + $(TargetingPackInstallerBaseName)-$(TargetingPackVersion).deb + $(TargetDir)$(TargetFileName) + + $(TargetingPackVersionPrefix) + + $(DebPackageVersion)~$(VersionSuffix) + 1 + diff --git a/src/Installers/Debian/TargetingPack/debian_config.json.in b/src/Installers/Debian/TargetingPack/debian_config.json.in index ff3b1cb6d7..bbcb1c166d 100644 --- a/src/Installers/Debian/TargetingPack/debian_config.json.in +++ b/src/Installers/Debian/TargetingPack/debian_config.json.in @@ -24,7 +24,7 @@ "copyright": "Microsoft", "license": { - "type": "${PackageLicenseType}", + "type": "${PackageLicenseExpression}", "full_text": "Copyright (c) .NET Foundation. All rights reserved.\n\nLicensed under the Apache License, Version 2.0 (the \"License\"); you may not use\nthese files except in compliance with the License. You may obtain a copy of the\nLicense at\n\nhttp://www.apache.org/licenses/LICENSE-2.0\n\nUnless required by applicable law or agreed to in writing, software distributed\nunder the License is distributed on an \"AS IS\" BASIS, WITHOUT WARRANTIES OR\nCONDITIONS OF ANY KIND, either express or implied. See the License for the\nspecific language governing permissions and limitations under the License." }, diff --git a/src/Installers/Rpm/Directory.Build.targets b/src/Installers/Rpm/Directory.Build.targets index 021da2c25a..7199ff32bd 100644 --- a/src/Installers/Rpm/Directory.Build.targets +++ b/src/Installers/Rpm/Directory.Build.targets @@ -4,13 +4,9 @@ - - - $(RpmPackageInstallRoot)/ - $(InstallersOutputPath)$(TargetFileName) @@ -56,25 +52,25 @@ - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - + diff --git a/src/Installers/Rpm/Rpm.Runtime.Common.targets b/src/Installers/Rpm/Rpm.Runtime.Common.targets index 141efc28ef..198e55120b 100644 --- a/src/Installers/Rpm/Rpm.Runtime.Common.targets +++ b/src/Installers/Rpm/Rpm.Runtime.Common.targets @@ -8,8 +8,8 @@ $(AspNetCoreMajorVersion).$(AspNetCoreMinorVersion).$(AspNetCorePatchVersion) - 1 - 0.1.$(VersionSuffix.Replace('-', '_')) + 1 + 0.1.$(VersionSuffix.Replace('-', '_')) $(SharedFxProductName) $(SharedFxDescription) @@ -18,7 +18,7 @@ - + false true diff --git a/src/Installers/Rpm/Runtime.Rhel/Rpm.Runtime.Rhel.rpmproj b/src/Installers/Rpm/Runtime.Rhel/Rpm.Runtime.Rhel.rpmproj index 5edb6bd85e..8e13879150 100644 --- a/src/Installers/Rpm/Runtime.Rhel/Rpm.Runtime.Rhel.rpmproj +++ b/src/Installers/Rpm/Runtime.Rhel/Rpm.Runtime.Rhel.rpmproj @@ -6,10 +6,13 @@ /opt/rh/rh-dotnet20/root/usr/lib64/dotnet/ - $(RuntimeInstallerBaseName)-$(SharedFxVersion)-rh.rhel.7-x64.rpm + - + + $(RuntimeInstallerBaseName)-$(SharedFxVersion)-rh.rhel.7-x64.rpm + $(InstallersOutputPath)$(TargetFileName) + diff --git a/src/Installers/Rpm/Runtime/Rpm.Runtime.rpmproj b/src/Installers/Rpm/Runtime/Rpm.Runtime.rpmproj index 9d2fe036ad..aec18334fe 100644 --- a/src/Installers/Rpm/Runtime/Rpm.Runtime.rpmproj +++ b/src/Installers/Rpm/Runtime/Rpm.Runtime.rpmproj @@ -6,10 +6,13 @@ /usr/share/dotnet/ - $(RuntimeInstallerBaseName)-$(SharedFxVersion)-x64.rpm + - + + $(RuntimeInstallerBaseName)-$(SharedFxVersion)-x64.rpm + $(InstallersOutputPath)$(TargetFileName) + diff --git a/src/Installers/Rpm/TargetingPack/Rpm.TargetingPack.rpmproj b/src/Installers/Rpm/TargetingPack/Rpm.TargetingPack.rpmproj index 6694256075..f2d3e34ef3 100644 --- a/src/Installers/Rpm/TargetingPack/Rpm.TargetingPack.rpmproj +++ b/src/Installers/Rpm/TargetingPack/Rpm.TargetingPack.rpmproj @@ -3,18 +3,12 @@ /usr/share/dotnet/ - $(TargetingPackInstallerBaseName)-$(TargetingPackVersion).rpm $(TargetingPackLayoutRoot) $(TargetingPackInstallerBaseName)-$(AspNetCoreMajorVersion).$(AspNetCoreMinorVersion) - $(TargetingPackVersionPrefix) - - - 1 - 0.1.$(VersionSuffix.Replace('-', '_')) ASP.NET Core Targeting Pack Provides a default set of APIs for building an ASP.NET Core $(AspNetCoreMajorVersion).$(AspNetCoreMinorVersion) application. Contains reference assemblies, documentation, and other design-time assets. @@ -33,6 +27,15 @@ + $(TargetingPackInstallerBaseName)-$(TargetingPackVersion).rpm + $(InstallersOutputPath)$(TargetFileName) + + $(TargetingPackVersionPrefix) + + + 1 + 0.1.$(VersionSuffix.Replace('-', '_')) + diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/AncmIISExpressV2.wixproj b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/AncmIISExpressV2.wixproj index 404f2a3c13..fc067bce55 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/AncmIISExpressV2.wixproj +++ b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/AncmIISExpressV2.wixproj @@ -4,7 +4,7 @@ AspNetCoreModuleV2IISExpress - true + true 17c76489-4c09-4e14-b81c-7a86cd937144 Package ancm_iis_express_$(Platform)_en_v2 @@ -54,7 +54,6 @@ @@ -66,5 +65,8 @@ - + + + $(TargetName)$(TargetExt) + diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/AncmV2.wixproj b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/AncmV2.wixproj index 66d093c623..43a00453fb 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/AncmV2.wixproj +++ b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/AncmV2.wixproj @@ -4,7 +4,7 @@ AspNetCoreModuleV2 - true + true f9bacb48-3bd7-4ec2-ae31-664e8703ec12 Package aspnetcoremodule_$(Platform)_en_v2 @@ -53,5 +53,8 @@ - + + + $(TargetName)$(TargetExt) + diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/CustomAction/aspnetcoreCA.vcxproj b/src/Installers/Windows/AspNetCoreModule-Setup/CustomAction/aspnetcoreCA.vcxproj index fc7b1609b7..6fea1a5c0f 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/CustomAction/aspnetcoreCA.vcxproj +++ b/src/Installers/Windows/AspNetCoreModule-Setup/CustomAction/aspnetcoreCA.vcxproj @@ -13,8 +13,7 @@ - - + Debug @@ -89,11 +88,4 @@ - - - This project is trying to import a missing file: {0}. - - - - diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/IIS-Common/lib/IISSetup.CommonLib.vcxproj b/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/IIS-Common/lib/IISSetup.CommonLib.vcxproj index bc5eb5365c..08403fc70a 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/IIS-Common/lib/IISSetup.CommonLib.vcxproj +++ b/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/IIS-Common/lib/IISSetup.CommonLib.vcxproj @@ -1,8 +1,7 @@  - - - + + @@ -72,12 +71,4 @@ - - - This project is trying to import a missing file: {0}. - - - - - diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/IIS-Common/reftrace/reftrace.vcxproj b/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/IIS-Common/reftrace/reftrace.vcxproj index 8d1093181d..30a6ef67d0 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/IIS-Common/reftrace/reftrace.vcxproj +++ b/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/IIS-Common/reftrace/reftrace.vcxproj @@ -1,8 +1,7 @@ - - - + + Debug @@ -67,12 +66,4 @@ - - - This project is trying to import a missing file: {0}. - - - - - diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/lib/iisca.vcxproj b/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/lib/iisca.vcxproj index 1f694316af..fa40ba0394 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/lib/iisca.vcxproj +++ b/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/lib/iisca.vcxproj @@ -1,8 +1,7 @@  - - - + + Debug @@ -124,12 +123,4 @@ - - - This project is trying to import a missing file: {0}. - - - - - diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/build/versions.props b/src/Installers/Windows/AspNetCoreModule-Setup/build/versions.props deleted file mode 100644 index 3be2245e72..0000000000 --- a/src/Installers/Windows/AspNetCoreModule-Setup/build/versions.props +++ /dev/null @@ -1,38 +0,0 @@ - - - - - 7 - 1 - - - $([MSBuild]::Multiply(12,$([MSBuild]::Subtract($([System.DateTime]::Now.Year), 2016)))) - $([MSBuild]::Add( $([MSBuild]::Subtract($([System.DateTime]::Now.Month), 10)), $(VersionDateMonths))) - $([System.DateTime]::Now.ToString("dd")) - $([System.String]::Concat($([System.Int32]::Parse('$(VersionDateTotalMonths)').ToString("D3")), $(VersionDateDays))) - $(VersionBuildMajor) - $([System.DateTime]::Now.ToString("HHmm")) - - - - - /DPRODUCT_MAJOR=$(PRODUCT_MAJOR) %(AdditionalOptions) - - - /DPRODUCT_MINOR=$(PRODUCT_MINOR) %(AdditionalOptions) - - - /DBUILD_MAJOR=$(BUILD_MAJOR) %(AdditionalOptions) - - - /DBUILD_MINOR=$(BUILD_MINOR) %(AdditionalOptions) - - - - - PRODUCT_MAJOR=$(PRODUCT_MAJOR);$(ResourceCompilePreprocessorDefinitions) - PRODUCT_MINOR=$(PRODUCT_MINOR);$(ResourceCompilePreprocessorDefinitions) - BUILD_MAJOR=$(BUILD_MAJOR);$(ResourceCompilePreprocessorDefinitions) - BUILD_MINOR=$(BUILD_MINOR);$(ResourceCompilePreprocessorDefinitions) - - \ No newline at end of file diff --git a/src/Installers/Windows/Directory.Build.targets b/src/Installers/Windows/Directory.Build.targets index b5cebea51b..afba04ab04 100644 --- a/src/Installers/Windows/Directory.Build.targets +++ b/src/Installers/Windows/Directory.Build.targets @@ -1,7 +1,4 @@ - - - - + diff --git a/src/Installers/Windows/SharedFramework/Product.props b/src/Installers/Windows/SharedFramework/Product.props deleted file mode 100644 index a6a29c3f80..0000000000 --- a/src/Installers/Windows/SharedFramework/Product.props +++ /dev/null @@ -1,11 +0,0 @@ - - - Microsoft ASP.NET Core Shared Framework - Microsoft ASP.NET Core $(PackageBrandingVersion) Shared Framework ($(Platform)) - AspNetCore.SharedFramework - - $(DefineConstants);ProductName=$(ProductName) - $(DefineConstants);ProductNameShort=$(ProductNameShort) - $(DefineConstants);ProductNameFolder=$(ProductNameFolder) - - diff --git a/src/Installers/Windows/SharedFramework/SharedFramework.wixproj b/src/Installers/Windows/SharedFramework/SharedFramework.wixproj index aafbb2080b..7a8f258c7d 100644 --- a/src/Installers/Windows/SharedFramework/SharedFramework.wixproj +++ b/src/Installers/Windows/SharedFramework/SharedFramework.wixproj @@ -2,11 +2,11 @@ - - + Microsoft ASP.NET Core Shared Framework + AspNetCore.SharedFramework AspNetCoreSharedFramework - $(RuntimeInstallerBaseName)-$(PackageVersion)-win-$(Platform) + $(Name)-$(Platform) Package no sfx_$(Platform).cab @@ -15,7 +15,9 @@ 5150;5151 true $(IntermediateOutputPath)fx\ - true + true + $(DefineConstants);ProductNameFolder=$(ProductNameFolder) + $(DefineConstants);ProductNameShort=$(ProductNameShort) $(DefineConstants);AspNetCoreSharedFrameworkSource=$(HarvestSource) $(SharedFrameworkNamespaceGuid) 2.0 @@ -71,4 +73,10 @@ + + + $(RuntimeInstallerBaseName)-$(PackageVersion)-win-$(Platform)$(TargetExt) + Microsoft ASP.NET Core $(PackageBrandingVersion) Shared Framework ($(Platform)) + $(DefineConstants);ProductName=$(ProductName) + diff --git a/src/Installers/Windows/SharedFrameworkBundle/Product.props b/src/Installers/Windows/SharedFrameworkBundle/Product.props deleted file mode 100644 index a77dc7a3df..0000000000 --- a/src/Installers/Windows/SharedFrameworkBundle/Product.props +++ /dev/null @@ -1,31 +0,0 @@ - - - Microsoft ASP.NET Core $(PackageBrandingVersion) - - - - Shared Framework - $(BundleNameShort) - $(BundleNameSub) - $(BundleName) ($(Platform)) - Microsoft Corporation - dd_AspNetCoreSharedFramework_ - - - Microsoft - .NET Core - Microsoft ASP.NET Core $(PackageBrandingVersion) Shared Framework - $(BundleNameFull) - - - - $(DefineConstants);BundleName=$(BundleName) - $(DefineConstants);BundleNameFull=$(BundleNameFull) - $(DefineConstants);BundleNameShort=$(BundleNameShort) - $(DefineConstants);BundleNameSub=$(BundleNameSub) - $(DefineConstants);BundleManufacturer=$(BundleManufacturer) - $(DefineConstants);BundleLogPrefix=$(BundleLogPrefix) - $(DefineConstants);BundleRegManufacturer=$(BundleRegManufacturer) - $(DefineConstants);BundleRegFamily=$(BundleRegFamily) - $(DefineConstants);BundleRegName=$(BundleRegName) - - diff --git a/src/Installers/Windows/SharedFrameworkBundle/SharedFrameworkBundle.wixproj b/src/Installers/Windows/SharedFrameworkBundle/SharedFrameworkBundle.wixproj index 22cd8287bc..7aa16e58ec 100644 --- a/src/Installers/Windows/SharedFrameworkBundle/SharedFrameworkBundle.wixproj +++ b/src/Installers/Windows/SharedFrameworkBundle/SharedFrameworkBundle.wixproj @@ -2,13 +2,11 @@ - - AspNetCoreSharedFrameworkBundle - true + $(Name)-$(Platform) + true Bundle - $(RuntimeInstallerBaseName)-$(PackageVersion)-win-$(Platform) $(SharedFrameworkNamespaceGuid) {D6C54D8B-043F-4877-B751-60E7390F9EC6} 2.0 @@ -47,4 +45,32 @@ + + + $(RuntimeInstallerBaseName)-$(PackageVersion)-win-$(Platform)$(TargetExt) + + Microsoft ASP.NET Core $(PackageBrandingVersion) + Shared Framework + $(BundleNameShort) - $(BundleNameSub) + $(BundleName) ($(Platform)) + $(BundleNameFull) + + Microsoft Corporation + dd_AspNetCoreSharedFramework_ + + + Microsoft + .NET Core + + $(DefineConstants);BundleNameShort=$(BundleNameShort) + $(DefineConstants);BundleName=$(BundleName) + $(DefineConstants);BundleNameFull=$(BundleNameFull) + $(DefineConstants);BundleNameSub=$(BundleNameSub) + $(DefineConstants);BundleManufacturer=$(BundleManufacturer) + $(DefineConstants);BundleLogPrefix=$(BundleLogPrefix) + $(DefineConstants);BundleRegManufacturer=$(BundleRegManufacturer) + $(DefineConstants);BundleRegFamily=$(BundleRegFamily) + $(DefineConstants);BundleRegName=$(BundleRegName) + + diff --git a/src/Installers/Windows/SharedFrameworkLib/SharedFrameworkLib.wixproj b/src/Installers/Windows/SharedFrameworkLib/SharedFrameworkLib.wixproj index e08fb8c29d..3b693fdf16 100644 --- a/src/Installers/Windows/SharedFrameworkLib/SharedFrameworkLib.wixproj +++ b/src/Installers/Windows/SharedFrameworkLib/SharedFrameworkLib.wixproj @@ -4,10 +4,10 @@ AspNetCoreSharedFrameworkLib$(Platform) + $(Name) - $(InternalInstallerBaseName)-$(PackageVersion)-win-$(Platform) - - true + + true Library true $(SharedFrameworkNamespaceGuid) @@ -36,4 +36,8 @@ + + + $(InternalInstallerBaseName)-$(PackageVersion)-win-$(Platform)$(TargetExt) + diff --git a/src/Installers/Windows/TargetingPack/Product.props b/src/Installers/Windows/TargetingPack/Product.props deleted file mode 100644 index 777bf589a6..0000000000 --- a/src/Installers/Windows/TargetingPack/Product.props +++ /dev/null @@ -1,11 +0,0 @@ - - - Microsoft ASP.NET Core Targeting Pack - Microsoft ASP.NET Core $(PackageBrandingVersion) Targeting Pack ($(Platform)) - AspNetCore.TargetingPack - - $(DefineConstants);ProductName=$(ProductName) - $(DefineConstants);ProductNameShort=$(ProductNameShort) - $(DefineConstants);ProductNameFolder=$(ProductNameFolder) - - diff --git a/src/Installers/Windows/TargetingPack/TargetingPack.wixproj b/src/Installers/Windows/TargetingPack/TargetingPack.wixproj index 86208a2b68..ab034cb041 100644 --- a/src/Installers/Windows/TargetingPack/TargetingPack.wixproj +++ b/src/Installers/Windows/TargetingPack/TargetingPack.wixproj @@ -2,18 +2,20 @@ - - + Microsoft ASP.NET Core Targeting Pack + AspNetCore.TargetingPack AspNetCoreTargetingPack - $(TargetingPackInstallerBaseName)-$(PackageVersion)-win-$(Platform) + $(Name)-$(Platform) Package - true + true 0AC34F1B-8056-4FFB-A398-E6BB7D67B48D true 5150;5151 true $(IntermediateOutputPath)dn\ + $(DefineConstants);ProductNameShort=$(ProductNameShort) + $(DefineConstants);ProductNameFolder=$(ProductNameFolder) $(DefineConstants);AspNetCoreTargetingPackSource=$(HarvestSource) DDBB771F-963F-47D3-8510-9ABD04DBE1D1 2.0 @@ -66,6 +68,10 @@ + Microsoft ASP.NET Core $(PackageBrandingVersion) Targeting Pack ($(Platform)) + $(TargetingPackInstallerBaseName)-$(PackageVersion)-win-$(Platform)$(TargetExt) + $(DefineConstants);ProductName=$(ProductName) + diff --git a/src/Installers/Windows/WindowsHostingBundle/Product.props b/src/Installers/Windows/WindowsHostingBundle/Product.props deleted file mode 100644 index 64492e50c9..0000000000 --- a/src/Installers/Windows/WindowsHostingBundle/Product.props +++ /dev/null @@ -1,31 +0,0 @@ - - - Microsoft .NET Core $(PackageBrandingVersion) - - - - Windows Server Hosting - $(BundleNameShort) - $(BundleNameSub) - $(BundleName) ($(Platform)) - Microsoft Corporation - dd_DotNetCoreWinSvrHosting - - - Microsoft - .NET Core - Microsoft .NET Core $(PackageBrandingVersion) - Windows Server Hosting - $(BundleNameFull) - - - - $(DefineConstants);BundleName=$(BundleName) - $(DefineConstants);BundleNameFull=$(BundleNameFull) - $(DefineConstants);BundleNameShort=$(BundleNameShort) - $(DefineConstants);BundleNameSub=$(BundleNameSub) - $(DefineConstants);BundleManufacturer=$(BundleManufacturer) - $(DefineConstants);BundleLogPrefix=$(BundleLogPrefix) - $(DefineConstants);BundleRegManufacturer=$(BundleRegManufacturer) - $(DefineConstants);BundleRegFamily=$(BundleRegFamily) - $(DefineConstants);BundleRegName=$(BundleRegName) - - diff --git a/src/Installers/Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj b/src/Installers/Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj index b042b37bfa..9a5513805d 100644 --- a/src/Installers/Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj +++ b/src/Installers/Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj @@ -1,14 +1,11 @@  - - - WindowsServerHostingBundle - dotnet-hosting-$(PackageVersion)-win - true + WindowsServerHostingBundle + true 6F1B115C-1903-40CB-837D-7961AB610F4E Bundle x86 @@ -75,4 +72,36 @@ + + + dotnet-hosting-$(PackageVersion)-win$(TargetExt) + + Microsoft .NET Core $(PackageBrandingVersion) + + + + Windows Server Hosting + $(BundleNameShort) - $(BundleNameSub) + $(BundleName) ($(Platform)) + Microsoft Corporation + dd_DotNetCoreWinSvrHosting + + + Microsoft + .NET Core + Microsoft .NET Core $(PackageBrandingVersion) - Windows Server Hosting + $(BundleNameFull) + + + + $(DefineConstants);BundleName=$(BundleName) + $(DefineConstants);BundleNameFull=$(BundleNameFull) + $(DefineConstants);BundleNameShort=$(BundleNameShort) + $(DefineConstants);BundleNameSub=$(BundleNameSub) + $(DefineConstants);BundleManufacturer=$(BundleManufacturer) + $(DefineConstants);BundleLogPrefix=$(BundleLogPrefix) + $(DefineConstants);BundleRegManufacturer=$(BundleRegManufacturer) + $(DefineConstants);BundleRegFamily=$(BundleRegFamily) + $(DefineConstants);BundleRegName=$(BundleRegName) + diff --git a/src/Installers/Windows/Wix.props b/src/Installers/Windows/Wix.props index 217c384d3a..a76eaf631d 100644 --- a/src/Installers/Windows/Wix.props +++ b/src/Installers/Windows/Wix.props @@ -1,10 +1,6 @@ - - $(AspNetCoreMajorVersion).$(AspNetCoreMinorVersion).$(AspNetCorePatchVersion).0 - - $(AspNetCoreMajorVersion).$(AspNetCoreMinorVersion).$(AspNetCorePatchVersion).$(FileRevisionVersion) Release x64 ENU @@ -28,11 +24,7 @@ $(DefineConstants);files=$(MSBuildThisFileDirectory)files - $(DefineConstants);Version=$(Version) $(DefineConstants);Culture=$(Cultures) - $(DefineConstants);MajorVersion=$(AspNetCoreMajorVersion) - $(DefineConstants);MinorVersion=$(AspNetCoreMinorVersion) - $(DefineConstants);PackageVersion=$(PackageVersion) diff --git a/src/Installers/Windows/Wix.targets b/src/Installers/Windows/Wix.targets index c84993bb7d..ce8b898299 100644 --- a/src/Installers/Windows/Wix.targets +++ b/src/Installers/Windows/Wix.targets @@ -1,4 +1,19 @@ + + + + $(AspNetCoreMajorVersion).$(AspNetCoreMinorVersion).$(AspNetCorePatchVersion).0 + + <_FileRevisionVersion>$(VersionSuffixDateStamp) + <_FileRevisionVersion Condition=" '$(_FileRevisionVersion)' == '' ">42424 + $(AspNetCoreMajorVersion).$(AspNetCoreMinorVersion).$(AspNetCorePatchVersion).$(_FileRevisionVersion) + + $(DefineConstants);MajorVersion=$(AspNetCoreMajorVersion) + $(DefineConstants);MinorVersion=$(AspNetCoreMinorVersion) + $(DefineConstants);Version=$(Version) + $(DefineConstants);PackageVersion=$(PackageVersion) + + $(ProductName) Microsoft.$(ProductNameShort)_$(Platform)_$(Lang),v$(PackageVersion) @@ -7,7 +22,6 @@ $(Version);$(Platform) - $(GuidInputs);$(BuildNumberSuffix) @@ -44,10 +58,14 @@ + + + + - + <_cabs Include="$(TargetDir)**/*.cab" /> diff --git a/src/Middleware/build.cmd b/src/Middleware/build.cmd index 033fe6f614..2406296662 100644 --- a/src/Middleware/build.cmd +++ b/src/Middleware/build.cmd @@ -1,3 +1,3 @@ @ECHO OFF SET RepoRoot=%~dp0..\.. -%RepoRoot%\build.cmd -projects %~dp0\**\*.*proj %* +%RepoRoot%\build.cmd -projects %~dp0**\*.*proj %* diff --git a/src/MusicStore/build.cmd b/src/MusicStore/build.cmd index 033fe6f614..2406296662 100644 --- a/src/MusicStore/build.cmd +++ b/src/MusicStore/build.cmd @@ -1,3 +1,3 @@ @ECHO OFF SET RepoRoot=%~dp0..\.. -%RepoRoot%\build.cmd -projects %~dp0\**\*.*proj %* +%RepoRoot%\build.cmd -projects %~dp0**\*.*proj %* diff --git a/src/MusicStore/test/MusicStore.E2ETests/MusicStore.E2ETests.csproj b/src/MusicStore/test/MusicStore.E2ETests/MusicStore.E2ETests.csproj index affbb20ef3..60d9f5a6b3 100644 --- a/src/MusicStore/test/MusicStore.E2ETests/MusicStore.E2ETests.csproj +++ b/src/MusicStore/test/MusicStore.E2ETests/MusicStore.E2ETests.csproj @@ -9,9 +9,10 @@ $(WarningsNotAsErrors);xUnit1004 $(NoWarn);NU1605 + + true false - false false false @@ -22,10 +23,11 @@ + + - diff --git a/src/Mvc/Extensions.ApiDescription.Client/src/Microsoft.Extensions.ApiDescription.Client.csproj b/src/Mvc/Extensions.ApiDescription.Client/src/Microsoft.Extensions.ApiDescription.Client.csproj index 2029ac0a25..c7eb528154 100644 --- a/src/Mvc/Extensions.ApiDescription.Client/src/Microsoft.Extensions.ApiDescription.Client.csproj +++ b/src/Mvc/Extensions.ApiDescription.Client/src/Microsoft.Extensions.ApiDescription.Client.csproj @@ -1,24 +1,16 @@  - - $(GenerateNuspecDependsOn);PopulateNuspec - true MSBuild tasks and targets for code generation false - false $(MSBuildProjectName).nuspec $(MSBuildProjectName) Build Tasks;MSBuild;Swagger;Open API;code generation; Web API client true - $(ExperimentalPackageVersion) - netstandard2.0;net461 - false $(ExperimentalVersionPrefix) - $(ExperimentalVersionSuffix) - + netstandard2.0;net461 false @@ -26,24 +18,8 @@ - - - - id=$(PackageId); - authors=$(Authors); - baseOutputPath=$(BaseOutputPath); - configuration=$(Configuration); - copyright=$(Copyright); - description=$(PackageDescription); - iconUrl=$(PackageIconUrl); - licenseUrl=$(PackageLicenseUrl); - owners=$(Company); - projectUrl=$(PackageProjectUrl); - repositoryCommit=$(SourceRevisionId); - repositoryUrl=$(RepositoryUrl); - tags=$(PackageTags.Replace(';', ' ')); - version=$(PackageVersion); - - - + + + + diff --git a/src/Mvc/Extensions.ApiDescription.Client/src/Microsoft.Extensions.ApiDescription.Client.nuspec b/src/Mvc/Extensions.ApiDescription.Client/src/Microsoft.Extensions.ApiDescription.Client.nuspec index cc49fd1c56..ec5b1d5ffc 100644 --- a/src/Mvc/Extensions.ApiDescription.Client/src/Microsoft.Extensions.ApiDescription.Client.nuspec +++ b/src/Mvc/Extensions.ApiDescription.Client/src/Microsoft.Extensions.ApiDescription.Client.nuspec @@ -1,19 +1,7 @@  - $id$ - $authors$ - $copyright$ - $description$ - true - $iconUrl$ - $licenseUrl$ - $owners$ - $projectUrl$ - - true - $tags$ - $version$ + $CommonMetadataElements$ diff --git a/src/Mvc/Extensions.ApiDescription.Server/src/Microsoft.Extensions.ApiDescription.Server.csproj b/src/Mvc/Extensions.ApiDescription.Server/src/Microsoft.Extensions.ApiDescription.Server.csproj index 0c1c607c1b..df891977dd 100644 --- a/src/Mvc/Extensions.ApiDescription.Server/src/Microsoft.Extensions.ApiDescription.Server.csproj +++ b/src/Mvc/Extensions.ApiDescription.Server/src/Microsoft.Extensions.ApiDescription.Server.csproj @@ -2,28 +2,17 @@ - - $(GenerateNuspecDependsOn);PopulateNuspec - - - true - netcoreapp2.1;net461 MSBuild tasks and targets for build-time Swagger and OpenApi document generation true - false false - false $(MSBuildProjectName).nuspec $(MSBuildProjectName) MSBuild;Swagger;Open API;code generation;Web API true $(ExperimentalPackageVersion) - false - $(ExperimentalVersionPrefix) - $(ExperimentalVersionSuffix) @@ -31,30 +20,16 @@ - + + + + + + - - - - id=$(PackageId); - artifactsBinDir=$(ArtifactsBinDir); - authors=$(Authors); - configuration=$(Configuration); - copyright=$(Copyright); - description=$(PackageDescription); - iconUrl=$(PackageIconUrl); - licenseUrl=$(PackageLicenseUrl); - owners=$(Company); - projectUrl=$(PackageProjectUrl); - repositoryCommit=$(SourceRevisionId); - repositoryUrl=$(RepositoryUrl); - tags=$(PackageTags.Replace(';', ' ')); - version=$(PackageVersion); - - diff --git a/src/Mvc/Extensions.ApiDescription.Server/src/Microsoft.Extensions.ApiDescription.Server.nuspec b/src/Mvc/Extensions.ApiDescription.Server/src/Microsoft.Extensions.ApiDescription.Server.nuspec index 09156d804e..255b04ba8b 100644 --- a/src/Mvc/Extensions.ApiDescription.Server/src/Microsoft.Extensions.ApiDescription.Server.nuspec +++ b/src/Mvc/Extensions.ApiDescription.Server/src/Microsoft.Extensions.ApiDescription.Server.nuspec @@ -1,19 +1,7 @@  - $id$ - $authors$ - $copyright$ - $description$ - true - $iconUrl$ - $licenseUrl$ - $owners$ - $projectUrl$ - - true - $tags$ - $version$ + $CommonMetadataElements$ diff --git a/src/Mvc/GetDocumentInsider/src/GetDocumentInsider.csproj b/src/Mvc/GetDocumentInsider/src/GetDocumentInsider.csproj index 204fd6580a..57732f4774 100644 --- a/src/Mvc/GetDocumentInsider/src/GetDocumentInsider.csproj +++ b/src/Mvc/GetDocumentInsider/src/GetDocumentInsider.csproj @@ -7,9 +7,7 @@ Exe Microsoft.Extensions.ApiDescription.Tool netcoreapp2.1;net461 - false $(ExperimentalVersionPrefix) - $(ExperimentalVersionSuffix) diff --git a/src/Mvc/Mvc.Analyzers/src/Microsoft.AspNetCore.Mvc.Analyzers.csproj b/src/Mvc/Mvc.Analyzers/src/Microsoft.AspNetCore.Mvc.Analyzers.csproj index d3422ae192..2d40742e3a 100644 --- a/src/Mvc/Mvc.Analyzers/src/Microsoft.AspNetCore.Mvc.Analyzers.csproj +++ b/src/Mvc/Mvc.Analyzers/src/Microsoft.AspNetCore.Mvc.Analyzers.csproj @@ -17,26 +17,9 @@ - - - - - id=$(PackageId); - version=$(PackageVersion); - authors=$(Authors); - description=$(Description); - tags=$(PackageTags.Replace(';', ' ')); - licenseUrl=$(PackageLicenseUrl); - projectUrl=$(PackageProjectUrl); - iconUrl=$(PackageIconUrl); - repositoryUrl=$(RepositoryUrl); - repositoryCommit=$(SourceRevisionId); - copyright=$(Copyright); - - OutputBinary=$(OutputPath)$(AssemblyName).dll; - OutputSymbol=$(OutputPath)$(AssemblyName).pdb; - - - + + + + diff --git a/src/Mvc/Mvc.Analyzers/src/Microsoft.AspNetCore.Mvc.Analyzers.nuspec b/src/Mvc/Mvc.Analyzers/src/Microsoft.AspNetCore.Mvc.Analyzers.nuspec index 5f9d436f73..f906ece217 100644 --- a/src/Mvc/Mvc.Analyzers/src/Microsoft.AspNetCore.Mvc.Analyzers.nuspec +++ b/src/Mvc/Mvc.Analyzers/src/Microsoft.AspNetCore.Mvc.Analyzers.nuspec @@ -1,20 +1,7 @@  - $id$ - $version$ - $authors$ - true - $licenseUrl$ - $projectUrl$ - $iconUrl$ - $description$ - $copyright$ - $tags$ - - - - + $CommonMetadataElements$ diff --git a/src/Mvc/Mvc.Api.Analyzers/src/Microsoft.AspNetCore.Mvc.Api.Analyzers.csproj b/src/Mvc/Mvc.Api.Analyzers/src/Microsoft.AspNetCore.Mvc.Api.Analyzers.csproj index d827140aad..9f01dcb88c 100644 --- a/src/Mvc/Mvc.Api.Analyzers/src/Microsoft.AspNetCore.Mvc.Api.Analyzers.csproj +++ b/src/Mvc/Mvc.Api.Analyzers/src/Microsoft.AspNetCore.Mvc.Api.Analyzers.csproj @@ -22,26 +22,9 @@ - - - - - id=$(PackageId); - version=$(PackageVersion); - authors=$(Authors); - description=$(Description); - tags=$(PackageTags.Replace(';', ' ')); - licenseUrl=$(PackageLicenseUrl); - projectUrl=$(PackageProjectUrl); - iconUrl=$(PackageIconUrl); - repositoryUrl=$(RepositoryUrl); - repositoryCommit=$(SourceRevisionId); - copyright=$(Copyright); - - OutputBinary=$(OutputPath)$(AssemblyName).dll; - OutputSymbol=$(OutputPath)$(AssemblyName).pdb; - - - + + + + diff --git a/src/Mvc/Mvc.Api.Analyzers/src/Microsoft.AspNetCore.Mvc.Api.Analyzers.nuspec b/src/Mvc/Mvc.Api.Analyzers/src/Microsoft.AspNetCore.Mvc.Api.Analyzers.nuspec index 5f9d436f73..f906ece217 100644 --- a/src/Mvc/Mvc.Api.Analyzers/src/Microsoft.AspNetCore.Mvc.Api.Analyzers.nuspec +++ b/src/Mvc/Mvc.Api.Analyzers/src/Microsoft.AspNetCore.Mvc.Api.Analyzers.nuspec @@ -1,20 +1,7 @@  - $id$ - $version$ - $authors$ - true - $licenseUrl$ - $projectUrl$ - $iconUrl$ - $description$ - $copyright$ - $tags$ - - - - + $CommonMetadataElements$ diff --git a/src/Mvc/build.cmd b/src/Mvc/build.cmd index 033fe6f614..2406296662 100644 --- a/src/Mvc/build.cmd +++ b/src/Mvc/build.cmd @@ -1,3 +1,3 @@ @ECHO OFF SET RepoRoot=%~dp0..\.. -%RepoRoot%\build.cmd -projects %~dp0\**\*.*proj %* +%RepoRoot%\build.cmd -projects %~dp0**\*.*proj %* diff --git a/src/Mvc/dotnet-getdocument/src/dotnet-getdocument.csproj b/src/Mvc/dotnet-getdocument/src/dotnet-getdocument.csproj index 193eeeae69..dfe94dc2b9 100644 --- a/src/Mvc/dotnet-getdocument/src/dotnet-getdocument.csproj +++ b/src/Mvc/dotnet-getdocument/src/dotnet-getdocument.csproj @@ -8,9 +8,7 @@ Microsoft.Extensions.ApiDescription.Tool netcoreapp2.1 false - false $(ExperimentalVersionPrefix) - $(ExperimentalVersionSuffix) diff --git a/src/ProjectTemplates/Directory.Build.targets b/src/ProjectTemplates/Directory.Build.targets index 881ddd2bc2..cc70462998 100644 --- a/src/ProjectTemplates/Directory.Build.targets +++ b/src/ProjectTemplates/Directory.Build.targets @@ -1,6 +1,12 @@ + + $(Description) + +To install the templates in this package, run 'dotnet new --install $(PackageId)::$(PackageVersion)'. + + + - diff --git a/src/ProjectTemplates/GenerateContent.targets b/src/ProjectTemplates/GenerateContent.targets index 33ca50461e..0de73148b3 100644 --- a/src/ProjectTemplates/GenerateContent.targets +++ b/src/ProjectTemplates/GenerateContent.targets @@ -42,13 +42,13 @@ Inputs="$(MSBuildAllProjects);$(_GenerateContentPropertiesHashFile);@(GeneratedContent)" Outputs="@(GeneratedContent->'%(OutputPath)')"> - - + diff --git a/src/ProjectTemplates/SetPackageProperties.targets b/src/ProjectTemplates/SetPackageProperties.targets deleted file mode 100644 index d093116514..0000000000 --- a/src/ProjectTemplates/SetPackageProperties.targets +++ /dev/null @@ -1,21 +0,0 @@ - - - - - $(NuspecProperties); - id=$(PackageId); - version=$(PackageVersion); - licenseUrl=$(PackageLicenseUrl); - iconUrl=$(PackageIconUrl); - description=$(Description); - author=$(Authors); - copyright=$(Copyright); - tags=$(PackageTags.Replace(';', ' ')); - projectUrl=$(PackageProjectUrl); - repositoryUrl=$(RepositoryUrl); - repositoryType=$(RepositoryType); - repositoryCommit=$(SourceRevisionId); - - - - diff --git a/src/ProjectTemplates/TemplateProjects.props b/src/ProjectTemplates/TemplateProjects.props index 8252226702..8cfab01c93 100644 --- a/src/ProjectTemplates/TemplateProjects.props +++ b/src/ProjectTemplates/TemplateProjects.props @@ -4,12 +4,10 @@ False False False - false false $(NoWarn);2008;8021 aspnet;templates $(MSBuildThisFileDirectory)templates.nuspec - $(MSBuildProjectDirectory) false false diff --git a/src/ProjectTemplates/Web.Client.ItemTemplates/Microsoft.DotNet.Web.Client.ItemTemplates.csproj b/src/ProjectTemplates/Web.Client.ItemTemplates/Microsoft.DotNet.Web.Client.ItemTemplates.csproj index 1b409ca7ec..52eb42650a 100644 --- a/src/ProjectTemplates/Web.Client.ItemTemplates/Microsoft.DotNet.Web.Client.ItemTemplates.csproj +++ b/src/ProjectTemplates/Web.Client.ItemTemplates/Microsoft.DotNet.Web.Client.ItemTemplates.csproj @@ -2,10 +2,7 @@ netcoreapp3.0 - Web Client-Side File Templates for Microsoft Template Engine - - To install the templates in this package, run 'dotnet new --install $(PackageId)::$(PackageVersion)'. - + Web Client-Side File Templates for Microsoft Template Engine true diff --git a/src/ProjectTemplates/Web.ItemTemplates/Microsoft.DotNet.Web.ItemTemplates.csproj b/src/ProjectTemplates/Web.ItemTemplates/Microsoft.DotNet.Web.ItemTemplates.csproj index b274d5c506..4a62d6306b 100644 --- a/src/ProjectTemplates/Web.ItemTemplates/Microsoft.DotNet.Web.ItemTemplates.csproj +++ b/src/ProjectTemplates/Web.ItemTemplates/Microsoft.DotNet.Web.ItemTemplates.csproj @@ -2,9 +2,7 @@ netcoreapp3.0 - Web File Templates for Microsoft Template Engine - - To install the templates in this package, run 'dotnet new --install $(PackageId)::$(PackageVersion)'. + Web File Templates for Microsoft Template Engine. true diff --git a/src/ProjectTemplates/Web.ProjectTemplates/Microsoft.DotNet.Web.ProjectTemplates.csproj b/src/ProjectTemplates/Web.ProjectTemplates/Microsoft.DotNet.Web.ProjectTemplates.csproj index d32b7e75d4..1378977d6e 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/Microsoft.DotNet.Web.ProjectTemplates.csproj +++ b/src/ProjectTemplates/Web.ProjectTemplates/Microsoft.DotNet.Web.ProjectTemplates.csproj @@ -3,9 +3,7 @@ netcoreapp3.0 Microsoft.DotNet.Web.ProjectTemplates.$(AspNetCoreMajorVersion).$(AspNetCoreMinorVersion) - ASP.NET Core Web Template Pack for Microsoft Template Engine - - To install the templates in this package, run 'dotnet new --install $(PackageId)::$(PackageVersion)'. + ASP.NET Core Web Template Pack for Microsoft Template Engine true 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 5929c7cf68..dde6aec5f8 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 @@ -2,9 +2,7 @@ netcoreapp3.0 - Single Page Application templates for ASP.NET Core - - To install the templates in this package, run 'dotnet new --install $(PackageId)::$(PackageVersion)'. + Single Page Application templates for ASP.NET Core $(PackageTags);spa true diff --git a/src/ProjectTemplates/build.cmd b/src/ProjectTemplates/build.cmd index bf38370326..ee8a076876 100644 --- a/src/ProjectTemplates/build.cmd +++ b/src/ProjectTemplates/build.cmd @@ -1,3 +1,3 @@ @ECHO OFF SET RepoRoot=%~dp0..\.. -%RepoRoot%\build.cmd -projects %~dp0\**\*.*proj -pack /t:BuildSharedFx /t:Build %* +%RepoRoot%\build.cmd -projects %~dp0**\*.*proj -pack /t:BuildSharedFx /t:Build %* diff --git a/src/ProjectTemplates/templates.nuspec b/src/ProjectTemplates/templates.nuspec index da8ee99dee..8e85ee528c 100644 --- a/src/ProjectTemplates/templates.nuspec +++ b/src/ProjectTemplates/templates.nuspec @@ -1,18 +1,7 @@ - $id$ - $version$ - $author$ - $description$ - $iconUrl$ - en-US - true - $projectUrl$ - $licenseUrl$ - $copyright$ - $tags$ - + $CommonMetadataElements$ diff --git a/src/ProjectTemplates/test/Infrastructure/GenerateTestProps.targets b/src/ProjectTemplates/test/Infrastructure/GenerateTestProps.targets index 83e1baef26..cdad73166b 100644 --- a/src/ProjectTemplates/test/Infrastructure/GenerateTestProps.targets +++ b/src/ProjectTemplates/test/Infrastructure/GenerateTestProps.targets @@ -15,7 +15,7 @@ - diff --git a/src/ProjectTemplates/test/ProjectTemplates.Tests.csproj b/src/ProjectTemplates/test/ProjectTemplates.Tests.csproj index d15066f390..b0bfda0a57 100644 --- a/src/ProjectTemplates/test/ProjectTemplates.Tests.csproj +++ b/src/ProjectTemplates/test/ProjectTemplates.Tests.csproj @@ -116,12 +116,12 @@ - - diff --git a/src/Razor/build.cmd b/src/Razor/build.cmd index 033fe6f614..2406296662 100644 --- a/src/Razor/build.cmd +++ b/src/Razor/build.cmd @@ -1,3 +1,3 @@ @ECHO OFF SET RepoRoot=%~dp0..\.. -%RepoRoot%\build.cmd -projects %~dp0\**\*.*proj %* +%RepoRoot%\build.cmd -projects %~dp0**\*.*proj %* diff --git a/src/Security/Authentication/Negotiate/test/Negotiate.FunctionalTest/Microsoft.AspNetCore.Authentication.Negotiate.FunctionalTest.csproj b/src/Security/Authentication/Negotiate/test/Negotiate.FunctionalTest/Microsoft.AspNetCore.Authentication.Negotiate.FunctionalTest.csproj index 24c387964f..8e46d6c9a4 100644 --- a/src/Security/Authentication/Negotiate/test/Negotiate.FunctionalTest/Microsoft.AspNetCore.Authentication.Negotiate.FunctionalTest.csproj +++ b/src/Security/Authentication/Negotiate/test/Negotiate.FunctionalTest/Microsoft.AspNetCore.Authentication.Negotiate.FunctionalTest.csproj @@ -1,8 +1,10 @@  - netcoreapp3.0 - true + netcoreapp3.0 + true + + false diff --git a/src/Servers/HttpSys/build.cmd b/src/Servers/HttpSys/build.cmd index bc82307787..3d2fb28db5 100644 --- a/src/Servers/HttpSys/build.cmd +++ b/src/Servers/HttpSys/build.cmd @@ -1,3 +1,3 @@ @ECHO OFF SET RepoRoot=%~dp0..\..\.. -%RepoRoot%\build.cmd -projects %~dp0\**\*.*proj %* +%RepoRoot%\build.cmd -projects %~dp0**\*.*proj %* diff --git a/src/Servers/IIS/AspNetCoreModuleV2/CommonLibTests/CommonLibTests.vcxproj b/src/Servers/IIS/AspNetCoreModuleV2/CommonLibTests/CommonLibTests.vcxproj index 7268908ebd..091a99e221 100644 --- a/src/Servers/IIS/AspNetCoreModuleV2/CommonLibTests/CommonLibTests.vcxproj +++ b/src/Servers/IIS/AspNetCoreModuleV2/CommonLibTests/CommonLibTests.vcxproj @@ -24,6 +24,8 @@ Application v142 Unicode + true + true @@ -183,7 +185,4 @@ - - true - - \ No newline at end of file + diff --git a/src/Servers/IIS/IIS/test/IIS.FunctionalTests/IIS.FunctionalTests.csproj b/src/Servers/IIS/IIS/test/IIS.FunctionalTests/IIS.FunctionalTests.csproj index 2ecd5ba424..d7d6ba4fc5 100644 --- a/src/Servers/IIS/IIS/test/IIS.FunctionalTests/IIS.FunctionalTests.csproj +++ b/src/Servers/IIS/IIS/test/IIS.FunctionalTests/IIS.FunctionalTests.csproj @@ -11,8 +11,7 @@ - - + False diff --git a/src/Servers/IIS/IIS/test/IIS.NewHandler.FunctionalTests/IIS.NewHandler.FunctionalTests.csproj b/src/Servers/IIS/IIS/test/IIS.NewHandler.FunctionalTests/IIS.NewHandler.FunctionalTests.csproj index f57d292b78..8720dcd37c 100644 --- a/src/Servers/IIS/IIS/test/IIS.NewHandler.FunctionalTests/IIS.NewHandler.FunctionalTests.csproj +++ b/src/Servers/IIS/IIS/test/IIS.NewHandler.FunctionalTests/IIS.NewHandler.FunctionalTests.csproj @@ -15,7 +15,7 @@ - + False diff --git a/src/Servers/IIS/IIS/test/IIS.NewShim.FunctionalTests/IIS.NewShim.FunctionalTests.csproj b/src/Servers/IIS/IIS/test/IIS.NewShim.FunctionalTests/IIS.NewShim.FunctionalTests.csproj index c79cd88ed3..67b66fdea0 100644 --- a/src/Servers/IIS/IIS/test/IIS.NewShim.FunctionalTests/IIS.NewShim.FunctionalTests.csproj +++ b/src/Servers/IIS/IIS/test/IIS.NewShim.FunctionalTests/IIS.NewShim.FunctionalTests.csproj @@ -10,7 +10,7 @@ - + diff --git a/src/Servers/IIS/IIS/test/IIS.Tests/IIS.Tests.csproj b/src/Servers/IIS/IIS/test/IIS.Tests/IIS.Tests.csproj index 11b1a3b784..cb9fc52dc1 100644 --- a/src/Servers/IIS/IIS/test/IIS.Tests/IIS.Tests.csproj +++ b/src/Servers/IIS/IIS/test/IIS.Tests/IIS.Tests.csproj @@ -10,7 +10,7 @@ - + diff --git a/src/Servers/IIS/IIS/test/IISExpress.FunctionalTests/IISExpress.FunctionalTests.csproj b/src/Servers/IIS/IIS/test/IISExpress.FunctionalTests/IISExpress.FunctionalTests.csproj index 1ddfecfad5..77d557ad87 100644 --- a/src/Servers/IIS/IIS/test/IISExpress.FunctionalTests/IISExpress.FunctionalTests.csproj +++ b/src/Servers/IIS/IIS/test/IISExpress.FunctionalTests/IISExpress.FunctionalTests.csproj @@ -12,7 +12,7 @@ - + diff --git a/src/Servers/IIS/IIS/test/Common.Tests/Utilities/DisposableList.cs b/src/Servers/IIS/IIS/test/testassets/IIS.Common.TestLib/DisposableList.cs similarity index 100% rename from src/Servers/IIS/IIS/test/Common.Tests/Utilities/DisposableList.cs rename to src/Servers/IIS/IIS/test/testassets/IIS.Common.TestLib/DisposableList.cs diff --git a/src/Servers/IIS/IIS/test/Common.Tests/Common.Tests.csproj b/src/Servers/IIS/IIS/test/testassets/IIS.Common.TestLib/IIS.Common.TestLib.csproj similarity index 83% rename from src/Servers/IIS/IIS/test/Common.Tests/Common.Tests.csproj rename to src/Servers/IIS/IIS/test/testassets/IIS.Common.TestLib/IIS.Common.TestLib.csproj index 371d843931..593ef0fbed 100644 --- a/src/Servers/IIS/IIS/test/Common.Tests/Common.Tests.csproj +++ b/src/Servers/IIS/IIS/test/testassets/IIS.Common.TestLib/IIS.Common.TestLib.csproj @@ -2,8 +2,6 @@ netcoreapp3.0 - false - false diff --git a/src/Servers/IIS/IIS/test/Common.Tests/Utilities/TestConnections.cs b/src/Servers/IIS/IIS/test/testassets/IIS.Common.TestLib/TestConnections.cs similarity index 100% rename from src/Servers/IIS/IIS/test/Common.Tests/Utilities/TestConnections.cs rename to src/Servers/IIS/IIS/test/testassets/IIS.Common.TestLib/TestConnections.cs diff --git a/src/Servers/IIS/IIS/test/Common.Tests/Utilities/TimeoutExtensions.cs b/src/Servers/IIS/IIS/test/testassets/IIS.Common.TestLib/TimeoutExtensions.cs similarity index 100% rename from src/Servers/IIS/IIS/test/Common.Tests/Utilities/TimeoutExtensions.cs rename to src/Servers/IIS/IIS/test/testassets/IIS.Common.TestLib/TimeoutExtensions.cs diff --git a/src/Servers/IIS/IISIntegration.sln b/src/Servers/IIS/IISIntegration.sln index 1d01090d51..6fad267841 100644 --- a/src/Servers/IIS/IISIntegration.sln +++ b/src/Servers/IIS/IISIntegration.sln @@ -61,7 +61,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IIS.FunctionalTests", "IIS\ EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IIS.Tests", "IIS\test\IIS.Tests\IIS.Tests.csproj", "{C0310D84-BC2F-4B2E-870E-D35044DB3E3E}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Common.Tests", "IIS\test\Common.Tests\Common.Tests.csproj", "{D17B7B35-5361-4A50-B499-E03E5C3CC095}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IIS.Common.TestLib", "IIS\test\testassets\IIS.Common.TestLib\IIS.Common.TestLib.csproj", "{D17B7B35-5361-4A50-B499-E03E5C3CC095}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IIS.NewHandler.FunctionalTests", "IIS\test\IIS.NewHandler.FunctionalTests\IIS.NewHandler.FunctionalTests.csproj", "{582B07BC-73F4-4689-8557-B039298BD82C}" EndProject diff --git a/src/Servers/IIS/build.cmd b/src/Servers/IIS/build.cmd index 92e8622e3a..27c6a00d21 100644 --- a/src/Servers/IIS/build.cmd +++ b/src/Servers/IIS/build.cmd @@ -1,3 +1,3 @@ @ECHO OFF SET RepoRoot=%~dp0..\..\.. -%RepoRoot%\build.cmd -projects %~dp0\**\*.csproj %* +%RepoRoot%\build.cmd -projects %~dp0**\*.csproj %* diff --git a/src/Servers/IIS/build/testsite.props b/src/Servers/IIS/build/testsite.props index d130ec70f8..066f50aca8 100644 --- a/src/Servers/IIS/build/testsite.props +++ b/src/Servers/IIS/build/testsite.props @@ -33,7 +33,8 @@ aspnetcorev2_inprocess.dll - $(RepoRoot).dotnet\$(NativePlatform)\dotnet.exe + $(RepoRoot).dotnet\dotnet.exe + $(RepoRoot).dotnet\$(NativePlatform)\dotnet.exe diff --git a/src/Servers/Kestrel/build.cmd b/src/Servers/Kestrel/build.cmd index bc82307787..3d2fb28db5 100644 --- a/src/Servers/Kestrel/build.cmd +++ b/src/Servers/Kestrel/build.cmd @@ -1,3 +1,3 @@ @ECHO OFF SET RepoRoot=%~dp0..\..\.. -%RepoRoot%\build.cmd -projects %~dp0\**\*.*proj %* +%RepoRoot%\build.cmd -projects %~dp0**\*.*proj %* diff --git a/src/Servers/build.cmd b/src/Servers/build.cmd index 033fe6f614..2406296662 100644 --- a/src/Servers/build.cmd +++ b/src/Servers/build.cmd @@ -1,3 +1,3 @@ @ECHO OFF SET RepoRoot=%~dp0..\.. -%RepoRoot%\build.cmd -projects %~dp0\**\*.*proj %* +%RepoRoot%\build.cmd -projects %~dp0**\*.*proj %* diff --git a/src/Servers/test/FunctionalTests/Directory.Build.props b/src/Servers/test/FunctionalTests/Directory.Build.props deleted file mode 100644 index 248876a269..0000000000 --- a/src/Servers/test/FunctionalTests/Directory.Build.props +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/src/SignalR/Directory.Build.props b/src/SignalR/Directory.Build.props index 779b7efc95..6269827f53 100644 --- a/src/SignalR/Directory.Build.props +++ b/src/SignalR/Directory.Build.props @@ -19,7 +19,4 @@ - - - diff --git a/src/SignalR/SignalR.sln b/src/SignalR/SignalR.sln index 1da004b371..7a23e78130 100644 --- a/src/SignalR/SignalR.sln +++ b/src/SignalR/SignalR.sln @@ -15,7 +15,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebSocketSample", "samples\ EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JwtClientSample", "samples\JwtClientSample\JwtClientSample.csproj", "{1A953296-E869-4DE2-A693-FD5FCDE27057}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SignalR.Client.FunctionalTests", "clients\ts\FunctionalTests\SignalR.Client.FunctionalTests.csproj", "{D0C7B22E-B0B6-4D62-BF7D-79EE4AAF1981}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SignalR.Client.FunctionalTestApp", "clients\ts\FunctionalTests\SignalR.Client.FunctionalTestApp.csproj", "{D0C7B22E-B0B6-4D62-BF7D-79EE4AAF1981}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Hosting", "..\Hosting\Hosting\src\Microsoft.AspNetCore.Hosting.csproj", "{3AC35C9A-3344-4BBB-B789-06CEE2CD093E}" EndProject diff --git a/src/SignalR/clients/java/signalr/signalr.client.java.javaproj b/src/SignalR/clients/java/signalr/signalr.client.java.javaproj index f68799cc1c..47fadd0659 100644 --- a/src/SignalR/clients/java/signalr/signalr.client.java.javaproj +++ b/src/SignalR/clients/java/signalr/signalr.client.java.javaproj @@ -11,8 +11,6 @@ true - - -PpackageVersion="$(PackageVersion)" $(GradleOptions) -Dorg.gradle.daemon=false @@ -53,4 +51,9 @@ + + + + -PpackageVersion="$(PackageVersion)" + diff --git a/src/SignalR/clients/ts/FunctionalTests/SignalR.Client.FunctionalTests.csproj b/src/SignalR/clients/ts/FunctionalTests/SignalR.Client.FunctionalTestApp.csproj similarity index 98% rename from src/SignalR/clients/ts/FunctionalTests/SignalR.Client.FunctionalTests.csproj rename to src/SignalR/clients/ts/FunctionalTests/SignalR.Client.FunctionalTestApp.csproj index b6aaa7f555..ef79bb301f 100644 --- a/src/SignalR/clients/ts/FunctionalTests/SignalR.Client.FunctionalTests.csproj +++ b/src/SignalR/clients/ts/FunctionalTests/SignalR.Client.FunctionalTestApp.csproj @@ -7,7 +7,6 @@ true - false diff --git a/src/SignalR/clients/ts/FunctionalTests/SignalR.Npm.FunctionalTests.npmproj b/src/SignalR/clients/ts/FunctionalTests/SignalR.Npm.FunctionalTests.npmproj index ad7dcd2675..aa0c322a68 100644 --- a/src/SignalR/clients/ts/FunctionalTests/SignalR.Npm.FunctionalTests.npmproj +++ b/src/SignalR/clients/ts/FunctionalTests/SignalR.Npm.FunctionalTests.npmproj @@ -11,7 +11,7 @@ - + diff --git a/src/SignalR/clients/ts/FunctionalTests/package.json b/src/SignalR/clients/ts/FunctionalTests/package.json index 758542b140..3b349de236 100644 --- a/src/SignalR/clients/ts/FunctionalTests/package.json +++ b/src/SignalR/clients/ts/FunctionalTests/package.json @@ -42,9 +42,9 @@ "build": "yarn run build:lint && yarn run build:webpack", "build:lint": "node ../common/node_modules/tslint/bin/tslint -c ../tslint.json -p ./tsconfig.json", "build:webpack": "node ../common/node_modules/webpack-cli/bin/cli.js", - "pretest": "yarn run build && dotnet build SignalR.Client.FunctionalTests.csproj", + "pretest": "yarn run build && dotnet build SignalR.Client.FunctionalTestApp.csproj", "test": "tsc --noEmit && yarn run test:local", - "test:inner": "yarn run build && dotnet build SignalR.Client.FunctionalTests.csproj && yarn run test:local", + "test:inner": "yarn run build && dotnet build SignalR.Client.FunctionalTestApp.csproj && yarn run test:local", "test:local": "yarn run pretest && ts-node --project ./scripts/tsconfig.json ./scripts/run-tests.ts", "test:all": "yarn run pretest && ts-node --project ./scripts/tsconfig.json ./scripts/run-tests.ts --all-browsers", "test:sauce": "yarn run pretest && ts-node --project ./scripts/tsconfig.json ./scripts/run-tests.ts --sauce", diff --git a/src/SignalR/clients/ts/FunctionalTests/scripts/run-tests.ts b/src/SignalR/clients/ts/FunctionalTests/scripts/run-tests.ts index a9b9b8a18b..ef1fe686c0 100644 --- a/src/SignalR/clients/ts/FunctionalTests/scripts/run-tests.ts +++ b/src/SignalR/clients/ts/FunctionalTests/scripts/run-tests.ts @@ -232,7 +232,7 @@ function runJest(httpsUrl: string, httpUrl: string) { (async () => { try { - const serverPath = path.resolve(ARTIFACTS_DIR, "bin", "SignalR.Client.FunctionalTests", configuration, "netcoreapp3.0", "SignalR.Client.FunctionalTests.dll"); + const serverPath = path.resolve(ARTIFACTS_DIR, "bin", "SignalR.Client.FunctionalTestApp", configuration, "netcoreapp3.0", "SignalR.Client.FunctionalTestApp.dll"); debug(`Launching Functional Test Server: ${serverPath}`); let desiredServerUrl = "https://127.0.0.1:0;http://127.0.0.1:0"; diff --git a/src/SignalR/docs/GettingStarted.md b/src/SignalR/docs/GettingStarted.md index f0111dc869..6366d71d00 100644 --- a/src/SignalR/docs/GettingStarted.md +++ b/src/SignalR/docs/GettingStarted.md @@ -16,7 +16,7 @@ If, after running `build.cmd` or `build.sh`, you did not get a successful build, Below are some tips for troubleshooting common issues. ### Project Load Failures in Visual Studio -In order to property load several of the projects in the solution, it is necessary that `%USERPROFILE%\.dotnet\x64` be in your `PATH` variable. If you experience issues loading projects in Visual Studio, please ensure that your `PATH` is configured correctly. +Use the `startvs.cmd` script to launch Visual Studio. ### NPM Errors Running `build.cmd` or `build.sh` immediately after installing NodeJS can cause an NPM error: `EPERM: operation not permitted, rename`. Executing the NPM command `npm cache clean` will fix this issue. diff --git a/src/SignalR/publish-apps.ps1 b/src/SignalR/publish-apps.ps1 index 7c5ea57101..112922b204 100644 --- a/src/SignalR/publish-apps.ps1 +++ b/src/SignalR/publish-apps.ps1 @@ -4,7 +4,7 @@ param($RootDirectory = (Get-Location), $Framework = "netcoreapp3.0", $Runtime = $RootDirectory = (Convert-Path $RootDirectory) # Find dotnet.exe -$dotnet = Join-Path (Join-Path (Join-Path $env:USERPROFILE ".dotnet") "x64") "dotnet.exe" +$dotnet = Join-Path (Join-Path $env:USERPROFILE ".dotnet") "dotnet.exe" if(!(Test-Path $dotnet)) { throw "Could not find dotnet at: $dotnet" @@ -20,7 +20,7 @@ $ClientsTsDir = Join-Path $ClientsDir "ts" # The list of apps to publish $Apps = @{ "SignalRSamples"= (Join-Path $SamplesDir "SignalRSamples") - "FunctionalTests"= (Join-Path $ClientsTsDir "FunctionalTests/SignalR.Client.FunctionalTests.csproj") + "FunctionalTests"= (Join-Path $ClientsTsDir "FunctionalTests/SignalR.Client.FunctionalTestApp.csproj") } $BuildMetadataContent = @" diff --git a/src/SignalR/server/Specification.Tests/src/Microsoft.AspNetCore.SignalR.Specification.Tests.csproj b/src/SignalR/server/Specification.Tests/src/Microsoft.AspNetCore.SignalR.Specification.Tests.csproj index 974540e8df..f0dcb08acc 100644 --- a/src/SignalR/server/Specification.Tests/src/Microsoft.AspNetCore.SignalR.Specification.Tests.csproj +++ b/src/SignalR/server/Specification.Tests/src/Microsoft.AspNetCore.SignalR.Specification.Tests.csproj @@ -4,7 +4,6 @@ Tests for users to verify their own implementations of SignalR types netcoreapp3.0 true - false false diff --git a/src/SiteExtensions/LoggingAggregate/src/Microsoft.AspNetCore.AzureAppServices.SiteExtension/Microsoft.AspNetCore.AzureAppServices.SiteExtension.csproj b/src/SiteExtensions/LoggingAggregate/src/Microsoft.AspNetCore.AzureAppServices.SiteExtension/Microsoft.AspNetCore.AzureAppServices.SiteExtension.csproj index 4b9fcec234..048270d951 100644 --- a/src/SiteExtensions/LoggingAggregate/src/Microsoft.AspNetCore.AzureAppServices.SiteExtension/Microsoft.AspNetCore.AzureAppServices.SiteExtension.csproj +++ b/src/SiteExtensions/LoggingAggregate/src/Microsoft.AspNetCore.AzureAppServices.SiteExtension/Microsoft.AspNetCore.AzureAppServices.SiteExtension.csproj @@ -11,7 +11,6 @@ true false false - false content true true diff --git a/src/SiteExtensions/LoggingAggregate/test/Directory.Build.props b/src/SiteExtensions/LoggingAggregate/test/Directory.Build.props deleted file mode 100644 index ab8bb76491..0000000000 --- a/src/SiteExtensions/LoggingAggregate/test/Directory.Build.props +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/src/SiteExtensions/LoggingBranch/Directory.Build.targets b/src/SiteExtensions/LoggingBranch/Directory.Build.targets index ea37d8fa42..bc9e13c2e2 100644 --- a/src/SiteExtensions/LoggingBranch/Directory.Build.targets +++ b/src/SiteExtensions/LoggingBranch/Directory.Build.targets @@ -2,6 +2,10 @@ + + $(PackageVersion) + + diff --git a/src/SiteExtensions/LoggingBranch/LoggingBranch.csproj b/src/SiteExtensions/LoggingBranch/LoggingBranch.csproj index e2e8ce34fc..37795d0ee4 100644 --- a/src/SiteExtensions/LoggingBranch/LoggingBranch.csproj +++ b/src/SiteExtensions/LoggingBranch/LoggingBranch.csproj @@ -9,7 +9,6 @@ aspnet;logging;aspnetcore;AzureSiteExtension;keyvault;configuration;dataprotection content Microsoft.AspNetCore.AzureAppServices.SiteExtension.$(TrimmedVersion).$(TargetArchitecture) - $(PackageVersion) $(MicrosoftNETCoreAppPackageVersion) net461 @@ -18,7 +17,6 @@ true false false - false content @@ -27,8 +25,6 @@ - - false true diff --git a/src/SiteExtensions/Sdk/SiteExtension.targets b/src/SiteExtensions/Sdk/SiteExtension.targets index 3ba8f01c60..677e122221 100644 --- a/src/SiteExtensions/Sdk/SiteExtension.targets +++ b/src/SiteExtensions/Sdk/SiteExtension.targets @@ -26,7 +26,6 @@ netcoreapp3.0 - diff --git a/src/Tools/dotnet-watch/test/Scenario/ProjectToolScenario.cs b/src/Tools/dotnet-watch/test/Scenario/ProjectToolScenario.cs index b5c064563b..7a0351dc0a 100644 --- a/src/Tools/dotnet-watch/test/Scenario/ProjectToolScenario.cs +++ b/src/Tools/dotnet-watch/test/Scenario/ProjectToolScenario.cs @@ -148,12 +148,10 @@ namespace Microsoft.DotNet.Watcher.Tools.FunctionalTests File.WriteAllText(Path.Combine(WorkFolder, "Directory.Build.props"), ""); var restoreSources = GetMetadata("TestSettings:RestoreSources"); - var frameworkVersion = GetMetadata("TestSettings:RuntimeFrameworkVersion"); var dbTargets = new XDocument( new XElement("Project", new XElement("PropertyGroup", - new XElement("RuntimeFrameworkVersion", frameworkVersion), new XElement("RestoreSources", restoreSources)))); dbTargets.Save(Path.Combine(WorkFolder, "Directory.Build.targets")); } diff --git a/src/Tools/dotnet-watch/test/dotnet-watch.Tests.csproj b/src/Tools/dotnet-watch/test/dotnet-watch.Tests.csproj index 69d005efeb..349e681dbf 100644 --- a/src/Tools/dotnet-watch/test/dotnet-watch.Tests.csproj +++ b/src/Tools/dotnet-watch/test/dotnet-watch.Tests.csproj @@ -22,10 +22,6 @@ <_Parameter1>TestSettings:RestoreSources <_Parameter2>$(RestoreSources) - - <_Parameter1>TestSettings:RuntimeFrameworkVersion - <_Parameter2>$(RuntimeFrameworkVersion) - diff --git a/startvs.cmd b/startvs.cmd index dd9c798c5b..0de7bb7d56 100644 --- a/startvs.cmd +++ b/startvs.cmd @@ -4,7 +4,8 @@ SETLOCAL :: This command launches a Visual Studio solution with environment variables required to use a local version of the .NET Core SDK. :: This tells .NET Core to use the same dotnet.exe that build scripts use -SET DOTNET_ROOT=%~dp0.dotnet\x64 +SET DOTNET_ROOT=%~dp0.dotnet +SET DOTNET_ROOT(x86)=%~dp0.dotnet\x86 :: This tells .NET Core not to go looking for .NET Core in other places SET DOTNET_MULTILEVEL_LOOKUP=0 diff --git a/version.props b/version.props deleted file mode 100644 index 6b10f69bdf..0000000000 --- a/version.props +++ /dev/null @@ -1,100 +0,0 @@ - - - 3 - 0 - 0 - 7 - preview$(PreReleasePreviewNumber) - Preview $(PreReleasePreviewNumber) - 0.3.$(AspNetCorePatchVersion) - 0.9.$(AspNetCorePatchVersion) - $(AspNetCoreMajorVersion).$(AspNetCoreMinorVersion) - $(AspNetCoreMajorVersion).$(AspNetCoreMinorVersion).$(AspNetCorePatchVersion) - - - 1$(AspNetCoreMajorVersion) - $(AspNetCoreMinorVersion) - $(AspNetCorePatchVersion) - - $(BUILD_BUILDNUMBER) - true - - - - - <_BuildNumber>$(OfficialBuildId) - - - <_BuildNumberYY>$(_BuildNumber.Substring(2, 2)) - <_BuildNumberMM>$(_BuildNumber.Substring(4, 2)) - <_BuildNumberDD>$(_BuildNumber.Substring(6, 2)) - <_BuildNumberR>$(_BuildNumber.Substring(9)) - - - <_BuildNumberShortDate>$([MSBuild]::Add($([MSBuild]::Add($([MSBuild]::Multiply($(_BuildNumberYY), 1000)), $([MSBuild]::Multiply($(_BuildNumberMM), 50)))), $(_BuildNumberDD))) - - $([System.Convert]::ToInt32($(_BuildNumberR))) - - $(_BuildNumberShortDate).$(VersionSuffixBuildOfTheDay) - - $(_BuildNumberShortDate) - $(PreReleaseLabel).$(BuildNumberSuffix) - - - - 0 - 42424 - dev - ci - - - - $(PreReleaseBrandingLabel) Build $(BuildNumberSuffix) - - - true - - false - true - false - - - $(VersionPrefix) - $(PackageBrandingVersion) $(BrandingVersionSuffix.Trim()) - - - $(VersionPrefix) - $(VersionPrefix)-$(VersionSuffix) - - Microsoft.AspNetCore.App - $(PackageVersion) - - Microsoft.AspNetCore.App.Ref - - $(VersionPrefix) - - $(AspNetCoreMajorVersion).$(AspNetCoreMinorVersion).0 - $(TargetingPackVersionPrefix) - $(TargetingPackVersionPrefix)-$(VersionSuffix) - - false - - - $(ExperimentalVersionPrefix) - $(ExperimentalVersionPrefix)-$(VersionSuffix) - - master - - - $(AspNetCoreMajorVersion).$(AspNetCoreMinorVersion).$([MSBuild]::Subtract($(AspNetCorePatchVersion), 1)) - - - - - - - - - - -