diff --git a/Directory.Build.props b/Directory.Build.props index c35fcb65ad..1d6f551e57 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,85 +1,23 @@ - false - <_SuppressSdkImports>true - Release + Release - - - - netstandard2.0 - - false - + - + false - - $(MSBuildThisFileDirectory) - $(ProjectDir)targets/ $(ProjectDir)keys/ - $([MSBuild]::EnsureTrailingSlash('$(CustomDotNetSdkDir)')) - $([MSBuild]::NormalizeDirectory('$(DOTNET_INSTALL_DIR)')) - $(ProjectDir).dotnet/ - $(DotNetCliToolDir)dotnet + $(ProjectDir)src/ $(ProjectDir)patches/ - - $(NETCoreSdkVersion) - $(MSBuildThisFileDirectory)eng/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/ - $(XPlatTasksDir)bin/$(Configuration)/ - $(XPlatTasksBinDir)Microsoft.DotNet.SourceBuild.Tasks.XPlat.dll - $(DotNetCliToolDir)sdk/$(SDK_VERSION)/ - - - - - false - - - - minimal - - - - false - + $([MSBuild]::NormalizePath('$(ArtifactsBinDir)', 'Microsoft.DotNet.SourceBuild.Tasks.XPlat', '$(Configuration)', '$(NetCurrent)', 'Microsoft.DotNet.SourceBuild.Tasks.XPlat.dll')) - - .cmd - .sh - .zip - .tar.gz - - - - $(ProjectDir)src/ - $(ProjectDir).gitmodules - - - - - $(ProjectDir)artifacts/ - $(ProjectDir)eng/ - - - - $(ArtifactsShippingPackagesDir) - $(BaseOutputPath)logs/ - - - - - $(BaseIntermediatePath)semaphores/ + minimal + false diff --git a/Directory.Build.targets b/Directory.Build.targets index 3eb8cfad18..f90f13fc36 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -1,5 +1,5 @@ - + diff --git a/build.sh b/build.sh index d6588ae304..b323632508 100755 --- a/build.sh +++ b/build.sh @@ -13,11 +13,4 @@ while [[ -h $source ]]; do done scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" - -sdkLine=$(grep -m 1 'dotnet' "$scriptroot/global.json") -sdkPattern="\"dotnet\" *: *\"(.*)\"" -if [[ $sdkLine =~ $sdkPattern ]]; then - export SDK_VERSION=${BASH_REMATCH[1]} -fi - "$scriptroot/eng/common/build.sh" --build --restore "$@" diff --git a/eng/Build.props b/eng/Build.props index 4e8e180227..5716ccfbba 100644 --- a/eng/Build.props +++ b/eng/Build.props @@ -1,9 +1,6 @@ - - false - diff --git a/eng/DotNetBuild.props b/eng/DotNetBuild.props index 87513e41ec..b45416dc81 100644 --- a/eng/DotNetBuild.props +++ b/eng/DotNetBuild.props @@ -1,16 +1,16 @@ - - source-build-externals - true + + false - - - - + + + + $(RepoRoot) + + diff --git a/eng/Versions.props b/eng/Versions.props index 9440c1c06f..3343bb24f1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,5 +1,4 @@ - - + 10 diff --git a/eng/git-clone-to-dir.sh b/eng/git-clone-to-dir.sh deleted file mode 100755 index 048c174577..0000000000 --- a/eng/git-clone-to-dir.sh +++ /dev/null @@ -1,138 +0,0 @@ -#!/usr/bin/env bash - -usage() { - echo "$0 [options]" - echo "Creates a git clone of into directory, optionally saving WIP changes." - echo "" - echo "Required:" - echo " --source (Required) The source Git directory." - echo " --dest (Required) The destination Git directory. Created if doesn't exist." - echo "" - echo "Optional:" - echo " --clean If dest directory already exists, delete it." - echo " --copy-wip Transfer most types of uncommitted change into the" - echo " destination directory. Useful for dev workflows." - echo " -h --help Print help and exit." -} - -# An alternative to "git clone" would be to use a "git worktree". Potential benefits: -# * This has more integration with the user's normal repo. If they make ad-hoc changes in the -# worktree, it is easy to cherry-pick onto the developer's "real" branch. -# * A worktree uses a '.git' file rather than a full '.git' directory, which might have storage -# implications. (However, a local clone's '.git' directory uses hard links to save space/time, -# so it's not certain that this affects performance at all.) -# -# Downside of worktrees: -# * Some configuration is set up in '.git/worktrees' which may be difficult to coordinate -# properly. In particular, if the user is already using worktrees for their own purposes, we -# would have to be careful that running source-build in one worktree doesn't interfere with -# source-build in the other worktree. - -set -euo pipefail - -while [[ $# > 0 ]]; do - opt="$(echo "$1" | tr "[:upper:]" "[:lower:]")" - case "$opt" in - -h|--help) - usage - exit 0 - ;; - --source) - sourceDir="$2" - shift - ;; - --dest) - destDir="$2" - shift - ;; - --clean) - clean=1 - ;; - --copy-wip) - copyWip=1 - ;; - *) - echo "Unrecognized option: $1" - echo "" - usage - exit 1 - ;; - esac - shift -done - -[ ! -d "${sourceDir:-}" ] && echo "--source not a directory: $sourceDir" && exit 1 - -[ ! "${destDir:-}" ] && echo "--dest not specified" && exit 1 - -echo "Cloning repository at '$sourceDir' to '$destDir'..." - -if [ -e "$destDir" ]; then - echo "Destination already exists!" - if [ -f "$destDir" ]; then - echo "Existing destination is a regular file, not a directory. This is unusual: aborting." - exit 1 - elif [ "${clean:-}" ]; then - echo "Clean is enabled: removing $destDir and continuing..." - rm -rf "$destDir" - else - echo "Clean is not enabled: aborting." - exit 1 - fi -fi - -if [ ! -e "$destDir" ]; then - mkdir -p "$destDir" - - if [ "${copyWip:-}" ]; then - # Copy over changes that haven't been committed, for dev inner loop. - # This gets changes (whether staged or not) but misses untracked files. - stashCommit=$(cd "$sourceDir"; git stash create) - - if [ "$stashCommit" ]; then - echo "WIP changes detected: created temporary stash $stashCommit to transfer to inner repository..." - else - echo "No WIP changes detected..." - fi - fi - - echo "Creating empty clone at: $destDir" - - sourceGitDir=$(cd "$sourceDir" && git rev-parse --git-dir) - shallowFile="$sourceGitDir/shallow" - - if [ -f "$shallowFile" ]; then - echo "Source repository is shallow..." - if [ "${stashCommit:-}" ]; then - echo "WIP stash is not supported in a shallow repository: aborting." - exit 1 - fi - - # If source repo is shallow, old versions of Git refuse to clone it to another directory. First, - # remove the 'shallow' file to trick Git into allowing the clone. - shallowContent=$(cat "$shallowFile") - rm "$shallowFile" - - # Then, run the clone: - # * 'depth=1' avoids encountering the leaf commit in the shallow repo that points to a parent - # that doesn't exist. (The commit marked "grafted".) Git would fail here, otherwise. - # * '--no-local' allows a shallow clone from a git dir on the same filesystem. This means the - # clone will not use hard links and takes up more space. However, since we're doing a shallow - # clone anyway, the difference is probably not significant. (This has not been measured.) - git clone --depth=1 --no-local --no-checkout "$sourceDir" "$destDir" - - # Put the 'shallow' file back so operations on the outer Git repo continue to work normally. - printf "%s" "$shallowContent" > "$shallowFile" - else - git clone --no-checkout "$sourceDir" "$destDir" - fi - - ( - cd "$destDir" - echo "Checking out sources..." - # If no changes were stashed, stashCommit is empty string, and this is a simple checkout. - git checkout ${stashCommit:-} - ) - - echo "Clone complete: $sourceDir -> $destDir" -fi diff --git a/eng/tasks/Directory.Build.props b/eng/tasks/Directory.Build.props deleted file mode 100644 index 98448e986d..0000000000 --- a/eng/tasks/Directory.Build.props +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - AnyCPU - - true - - - - - - - - - - diff --git a/eng/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/Microsoft.DotNet.SourceBuild.Tasks.XPlat.csproj b/eng/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/Microsoft.DotNet.SourceBuild.Tasks.XPlat.csproj index b73b383733..8717017a73 100644 --- a/eng/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/Microsoft.DotNet.SourceBuild.Tasks.XPlat.csproj +++ b/eng/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/Microsoft.DotNet.SourceBuild.Tasks.XPlat.csproj @@ -2,10 +2,7 @@ $(NetCurrent) - $(XPlatTasksBinDir) - - False @@ -13,14 +10,8 @@ - - - - - - diff --git a/eng/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/UpdateJson.cs b/eng/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/UpdateJson.cs index 9820e4af23..87d728b9a0 100644 --- a/eng/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/UpdateJson.cs +++ b/eng/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/UpdateJson.cs @@ -1,20 +1,13 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. -// See the LICENSE file in the project root for more information. - using System; using System.IO; using System.Linq; -using Newtonsoft.Json; -using Newtonsoft.Json.Linq; +using System.Text.Json; +using System.Text.Json.Nodes; using Microsoft.Build.Framework; using Microsoft.Build.Utilities; namespace Microsoft.DotNet.Build.Tasks { - // Takes a path to a path to a json file and a - // string that represents a dotted path to an attribute - // and updates that attribute with the new value provided. public class UpdateJson : Task { [Required] @@ -30,23 +23,26 @@ public class UpdateJson : Task public override bool Execute() { - JObject jsonObj = JObject.Parse(File.ReadAllText(JsonFilePath)); + string jsonText = File.ReadAllText(JsonFilePath); + JsonNode jsonNode = JsonNode.Parse(jsonText); string[] escapedPathToAttributeParts = PathToAttribute.Replace("\\.", "\x1F").Split('.'); for (int i = 0; i < escapedPathToAttributeParts.Length; ++i) { escapedPathToAttributeParts[i] = escapedPathToAttributeParts[i].Replace("\x1F", "."); } - UpdateAttribute(jsonObj, escapedPathToAttributeParts, NewAttributeValue); - File.WriteAllText(JsonFilePath, jsonObj.ToString()); + UpdateAttribute(jsonNode, escapedPathToAttributeParts, NewAttributeValue); + + File.WriteAllText(JsonFilePath, jsonNode.ToJsonString(new JsonSerializerOptions { WriteIndented = true })); return true; } - private void UpdateAttribute(JToken jsonObj, string[] path, string newValue) + private void UpdateAttribute(JsonNode node, string[] path, string newValue) { string pathItem = path[0]; - if (jsonObj[pathItem] == null) + + if (node is not JsonObject obj || !obj.ContainsKey(pathItem)) { string message = $"Path item [{nameof(PathToAttribute)}] not found in json file."; if (SkipUpdateIfMissingKey) @@ -57,13 +53,13 @@ private void UpdateAttribute(JToken jsonObj, string[] path, string newValue) throw new ArgumentException(message, pathItem); } - if (path.Length == 1) + if (path.Length == 1) { - jsonObj[pathItem] = newValue; + obj[pathItem] = newValue; return; } - UpdateAttribute(jsonObj[pathItem], path.Skip(1).ToArray(), newValue); + UpdateAttribute(obj[pathItem], path.Skip(1).ToArray(), newValue); } } } diff --git a/global.json b/global.json index 887c8cb53a..cdad98fad9 100644 --- a/global.json +++ b/global.json @@ -3,6 +3,7 @@ "dotnet": "10.0.100-preview.3.25201.16" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25251.105" + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25251.105", + "Microsoft.Build.NoTargets": "3.7.0" } } diff --git a/patches/abstractions-xunit/0001-Patching.patch b/patches/abstractions-xunit/0001-Patching.patch index 3d0be07f74..d4d508096e 100644 --- a/patches/abstractions-xunit/0001-Patching.patch +++ b/patches/abstractions-xunit/0001-Patching.patch @@ -4,24 +4,10 @@ Date: Wed, 19 Jul 2023 11:47:26 -0700 Subject: [PATCH] Patching --- - global.json | 6 ------ src/xunit.abstractions/Properties/AssemblyInfo.cs | 2 +- src/xunit.abstractions/xunit.abstractions.csproj | 11 +++-------- - 3 files changed, 4 insertions(+), 15 deletions(-) - delete mode 100644 global.json + 2 files changed, 4 insertions(+), 9 deletions(-) -diff --git a/global.json b/global.json -deleted file mode 100644 -index 9f78419..0000000 ---- a/global.json -+++ /dev/null -@@ -1,6 +0,0 @@ --{ -- "sdk": { -- "version": "6.0.0", -- "rollForward": "latestMinor" -- } --} diff --git a/src/xunit.abstractions/Properties/AssemblyInfo.cs b/src/xunit.abstractions/Properties/AssemblyInfo.cs index 041f22b..c5b5124 100644 --- a/src/xunit.abstractions/Properties/AssemblyInfo.cs @@ -56,6 +42,3 @@ index fa4cf23..5d61131 100644 - - --- -2.41.0.windows.2 - diff --git a/repo-projects/Directory.Build.props b/repo-projects/Directory.Build.props index e593913ee3..576f512076 100644 --- a/repo-projects/Directory.Build.props +++ b/repo-projects/Directory.Build.props @@ -1,50 +1,36 @@ - - $(MSBuildProjectName) - - - $(RepositoryName) - $(SubmoduleDirectory)$(SourceDirectory)/ - true - $(LoggingDir)$(RepositoryName).log - >> $(RepoConsoleLogFile) 2>&1 + $(NetCurrent) + $(MSBuildProjectName) - - $(CompletedSemaphorePath)$(RepositoryName)/ - + $([MSBuild]::NormalizeDirectory('$(SubmoduleDirectory)', '$(RepositoryName)')) + $([MSBuild]::NormalizeDirectory('$(OriginalProjectDirectory)', 'artifacts', 'clone')) + $([MSBuild]::NormalizeDirectory('$(ArtifactsLogDir)', '$(RepositoryName)')) - - - - 0 - - - -- - false + true + $(ArtifactsLogRepoDir)$(RepositoryName).log + > $(RepoConsoleLogFile) 2>&1 - - - '$(RepositoryName)' - + + + - - - + + + - - + + @@ -68,4 +54,9 @@ + + + + + diff --git a/repo-projects/Directory.Build.targets b/repo-projects/Directory.Build.targets index ee8bf0e95d..3d19829735 100644 --- a/repo-projects/Directory.Build.targets +++ b/repo-projects/Directory.Build.targets @@ -1,4 +1,6 @@ - + + + $(ProjectDirectory)NuGet.config @@ -7,11 +9,9 @@ $(ProjectDirectory)src\NuGet.Config - - - + <_DependentProject Include="@(RepositoryReference -> '%(Identity).proj')" /> @@ -19,15 +19,20 @@ - - - + + + + - + + + git --work-tree=$(ProjectDirectory) apply --ignore-whitespace --whitespace=nowarn @@ -37,12 +42,15 @@ when we are applying patches in the current directory (which is required due to the way Git interprets the paths in a patch). GIT_DIR=/dev/null short-circuits the .gitdir discovery process and lets Git treat the directory like any non-Git-controlled directory instead. --> - - + + + + - @@ -64,9 +71,10 @@ Add a new nuget config file at the root of the component that includes sources for its dependencies' outputs. --> + - + Condition="'@(RepositoryReference)' != ''" + DependsOnTargets="ResolveProjectReferences"> $(ProjectDirectory)NuGet.config @@ -103,20 +111,23 @@ + Outputs="$(BaseIntermediateOutputPath)UpdateNuGetConfig.complete"> - + + + + + + Outputs="$(BaseIntermediateOutputPath)UpdateGlobalJsonVersions.complete"> <_PossibleCliVersionJsonPath Include="sdk.version" /> <_PossibleCliVersionJsonPath Include="tools.dotnet" /> @@ -124,49 +135,51 @@ - + + + + - - + + - - + Outputs="$(BaseIntermediateOutputPath)RepoBuild.complete"> + + + + + - - - - - - - - - - - - $(BuildCommand) /v:$(LogVerbosity) $(RedirectRepoOutputToLog) - $(BuildCommand) $(RedirectRepoOutputToLog) - - + IgnoreStandardErrorWarningFormat="true" + Condition="'$(CustomRepoBuild)' != 'true'" /> + + + + + + + + + + + @@ -175,68 +188,55 @@ - - + Outputs="$(BaseIntermediateOutputPath)Package.complete"> + + - - - - - - - - - <_BuiltPackages Condition="'$(PackagesOutput)' != ''" Include="$(PackagesOutput)/*.nupkg" Exclude="$(PackagesOutput)/*.symbols.nupkg"/> - <_BuiltPackages Condition="'@(PackagesOutputList)' != ''" Include="%(PackagesOutputList.Identity)/*.nupkg" Exclude="%(PackagesOutputList.Identity)/*.symbols.nupkg"/> - - + - - + + + + - - - - - + - - - $(LocalNuGetPackagesRoot)$(RepositoryName)/ - - - + + - + <_BuiltPackages Include="$(PackagesOutput)/*.nupkg" Exclude="$(PackagesOutput)/*.symbols.nupkg"/> + + + + - diff --git a/repo-projects/MSBuildLocator.proj b/repo-projects/MSBuildLocator.proj index 2d57ef294b..cd5d2d64d5 100644 --- a/repo-projects/MSBuildLocator.proj +++ b/repo-projects/MSBuildLocator.proj @@ -1,15 +1,13 @@ - - + - $(ProjectDirectory)/src/MSBuildLocator/bin/$(Configuration)/ + $(ProjectDirectory)src/MSBuildLocator/bin/$(Configuration)/ + true - - - + - $(ProjectDirectory)/src/MSBuildLocator/Microsoft.Build.Locator.csproj + $(ProjectDirectory)src/MSBuildLocator/Microsoft.Build.Locator.csproj $(BuildCommandArgs) /p:Configuration=$(Configuration) $(BuildCommandArgs) /v:$(LogVerbosity) $(BuildCommandArgs) $(RedirectRepoOutputToLog) @@ -19,17 +17,17 @@ $(BuildCommandArgs) /p:Version=$(MSBuildLocatorReleaseVersion) - - - diff --git a/repo-projects/abstractions-xunit.proj b/repo-projects/abstractions-xunit.proj index 01c480c8f1..28cbe0fa6f 100644 --- a/repo-projects/abstractions-xunit.proj +++ b/repo-projects/abstractions-xunit.proj @@ -1,41 +1,39 @@ - - - + + + + $(ProjectDirectory)src/xunit.abstractions/bin/$(Configuration)/ + $(KeysDir)xunit.abstractions.snk + $(ProjectDirectory)global.json + true + + + - $(ProjectDirectory)/src/xunit.abstractions/bin/$(Configuration)/ - $(KeysDir)xunit.abstractions.snk + $(ProjectDirectory)xunit.abstractions.sln + $(BuildCommandArgs) /p:Configuration=$(Configuration) + $(BuildCommandArgs) /p:PackageVersion=$(AbstractionsXunitReleaseVersion) + $(BuildCommandArgs) /p:AssemblyOriginatorKeyFile=$(XunitAbstractionsKeyFilePath) + $(BuildCommandArgs) /p:DelaySign=$(DelaySign) + $(BuildCommandArgs) /p:SignAssembly=true + $(BuildCommandArgs) /p:PublicSign=$(PublicSign) + $(BuildCommandArgs) /v:$(LogVerbosity) + $(BuildCommandArgs) $(RedirectRepoOutputToLog) - - - - - - $(ProjectDirectory)/xunit.abstractions.sln - $(BuildCommandArgs) /p:Configuration=$(Configuration) - $(BuildCommandArgs) /p:PackageVersion=$(AbstractionsXunitReleaseVersion) - $(BuildCommandArgs) /p:AssemblyOriginatorKeyFile=$(XunitAbstractionsKeyFilePath) - $(BuildCommandArgs) /p:DelaySign=$(DelaySign) - $(BuildCommandArgs) /p:SignAssembly=true - $(BuildCommandArgs) /p:PublicSign=$(PublicSign) - $(BuildCommandArgs) /v:$(LogVerbosity) - $(BuildCommandArgs) $(RedirectRepoOutputToLog) - - - - - - - - - - + + + + + + + + diff --git a/repo-projects/application-insights.proj b/repo-projects/application-insights.proj index 3fe6a888f4..9586e2dde7 100644 --- a/repo-projects/application-insights.proj +++ b/repo-projects/application-insights.proj @@ -1,20 +1,18 @@ - - + - $(ProjectDirectory)/bin/$(Configuration) + $(ProjectDirectory)bin/$(Configuration) + true - - + + - - - + - $(ProjectDirectory)/BASE/src/Microsoft.ApplicationInsights/Microsoft.ApplicationInsights.csproj + $(ProjectDirectory)BASE/src/Microsoft.ApplicationInsights/Microsoft.ApplicationInsights.csproj $(BuildCommandArgs) /p:Configuration=$(Configuration) $(BuildCommandArgs) /p:StableRelease=True $(BuildCommandArgs) /p:RelativeOutputPathBase= @@ -22,22 +20,22 @@ $(BuildCommandArgs) $(RedirectRepoOutputToLog) - $(BuildCommandArgs) /p:BinRoot=$(ProjectDirectory)/bin - $(BuildCommandArgs) /p:ObjRoot=$(ProjectDirectory)/obj - $(BuildCommandArgs) /p:PackageOutputDir=$(ProjectDirectory)/bin/$(Configuration) + $(BuildCommandArgs) /p:BinRoot=$(ProjectDirectory)bin + $(BuildCommandArgs) /p:ObjRoot=$(ProjectDirectory)obj + $(BuildCommandArgs) /p:PackageOutputDir=$(ProjectDirectory)bin/$(Configuration) - - - diff --git a/repo-projects/azure-activedirectory-identitymodel-extensions-for-dotnet.proj b/repo-projects/azure-activedirectory-identitymodel-extensions-for-dotnet.proj index 19ffb98a88..9f97cdc4f8 100644 --- a/repo-projects/azure-activedirectory-identitymodel-extensions-for-dotnet.proj +++ b/repo-projects/azure-activedirectory-identitymodel-extensions-for-dotnet.proj @@ -1,13 +1,11 @@ - - + - $(ProjectDirectory)/pack + $(ProjectDirectory)pack + true - - - + $(ProjectDirectory)src/System.IdentityModel.Tokens.Jwt/System.IdentityModel.Tokens.Jwt.csproj $(ProjectDirectory)src/Microsoft.IdentityModel.Tokens/Microsoft.IdentityModel.Tokens.csproj @@ -23,37 +21,37 @@ $(BuildCommandArgs) --output $(ProjectDirectory)pack - - - - - - - diff --git a/repo-projects/cssparser.proj b/repo-projects/cssparser.proj index 16822bc964..0ff8f49ff4 100644 --- a/repo-projects/cssparser.proj +++ b/repo-projects/cssparser.proj @@ -1,15 +1,13 @@ - - + - $(ProjectDirectory)/src/Microsoft.Css.Parser/bin/$(Configuration)/ + $(ProjectDirectory)src/Microsoft.Css.Parser/bin/$(Configuration)/ + true - - - + - $(ProjectDirectory)/src/Microsoft.Css.Parser/Microsoft.Css.Parser.csproj + $(ProjectDirectory)src/Microsoft.Css.Parser/Microsoft.Css.Parser.csproj $(BuildCommandArgs) /p:Configuration=$(Configuration) $(BuildCommandArgs) /p:DelaySign=$(DelaySign) $(BuildCommandArgs) /p:PublicSign=$(PublicSign) @@ -18,17 +16,17 @@ $(BuildCommandArgs) $(RedirectRepoOutputToLog) - - - diff --git a/repo-projects/docker-creds-provider.proj b/repo-projects/docker-creds-provider.proj index 220c3c7fc9..c6d06dd027 100644 --- a/repo-projects/docker-creds-provider.proj +++ b/repo-projects/docker-creds-provider.proj @@ -1,7 +1,36 @@ - + + 2.2.4 + $(ProjectDirectory)global.json + $(ProjectDirectory)src/Valleysoft.DockerCredsProvider/bin/$(Configuration)/ + true - + + + $(ProjectDirectory)src/Valleysoft.DockerCredsProvider/Valleysoft.DockerCredsProvider.csproj + $(BuildCommandArgs) /p:Configuration=$(Configuration) + $(BuildCommandArgs) /v:$(LogVerbosity) + $(BuildCommandArgs) $(RedirectRepoOutputToLog) + $(BuildCommandArgs) /p:Version=$(DockerCredsProviderReleaseVersion) + $(BuildCommandArgs) /p:TargetFrameworks=$(NetCurrent) + + + + + + + + + diff --git a/repo-projects/docker-creds-provider.targets b/repo-projects/docker-creds-provider.targets deleted file mode 100644 index 52bdd1be04..0000000000 --- a/repo-projects/docker-creds-provider.targets +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - $(ProjectDirectory)/global.json - $(ProjectDirectory)/src/Valleysoft.DockerCredsProvider/bin/$(Configuration)/ - - - - - - - $(ProjectDirectory)/src/Valleysoft.DockerCredsProvider/Valleysoft.DockerCredsProvider.csproj - $(BuildCommandArgs) /p:Configuration=$(Configuration) - $(BuildCommandArgs) /v:$(LogVerbosity) - $(BuildCommandArgs) $(RedirectRepoOutputToLog) - $(BuildCommandArgs) /p:Version=$(DockerCredsProviderReleaseVersion) - $(BuildCommandArgs) /p:TargetFrameworks=$(NetCurrent) - - - - - - - - - - diff --git a/repo-projects/humanizer.proj b/repo-projects/humanizer.proj index 05276652ad..9ae59a2bec 100644 --- a/repo-projects/humanizer.proj +++ b/repo-projects/humanizer.proj @@ -1,14 +1,12 @@ - - + - $(ProjectDirectory)/src/Humanizer/bin/Release - $(ProjectDirectory)/src/NuGet.config + $(ProjectDirectory)src/Humanizer/bin/Release + $(ProjectDirectory)src/NuGet.config + true - - - + $(ProjectDirectory)src/Humanizer/Humanizer.csproj @@ -23,17 +21,17 @@ $(PackCommandArgs) /p:NuspecProperties=Version=$(HumanizerReleaseVersion) - - - diff --git a/repo-projects/netcorecli-fsc.proj b/repo-projects/netcorecli-fsc.proj index 16516abaca..edcfbd0f65 100644 --- a/repo-projects/netcorecli-fsc.proj +++ b/repo-projects/netcorecli-fsc.proj @@ -1,8 +1,7 @@ - - + - /bl + /bl:$(ArtifactsLogRepoDir)build.binlog $(OutputArgs) /v:$(LogVerbosity) $(OutputArgs) /p:OutputPath=$(OutputPath)$(RepositoryName)/ $(OutputArgs) /p:BaseIntermediateOutputPath=$(IntermediatePath)$(RepositoryName) @@ -10,22 +9,20 @@ pack $(BuildCommandArgs) -c $(Configuration) - $(BuildCommandArgs) --output $(SourceBuiltPackagesPath) + $(BuildCommandArgs) --output $(ArtifactsShippingPackagesDir) $(BuildCommandArgs) --no-build FSharp.NET.Sdk.csproj $(BuildCommandArgs) /p:NuspecFile=FSharp.NET.Sdk.nuspec $(BuildCommandArgs) $(OutputArgs) - $(DotnetToolCommand) $(BuildCommandArgs) + $(DotNetTool) $(BuildCommandArgs) - $(SourceBuiltPackagesPath) - $(SubmoduleDirectory)$(RepositoryName)/ + $(ArtifactsShippingPackagesDir) - - + - diff --git a/repo-projects/newtonsoft-json.proj b/repo-projects/newtonsoft-json.proj index 4d4fab40cd..da5fe626e8 100644 --- a/repo-projects/newtonsoft-json.proj +++ b/repo-projects/newtonsoft-json.proj @@ -1,39 +1,35 @@ - - - - - - - - + - $(ProjectDirectory)/Src/NuGet.Config + $(ProjectDirectory)Src/NuGet.Config $(KeysDir)Newtonsoft.Json.snk - $(ProjectDirectory)/Src/Newtonsoft.Json/ + $(ProjectDirectory)Src/Newtonsoft.Json/ $(NewtonsoftJsonDirectory)Newtonsoft.Json.csproj - /p:DotnetOnly=true - $(DotnetToolCommandArgs) /p:Configuration=$(Configuration) - $(DotnetToolCommandArgs) /p:AssemblyOriginatorKeyFile=$(NewtonsoftJsonKeyFilePath) - $(DotnetToolCommandArgs) /p:SignAssembly=true - $(DotnetToolCommandArgs) /p:PublicSign=true - $(DotnetToolCommandArgs) /p:TreatWarningsAsErrors=false - $(DotnetToolCommandArgs) /p:AdditionalConstants=SIGNED + /p:DotnetOnly=true + $(DotNetToolArgs) /p:Configuration=$(Configuration) + $(DotNetToolArgs) /p:AssemblyOriginatorKeyFile=$(NewtonsoftJsonKeyFilePath) + $(DotNetToolArgs) /p:SignAssembly=true + $(DotNetToolArgs) /p:PublicSign=true + $(DotNetToolArgs) /p:TreatWarningsAsErrors=false + $(DotNetToolArgs) /p:AdditionalConstants=SIGNED - $(DotnetToolCommand) build $(NewtonsoftJsonProjectPath) /bl:build.binlog $(DotnetToolCommandArgs) - $(DotnetToolCommand) pack $(NewtonsoftJsonProjectPath) /bl:pack.binlog $(DotnetToolCommandArgs) - $(DotnetToolCommand) clean $(NewtonsoftJsonProjectPath) $(DotnetToolCommandArgs) + $(DotNetTool) build $(NewtonsoftJsonProjectPath) /bl:$(ArtifactsLogRepoDir)build.binlog $(DotNetToolArgs) + $(DotNetTool) pack $(NewtonsoftJsonProjectPath) /bl:$(ArtifactsLogRepoDir)pack.binlog $(DotNetToolArgs) $(NewtonsoftJsonDirectory)bin/$(Configuration)/ - - + + + + + + - diff --git a/repo-projects/vs-solutionpersistence.proj b/repo-projects/vs-solutionpersistence.proj index 30e11ce58d..ffa5f75039 100644 --- a/repo-projects/vs-solutionpersistence.proj +++ b/repo-projects/vs-solutionpersistence.proj @@ -1,36 +1,33 @@ - - - - - - - - - - + $(KeysDir)vs-solutionpersistence.snk - $(ProjectDirectory)/src/Microsoft.VisualStudio.SolutionPersistence/ + $(ProjectDirectory)src/Microsoft.VisualStudio.SolutionPersistence/ $(SlnPersistenceDirectory)Microsoft.VisualStudio.SolutionPersistence.csproj $(ProjectDirectory)bin/Packages/$(Configuration)/NuGet/ - $(ProjectDirectory)/global.json - $(ProjectDirectory)/nuget.config + $(ProjectDirectory)global.json + $(ProjectDirectory)nuget.config - $(DotnetToolCommandArgs) /p:Configuration=$(Configuration) - $(DotnetToolCommandArgs) /p:TreatWarningsAsErrors=false - $(DotnetToolCommandArgs) /p:AssemblyOriginatorKeyFile=$(SlnPersistenceKeyFilePath) - $(DotnetToolCommandArgs) /p:SignAssembly=true - $(DotnetToolCommandArgs) /p:PublicSign=true - $(DotnetToolCommandArgs) /p:FileVersion=$(SolutionPersistenceVersion) - $(DotnetToolCommandArgs) /p:PackageVersion=$(SolutionPersistenceVersion) + $(DotNetToolArgs) /p:Configuration=$(Configuration) + $(DotNetToolArgs) /p:TreatWarningsAsErrors=false + $(DotNetToolArgs) /p:AssemblyOriginatorKeyFile=$(SlnPersistenceKeyFilePath) + $(DotNetToolArgs) /p:SignAssembly=true + $(DotNetToolArgs) /p:PublicSign=true + $(DotNetToolArgs) /p:FileVersion=$(SolutionPersistenceVersion) + $(DotNetToolArgs) /p:PackageVersion=$(SolutionPersistenceVersion) - $(DotnetToolCommand) build $(SlnPersistenceProjectPath) /bl:build.binlog $(DotnetToolCommandArgs) - $(DotnetToolCommand) pack $(SlnPersistenceProjectPath) /bl:pack.binlog $(DotnetToolCommandArgs) - $(DotnetToolCommand) clean $(SlnPersistenceProjectPath) $(DotnetToolCommandArgs) + $(DotNetTool) build $(SlnPersistenceProjectPath) /bl:$(ArtifactsLogRepoDir)build.binlog $(DotNetToolArgs) + $(DotNetTool) pack $(SlnPersistenceProjectPath) /bl:$(ArtifactsLogRepoDir)pack.binlog $(DotNetToolArgs) - + + + + + + + + diff --git a/repo-projects/xunit.proj b/repo-projects/xunit.proj index 0b37a85fa6..a4c418159f 100644 --- a/repo-projects/xunit.proj +++ b/repo-projects/xunit.proj @@ -1,71 +1,68 @@ - - - + + + + $(ProjectDirectory)bin/$(Configuration) + true + + + + + + + - $(ProjectDirectory)/bin/$(Configuration) + $(ProjectDirectory)xunit-notests.slnf + /p:Configuration=$(Configuration) + $(BuildCommandArgs) /p:PackageVersion=$(XunitReleaseVersion) + $(BuildCommandArgs) /p:DelaySign=$(DelaySign) + $(BuildCommandArgs) /p:PublicSign=$(PublicSign) + $(BuildCommandArgs) /v:$(LogVerbosity) + $(BuildCommandArgs) /p:PackageOutputPath=$(PackagesOutput) + $(BuildCommandArgs) $(RedirectRepoOutputToLog) - - + - - - - - - $(ProjectDirectory)/xunit-notests.slnf - /p:Configuration=$(Configuration) - $(BuildCommandArgs) /p:PackageVersion=$(XunitReleaseVersion) - $(BuildCommandArgs) /p:DelaySign=$(DelaySign) - $(BuildCommandArgs) /p:PublicSign=$(PublicSign) - $(BuildCommandArgs) /v:$(LogVerbosity) - $(BuildCommandArgs) /p:PackageOutputPath=$(PackagesOutput) - $(BuildCommandArgs) $(RedirectRepoOutputToLog) - + + - - - - + + $(ProjectDirectory)src/xunit.extensibility.execution.nuspec + - - $(ProjectDirectory)/src/xunit.extensibility.execution.nuspec - + + $(ProjectDirectory)src/xunit.extensibility.core.nuspec + + + + $(ProjectDirectory)src/xunit.runner.utility.nuspec + + + + $(ProjectDirectory)src/xunit.core.nuspec + + - - $(ProjectDirectory)/src/xunit.extensibility.core.nuspec - + - - $(ProjectDirectory)/src/xunit.runner.utility.nuspec - + - - $(ProjectDirectory)/src/xunit.core.nuspec - - - - - - - - - - - - + + + +