diff --git a/eng/common/internal/Tools.csproj b/eng/common/internal/Tools.csproj index f46d5efe2e32..2067b8df8d98 100644 --- a/eng/common/internal/Tools.csproj +++ b/eng/common/internal/Tools.csproj @@ -1,5 +1,5 @@ + - net472 diff --git a/src/Microsoft.DotNet.Build.Tasks.Archives/Microsoft.DotNet.Build.Tasks.Archives.csproj b/src/Microsoft.DotNet.Build.Tasks.Archives/Microsoft.DotNet.Build.Tasks.Archives.csproj index af826e9d5dfd..c09d77629ea3 100644 --- a/src/Microsoft.DotNet.Build.Tasks.Archives/Microsoft.DotNet.Build.Tasks.Archives.csproj +++ b/src/Microsoft.DotNet.Build.Tasks.Archives/Microsoft.DotNet.Build.Tasks.Archives.csproj @@ -1,4 +1,4 @@ - + netcoreapp3.1 diff --git a/src/Microsoft.DotNet.Build.Tasks.Feed/src/PublishSymbolsHelper.cs b/src/Microsoft.DotNet.Build.Tasks.Feed/src/PublishSymbolsHelper.cs index f781d8f0b21c..75991951b72c 100644 --- a/src/Microsoft.DotNet.Build.Tasks.Feed/src/PublishSymbolsHelper.cs +++ b/src/Microsoft.DotNet.Build.Tasks.Feed/src/PublishSymbolsHelper.cs @@ -1,6 +1,5 @@ // 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.Collections.Generic; diff --git a/src/Microsoft.DotNet.Build.Tasks.Feed/src/PushToBlobFeed.cs b/src/Microsoft.DotNet.Build.Tasks.Feed/src/PushToBlobFeed.cs index 5e26d9fa001b..45f4a0f8918c 100644 --- a/src/Microsoft.DotNet.Build.Tasks.Feed/src/PushToBlobFeed.cs +++ b/src/Microsoft.DotNet.Build.Tasks.Feed/src/PushToBlobFeed.cs @@ -1,6 +1,5 @@ // 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 Microsoft.Arcade.Common; using Microsoft.Build.Framework; @@ -31,9 +30,9 @@ public class PushToBlobFeed : MSBuildTaskBase /// /// Enables idempotency when Overwrite is false. - /// + /// /// false: (default) Attempting to upload an item that already exists fails. - /// + /// /// true: When an item already exists, download the existing blob to check if it's /// byte-for-byte identical to the one being uploaded. If so, pass. If not, fail. /// @@ -139,8 +138,8 @@ private async Task ExecuteAsync() if (PublishFlatContainer) { - await blobFeedAction.PublishToFlatContainerAsync(ItemsToPush, - MaxClients, + await blobFeedAction.PublishToFlatContainerAsync(ItemsToPush, + MaxClients, pushOptions); blobArtifacts = ConcatBlobArtifacts(blobArtifacts, ItemsToPush); } @@ -177,7 +176,7 @@ await blobFeedAction.PublishToFlatContainerAsync(ItemsToPush, blobArtifacts = ConcatBlobArtifacts(blobArtifacts, symbolItems); } - if (!(MSBuildListSplitter.GetNamedProperties(ManifestBuildData).ContainsKey("Location") || + if (!(MSBuildListSplitter.GetNamedProperties(ManifestBuildData).ContainsKey("Location") || MSBuildListSplitter.GetNamedProperties(ManifestBuildData).ContainsKey("InitialAssetsLocation"))) { string[] locationAttribute = new string[] { $"Location={ExpectedFeedUrl}" }; diff --git a/src/Microsoft.DotNet.Build.Tasks.Installers/build/deb-package-tool/package_tool.sh b/src/Microsoft.DotNet.Build.Tasks.Installers/build/deb-package-tool/package_tool.sh index 9e069b7a1e01..c7f609fe3b7c 100644 --- a/src/Microsoft.DotNet.Build.Tasks.Installers/build/deb-package-tool/package_tool.sh +++ b/src/Microsoft.DotNet.Build.Tasks.Installers/build/deb-package-tool/package_tool.sh @@ -2,8 +2,8 @@ # # 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. # + set -e SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" @@ -27,7 +27,7 @@ execute(){ package_all generate_all create_source_tarball - + # Actually Build Package Files (cd ${PACKAGE_SOURCE_DIR}; debuild -us -uc) } @@ -63,7 +63,7 @@ parse_args_and_set_env_vars(){ ;; esac done - + # Special Input Directories + Paths ABSOLUTE_PLACEMENT_DIR="${INPUT_DIR}/\$" PACKAGE_ROOT_PLACEMENT_DIR="${INPUT_DIR}/package_root" @@ -73,7 +73,7 @@ parse_args_and_set_env_vars(){ } print_help(){ - echo "Usage: package_tool [-i ] [-o ] + echo "Usage: package_tool [-i ] [-o ] [-n ] [-v ] [-h] REQUIRED: @@ -114,13 +114,13 @@ validate_inputs(){ echo $CONFIG ret=1 fi - + return $ret } parse_config_and_set_env_vars(){ extract_base_cmd="python $SCRIPT_DIR/scripts/extract_json_value.py" - + # Arguments Take Precedence over Config [ -z "$PACKAGE_VERSION" ] && PACKAGE_VERSION="$($extract_base_cmd $CONFIG "release.package_version")" [ -z "$PACKAGE_NAME" ] && PACKAGE_NAME="$($extract_base_cmd $CONFIG "package_name")" @@ -151,7 +151,7 @@ package_all(){ package_absolute_placement package_samples package_docs - package_install_scripts + package_install_scripts } generate_all(){ @@ -179,18 +179,18 @@ package_package_root_placement(){ package_absolute_placement(){ if [[ -d "$ABSOLUTE_PLACEMENT_DIR" ]]; then abs_in_package_dir="\$" - + add_dir_to_install ${ABSOLUTE_PLACEMENT_DIR} $abs_in_package_dir - + # Get List of all files in directory tree, relative to ABSOLUTE_PLACEMENT_DIR abs_files=( $(_get_files_in_dir_tree $ABSOLUTE_PLACEMENT_DIR) ) - + # For each file add a a system placement for abs_file in ${abs_files[@]} do parent_dir=$(dirname $abs_file) filename=$(basename $abs_file) - + add_system_file_placement "$abs_in_package_dir/$abs_file" "/$parent_dir" done fi @@ -224,7 +224,7 @@ generate_config_templates(){ generate_manpages(){ if [[ -f "$DOCS_JSON_PATH" ]]; then mkdir -p $DOCS_DIR - + # Generate the manpages from json spec python ${SCRIPT_DIR}/scripts/manpage_generator.py ${DOCS_JSON_PATH} ${DOCS_DIR} fi diff --git a/src/Microsoft.DotNet.Build.Tasks.Installers/build/deb-package-tool/scripts/config_template_generator.py b/src/Microsoft.DotNet.Build.Tasks.Installers/build/deb-package-tool/scripts/config_template_generator.py index 6b8b21c9e128..dca4143c3dd8 100644 --- a/src/Microsoft.DotNet.Build.Tasks.Installers/build/deb-package-tool/scripts/config_template_generator.py +++ b/src/Microsoft.DotNet.Build.Tasks.Installers/build/deb-package-tool/scripts/config_template_generator.py @@ -2,7 +2,6 @@ # # 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. # # Parses debian_config.json and generates appropriate templates @@ -38,9 +37,9 @@ def dst(self, dt): def generate_and_write_all(config_data, template_dir, output_dir, package_name=None, package_version=None): try: changelog_contents = generate_changelog( - config_data, - template_dir, - package_name=package_name, + config_data, + template_dir, + package_name=package_name, package_version=package_version) control_contents = generate_control(config_data, template_dir, package_name=package_name) @@ -83,7 +82,7 @@ def generate_changelog(config_data, template_dir, package_version=None, package_ template = get_template(template_dir, FILE_CHANGELOG) release_data = config_data["release"] - + # Allow for Version Override config_package_version = release_data["package_version"] package_version = package_version or config_package_version @@ -96,7 +95,7 @@ def generate_changelog(config_data, template_dir, package_version=None, package_ PACKAGE_NAME=package_name or config_data["package_name"], MAINTAINER_NAME=config_data["maintainer_name"], - MAINTAINER_EMAIL=config_data["maintainer_email"], + MAINTAINER_EMAIL=config_data["maintainer_email"], DATE=datetime.datetime.now(UTC()).strftime(CHANGELOG_DATE_FORMAT) ) @@ -165,7 +164,7 @@ def generate_symlinks(config_data, package_name=None): symlink_entries.append( '%s %s' % (package_abs_path, symlink_path) ) return '\n'.join(symlink_entries) - + # Helper Functions def get_package_root(config_data, package_name=None): config_install_root = config_data.get("install_root", None) @@ -182,7 +181,7 @@ def get_dependendent_packages_string(debian_dependency_data): return "" dependencies = [] - + for debian_package_name in debian_dependency_data: dep_str = debian_package_name @@ -239,7 +238,7 @@ def parse_and_validate_args(): output_dir = sys.argv[3] name_override = None version_override = None - + if len(sys.argv) >= 5: name_override = sys.argv[4] diff --git a/src/Microsoft.DotNet.Build.Tasks.Installers/build/deb-package-tool/scripts/debian_build_lib.sh b/src/Microsoft.DotNet.Build.Tasks.Installers/build/deb-package-tool/scripts/debian_build_lib.sh index 18d388864fd0..a127ffdbdba8 100644 --- a/src/Microsoft.DotNet.Build.Tasks.Installers/build/deb-package-tool/scripts/debian_build_lib.sh +++ b/src/Microsoft.DotNet.Build.Tasks.Installers/build/deb-package-tool/scripts/debian_build_lib.sh @@ -1,7 +1,6 @@ # # 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. # # This file is not intended to be executed directly @@ -46,7 +45,7 @@ add_system_dir_placement(){ abs_installation_dir=$2 dir_files=( $(_get_files_in_dir_tree $PACKAGE_SOURCE_DIR/$in_package_dir) ) - + # If in_package_dir isn't empty include a slash if [ ! -z "$in_package_dir" ]; then in_package_dir="${in_package_dir}/" @@ -92,10 +91,10 @@ add_file_to_install(){ # add_dir_to_install # Summary: Adds contents of a directory on the local filesystem to the package and installs them rooted at INSTALL_ROOT -# Note: Does not install the directory passed, only its contents +# Note: Does not install the directory passed, only its contents # Usage: add_dir_to_install {relative path of directory to copy} {relative path to INSTALL_ROOT to place directory tree} add_dir_to_install(){ - + copy_from_dir=$1 rel_install_path=$2 @@ -127,7 +126,7 @@ _copy_files_to_package(){ do local parent_dir=$(dirname $rel_filepath) local filename=$(basename $rel_filepath) - + mkdir -p ${PACKAGE_SOURCE_DIR}/${package_dest_dir}/${parent_dir} # Ignore $parent_dir if it there isn't one @@ -136,7 +135,7 @@ _copy_files_to_package(){ else cp "${local_root_dir}/${rel_filepath}" "${PACKAGE_SOURCE_DIR}/${package_dest_dir}/${parent_dir}" fi - + done } diff --git a/src/Microsoft.DotNet.Build.Tasks.Installers/build/deb-package-tool/scripts/extract_json_value.py b/src/Microsoft.DotNet.Build.Tasks.Installers/build/deb-package-tool/scripts/extract_json_value.py index 74f26a6ffdde..7362844fd279 100644 --- a/src/Microsoft.DotNet.Build.Tasks.Installers/build/deb-package-tool/scripts/extract_json_value.py +++ b/src/Microsoft.DotNet.Build.Tasks.Installers/build/deb-package-tool/scripts/extract_json_value.py @@ -2,7 +2,6 @@ # # 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. # # Extract Json Value @@ -24,7 +23,7 @@ def help_and_exit(msg=None): sys.exit(1) def parse_and_validate_args(): - + if len(sys.argv) < 3: help_and_exit(msg="Error: Invalid Args") diff --git a/src/Microsoft.DotNet.Build.Tasks.Installers/build/deb-package-tool/scripts/manpage_generator.py b/src/Microsoft.DotNet.Build.Tasks.Installers/build/deb-package-tool/scripts/manpage_generator.py index c62e6807901d..47b8b80eedf0 100644 --- a/src/Microsoft.DotNet.Build.Tasks.Installers/build/deb-package-tool/scripts/manpage_generator.py +++ b/src/Microsoft.DotNet.Build.Tasks.Installers/build/deb-package-tool/scripts/manpage_generator.py @@ -2,7 +2,6 @@ # # 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. # # manpage_generator @@ -203,10 +202,10 @@ def generate_options_section(tool_name, tool_data):# parameter = option_data.get("parameter", None) description = option_data.get("description", "") - option_specifiers_string = _option_string_helper(specifier_short, - specifier_long, - parameter, - include_brackets = False, + option_specifiers_string = _option_string_helper(specifier_short, + specifier_long, + parameter, + include_brackets = False, delimiter=' ", " ') format_args = { @@ -221,17 +220,17 @@ def generate_options_section(tool_name, tool_data):# def generate_author_section(tool_name, tool_data):# roff_text_builder = [] roff_text_builder.append(".SH AUTHOR") - + author_format = '.B "{author_name}" " " \n.RI ( "{author_email}" )' - + author_name = tool_data.get("author", "") author_email = tool_data.get("author_email", "") - + format_args = { "author_name" : author_name, "author_email" : author_email } - + roff_text_builder.append(author_format.format(**format_args)) return SECTION_SEPARATOR.join(roff_text_builder) @@ -239,9 +238,9 @@ def generate_author_section(tool_name, tool_data):# def generate_copyright_section(tool_name, tool_data):# roff_text_builder = [] roff_text_builder.append(".SH COPYRIGHT") - + copyright_data = tool_data.get("copyright") - + roff_text_builder.append('.B "{0}"'.format(copyright_data)) return SECTION_SEPARATOR.join(roff_text_builder) diff --git a/src/Microsoft.DotNet.Build.Tasks.Installers/build/deb-package-tool/setup/build_setup.sh b/src/Microsoft.DotNet.Build.Tasks.Installers/build/deb-package-tool/setup/build_setup.sh index 12c223aacbc7..a77cc192ecd0 100644 --- a/src/Microsoft.DotNet.Build.Tasks.Installers/build/deb-package-tool/setup/build_setup.sh +++ b/src/Microsoft.DotNet.Build.Tasks.Installers/build/deb-package-tool/setup/build_setup.sh @@ -1,7 +1,6 @@ # # 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. # install_dependencies(){ @@ -18,4 +17,4 @@ setup(){ install_dependencies } -setup \ No newline at end of file +setup diff --git a/src/Microsoft.DotNet.Build.Tasks.Installers/build/deb-package-tool/setup/test_setup.sh b/src/Microsoft.DotNet.Build.Tasks.Installers/build/deb-package-tool/setup/test_setup.sh index a7cdd95c2b3f..287db6c51ea5 100644 --- a/src/Microsoft.DotNet.Build.Tasks.Installers/build/deb-package-tool/setup/test_setup.sh +++ b/src/Microsoft.DotNet.Build.Tasks.Installers/build/deb-package-tool/setup/test_setup.sh @@ -1,7 +1,6 @@ # # 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. # install_dependencies(){ @@ -25,4 +24,4 @@ setup(){ install_bats } -setup \ No newline at end of file +setup diff --git a/src/Microsoft.DotNet.Build.Tasks.Installers/build/deb-package-tool/templates/debian/control b/src/Microsoft.DotNet.Build.Tasks.Installers/build/deb-package-tool/templates/debian/control index 114d8493042c..9497e6c5d07f 100644 --- a/src/Microsoft.DotNet.Build.Tasks.Installers/build/deb-package-tool/templates/debian/control +++ b/src/Microsoft.DotNet.Build.Tasks.Installers/build/deb-package-tool/templates/debian/control @@ -1,7 +1,6 @@ # # 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. # Source: {PACKAGE_NAME} diff --git a/src/Microsoft.DotNet.Build.Tasks.Installers/build/deb-package-tool/templates/debian/copyright b/src/Microsoft.DotNet.Build.Tasks.Installers/build/deb-package-tool/templates/debian/copyright index 72febbba8afc..3e916a1311da 100644 --- a/src/Microsoft.DotNet.Build.Tasks.Installers/build/deb-package-tool/templates/debian/copyright +++ b/src/Microsoft.DotNet.Build.Tasks.Installers/build/deb-package-tool/templates/debian/copyright @@ -1,4 +1,4 @@ -Comment: 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. +Comment: Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ diff --git a/src/Microsoft.DotNet.Build.Tasks.Installers/build/deb-package-tool/templates/debian/rules b/src/Microsoft.DotNet.Build.Tasks.Installers/build/deb-package-tool/templates/debian/rules index b5cbfb27e204..6a4e98d27a57 100644 --- a/src/Microsoft.DotNet.Build.Tasks.Installers/build/deb-package-tool/templates/debian/rules +++ b/src/Microsoft.DotNet.Build.Tasks.Installers/build/deb-package-tool/templates/debian/rules @@ -2,7 +2,6 @@ # # 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. # {overrides} diff --git a/src/Microsoft.DotNet.Build.Tasks.Installers/build/rpm_templates/copyright b/src/Microsoft.DotNet.Build.Tasks.Installers/build/rpm_templates/copyright index ba561b5eceb7..ec4b68bc19f0 100644 --- a/src/Microsoft.DotNet.Build.Tasks.Installers/build/rpm_templates/copyright +++ b/src/Microsoft.DotNet.Build.Tasks.Installers/build/rpm_templates/copyright @@ -1,4 +1,4 @@ -Comment: 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. +Comment: Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. Files: * Copyright: {COPYRIGHT_TEXT} diff --git a/src/Microsoft.DotNet.Build.Tasks.Installers/src/BuildFPMToolPreReqs.cs b/src/Microsoft.DotNet.Build.Tasks.Installers/src/BuildFPMToolPreReqs.cs index c956a24e661a..74bc65d211ed 100644 --- a/src/Microsoft.DotNet.Build.Tasks.Installers/src/BuildFPMToolPreReqs.cs +++ b/src/Microsoft.DotNet.Build.Tasks.Installers/src/BuildFPMToolPreReqs.cs @@ -1,6 +1,5 @@ // 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 Microsoft.Build.Framework; using Newtonsoft.Json; @@ -16,7 +15,7 @@ namespace Microsoft.DotNet.Build.Tasks.Installers /// /// This task prepares the command line parameters for running a RPM build using FPM tool and also updates the copyright and changelog file tokens. /// If parses various values from the config json by first reading it into a model and then builds the required string for parameters and passes it back. - /// + /// /// public class BuildFPMToolPreReqs : BuildTask { @@ -51,7 +50,7 @@ public override bool Execute() UpdateChangelog(configJson, PackageVersion); UpdateCopyRight(configJson); - // Build the full list of parameters + // Build the full list of parameters FPMParameters = BuildCmdParameters(configJson, PackageVersion); Log.LogMessage(LogImportance.Normal, "Generated RPM paramters: " + FPMParameters); } @@ -68,7 +67,7 @@ public override bool Execute() return !Log.HasLoggedErrors; } - // Update the tokens in the changelog file from the config Json + // Update the tokens in the changelog file from the config Json private void UpdateChangelog(ConfigJson configJson, string package_version) { try @@ -87,7 +86,7 @@ private void UpdateChangelog(ConfigJson configJson, string package_version) str = str.Replace("{MAINTAINER_NAME}", configJson.Maintainer_Name); str = str.Replace("{MAINTAINER_EMAIL}", configJson.Maintainer_Email); // The date format needs to be like Wed May 17 2017 - str = str.Replace("{DATE}", DateTime.UtcNow.ToString("ddd MMM dd yyyy")); + str = str.Replace("{DATE}", DateTime.UtcNow.ToString("ddd MMM dd yyyy")); File.WriteAllText(changelogFile, str); } catch (Exception e) @@ -100,7 +99,7 @@ private void UpdateCopyRight(ConfigJson configJson) { try { - // Update the tokens in the copyright file from the config Json + // Update the tokens in the copyright file from the config Json string copyrightFile = Path.Combine(InputDir, "templates", "copyright"); if (!File.Exists(copyrightFile)) { @@ -122,7 +121,7 @@ private void UpdateCopyRight(ConfigJson configJson) private string BuildCmdParameters(ConfigJson configJson, string package_version) { // Parameter list that needs to be passed to FPM tool: - // -s : is the input source type(dir) --Static + // -s : is the input source type(dir) --Static // -t : is the type of package(rpm) --Static // -n : is for the name of the package --JSON // -v : is the version to give to the package --ARG @@ -140,7 +139,7 @@ private string BuildCmdParameters(ConfigJson configJson, string package_version) // --license : the licensing name for the package. This will include the license type in the meta-data for the package, but will not include the associated license file within the package itself. --JSON // --iteration : the iteration to give to the package. This comes from the package_revision --JSON // --url : url for this package. --JSON - // --verbose : Set verbose output for FPM tool --Static + // --verbose : Set verbose output for FPM tool --Static // : Add all the folder mappings for packge_root, docs, man pages --Static var parameters = new List(); @@ -210,13 +209,13 @@ private string BuildCmdParameters(ConfigJson configJson, string package_version) } } } - + parameters.Add("--rpm-os linux"); parameters.Add(string.Concat("--rpm-changelog ", EscapeArg(Path.Combine(InputDir, "templates", "changelog")))); // Changelog File parameters.Add(string.Concat("--rpm-summary ", EscapeArg(configJson.Short_Description))); parameters.Add(string.Concat("--description ", EscapeArg(configJson.Long_Description))); parameters.Add(string.Concat("--maintainer ", EscapeArg(configJson.Maintainer_Name + " <" + configJson.Maintainer_Email + ">"))); - parameters.Add(string.Concat("--vendor ", EscapeArg(configJson.Vendor))); + parameters.Add(string.Concat("--vendor ", EscapeArg(configJson.Vendor))); parameters.Add(string.Concat("-p ", Path.Combine(OutputDir, configJson.Package_Name + ".rpm"))); if (configJson.Package_Conflicts != null) parameters.Add(string.Concat("--conflicts ", EscapeArg(string.Join(",", configJson.Package_Conflicts)))); if (configJson.After_Install_Source != null) parameters.Add(string.Concat("--after-install ", Path.Combine(InputDir, EscapeArg(configJson.After_Install_Source)))); @@ -226,7 +225,7 @@ private string BuildCmdParameters(ConfigJson configJson, string package_version) parameters.Add(string.Concat("--url ", "\"", EscapeArg(configJson.Homepage), "\"")); parameters.Add("--verbose"); - // Map all the payload directories as they need to install on the system + // Map all the payload directories as they need to install on the system if (configJson.Install_Root != null) parameters.Add(string.Concat(Path.Combine(InputDir, "package_root/="), configJson.Install_Root)); // Package Files if (configJson.Install_Man != null) parameters.Add(string.Concat(Path.Combine(InputDir, "docs", "host/="), configJson.Install_Man)); // Man Pages if (configJson.Install_Doc != null) parameters.Add(string.Concat(Path.Combine(InputDir, "templates", "copyright="), configJson.Install_Doc)); // CopyRight File @@ -297,7 +296,7 @@ private bool ShouldSurroundWithQuotes(string argument) } /// - /// Model classes for reading and storing the JSON. + /// Model classes for reading and storing the JSON. /// private class ConfigJson { diff --git a/src/Microsoft.DotNet.Build.Tasks.Installers/src/ExecWithRetries.cs b/src/Microsoft.DotNet.Build.Tasks.Installers/src/ExecWithRetries.cs index 3beaa96ec29b..d1c62f1ed890 100644 --- a/src/Microsoft.DotNet.Build.Tasks.Installers/src/ExecWithRetries.cs +++ b/src/Microsoft.DotNet.Build.Tasks.Installers/src/ExecWithRetries.cs @@ -1,6 +1,5 @@ // 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. // Initially copied from https://github.com/dotnet/buildtools/blob/6736870b84e06b75e7df32bb84d442db1b2afa10/src/Microsoft.DotNet.Build.Tasks/ExecWithRetries.cs @@ -33,7 +32,7 @@ public class ExecWithRetries : BuildTask, ICancelableTask /// /// A constant, in seconds, added to (base^retries) to find the delay before retrying. - /// + /// /// The default is -1 to make the first retry instant, because ((base^0)-1) == 0. /// public double RetryDelayConstant { get; set; } = -1; diff --git a/src/Microsoft.DotNet.Build.Tasks.Installers/src/GenerateCurrentVersion.cs b/src/Microsoft.DotNet.Build.Tasks.Installers/src/GenerateCurrentVersion.cs index 3c00c3a5f838..8680208bdb28 100644 --- a/src/Microsoft.DotNet.Build.Tasks.Installers/src/GenerateCurrentVersion.cs +++ b/src/Microsoft.DotNet.Build.Tasks.Installers/src/GenerateCurrentVersion.cs @@ -1,6 +1,5 @@ // 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 Microsoft.Build.Framework; using System; diff --git a/src/Microsoft.DotNet.Build.Tasks.Installers/src/GenerateGuidFromName.cs b/src/Microsoft.DotNet.Build.Tasks.Installers/src/GenerateGuidFromName.cs index 678b32a61a00..6884a0d45223 100644 --- a/src/Microsoft.DotNet.Build.Tasks.Installers/src/GenerateGuidFromName.cs +++ b/src/Microsoft.DotNet.Build.Tasks.Installers/src/GenerateGuidFromName.cs @@ -1,6 +1,5 @@ // 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 Microsoft.Build.Framework; using System; diff --git a/src/Microsoft.DotNet.Build.Tasks.Installers/src/GenerateJsonObjectString.cs b/src/Microsoft.DotNet.Build.Tasks.Installers/src/GenerateJsonObjectString.cs index 189b1b3d0eb2..5fe8ac0ab8ab 100644 --- a/src/Microsoft.DotNet.Build.Tasks.Installers/src/GenerateJsonObjectString.cs +++ b/src/Microsoft.DotNet.Build.Tasks.Installers/src/GenerateJsonObjectString.cs @@ -1,6 +1,5 @@ // 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 Microsoft.Build.Framework; using System; @@ -18,7 +17,7 @@ public class GenerateJsonObjectString : BuildTask /// /// Properties to include. If multiple properties have the same name, each property value is /// included in an array. Only specify one value metadata: the first value is used. - /// + /// /// %(Identity): Name of the property. /// %(String): String value of the property. This task adds quotes around it in the JSON. /// %(Object): Object value of the property. Create this with a nested call to this task. diff --git a/src/Microsoft.DotNet.Build.Tasks.Installers/src/GenerateMacOSDistributionFile.cs b/src/Microsoft.DotNet.Build.Tasks.Installers/src/GenerateMacOSDistributionFile.cs index 54f0bfe3cff3..f7373ff4fb5a 100644 --- a/src/Microsoft.DotNet.Build.Tasks.Installers/src/GenerateMacOSDistributionFile.cs +++ b/src/Microsoft.DotNet.Build.Tasks.Installers/src/GenerateMacOSDistributionFile.cs @@ -1,6 +1,5 @@ // 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 Microsoft.Build.Framework; using Microsoft.Build.Utilities; @@ -53,7 +52,7 @@ public override bool Execute() .Select(component => new XElement("pkg-ref", new XAttribute("id", component.GetMetadata("FileNameWithExtension")), component.GetMetadata("FileNameWithExtension"))); - + var optionsElement = document.Root.Element("options"); bool templateHasOptions = optionsElement is not null; if (!templateHasOptions) @@ -69,7 +68,7 @@ public override bool Execute() } optionsElement.Add(new XAttribute("hostArchitectures", hostArchitecture)); } - + if (!templateHasOptions) { document.Root.Add(optionsElement); diff --git a/src/Microsoft.DotNet.Build.Tasks.Installers/src/GenerateMsiVersion.cs b/src/Microsoft.DotNet.Build.Tasks.Installers/src/GenerateMsiVersion.cs index fefcb0a13a53..95ba0420bffb 100644 --- a/src/Microsoft.DotNet.Build.Tasks.Installers/src/GenerateMsiVersion.cs +++ b/src/Microsoft.DotNet.Build.Tasks.Installers/src/GenerateMsiVersion.cs @@ -1,6 +1,5 @@ // 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 Microsoft.Build.Framework; diff --git a/src/Microsoft.DotNet.Build.Tasks.Installers/src/StabilizeWixFileId.cs b/src/Microsoft.DotNet.Build.Tasks.Installers/src/StabilizeWixFileId.cs index a0a2f1fa1c31..26d52789ed91 100644 --- a/src/Microsoft.DotNet.Build.Tasks.Installers/src/StabilizeWixFileId.cs +++ b/src/Microsoft.DotNet.Build.Tasks.Installers/src/StabilizeWixFileId.cs @@ -1,6 +1,5 @@ // 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 Microsoft.Build.Framework; using System; @@ -18,9 +17,9 @@ public class StabilizeWixFileId : BuildTask { /// /// File to read from. This is expected to be an output from heat.exe. - /// + /// /// Expected format: - /// + /// /// /// /// @@ -41,7 +40,7 @@ public class StabilizeWixFileId : BuildTask /// /// Set of files to stabilize. This matches the end of the "Source" attribute in the WiX /// source file. If exactly one match isn't found in the WiX source file, this task fails. - /// + /// /// %(Identity): The file source to replace. /// %(ReplacementId): The replacement for Id that won't change per-build. /// diff --git a/src/Microsoft.DotNet.Build.Tasks.VisualStudio/Microsoft.DotNet.Build.Tasks.VisualStudio.csproj b/src/Microsoft.DotNet.Build.Tasks.VisualStudio/Microsoft.DotNet.Build.Tasks.VisualStudio.csproj index e1ff2fd44b7e..ef3b7fb6bb9a 100644 --- a/src/Microsoft.DotNet.Build.Tasks.VisualStudio/Microsoft.DotNet.Build.Tasks.VisualStudio.csproj +++ b/src/Microsoft.DotNet.Build.Tasks.VisualStudio/Microsoft.DotNet.Build.Tasks.VisualStudio.csproj @@ -1,4 +1,4 @@ - + net472 diff --git a/src/Microsoft.DotNet.NuGetRepack/tasks/Microsoft.DotNet.NuGetRepack.Tasks.csproj b/src/Microsoft.DotNet.NuGetRepack/tasks/Microsoft.DotNet.NuGetRepack.Tasks.csproj index 6a1cee079327..4ff934b63d8e 100644 --- a/src/Microsoft.DotNet.NuGetRepack/tasks/Microsoft.DotNet.NuGetRepack.Tasks.csproj +++ b/src/Microsoft.DotNet.NuGetRepack/tasks/Microsoft.DotNet.NuGetRepack.Tasks.csproj @@ -1,4 +1,4 @@ - + net472;netcoreapp3.1 @@ -20,7 +20,7 @@ - + diff --git a/src/Microsoft.DotNet.NuGetRepack/tasks/src/NuGetUtils.cs b/src/Microsoft.DotNet.NuGetRepack/tasks/src/NuGetUtils.cs index d985a9e8440d..260befb6ef18 100644 --- a/src/Microsoft.DotNet.NuGetRepack/tasks/src/NuGetUtils.cs +++ b/src/Microsoft.DotNet.NuGetRepack/tasks/src/NuGetUtils.cs @@ -1,4 +1,5 @@ -// Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. using System; diff --git a/src/Microsoft.DotNet.NuGetRepack/tasks/src/NuGetVersionUpdater.cs b/src/Microsoft.DotNet.NuGetRepack/tasks/src/NuGetVersionUpdater.cs index ba7ce8bb7ec8..5dc8827485bb 100644 --- a/src/Microsoft.DotNet.NuGetRepack/tasks/src/NuGetVersionUpdater.cs +++ b/src/Microsoft.DotNet.NuGetRepack/tasks/src/NuGetVersionUpdater.cs @@ -1,4 +1,5 @@ -// Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. using System; using System.Collections.Generic; @@ -239,7 +240,7 @@ private static void LoadPackages(IEnumerable packagePaths, Dictionary packages, strin package.SpecificationXml.Save(package.SpecificationStream); package.Package.Close(); - + string finalPath = Path.Combine(outDirectory, package.Id + "." + package.NewVersion + ".nupkg"); try diff --git a/src/Microsoft.DotNet.NuGetRepack/tasks/src/ReplacePackageParts.cs b/src/Microsoft.DotNet.NuGetRepack/tasks/src/ReplacePackageParts.cs index 6f7045be7ae4..8e6563b8d147 100644 --- a/src/Microsoft.DotNet.NuGetRepack/tasks/src/ReplacePackageParts.cs +++ b/src/Microsoft.DotNet.NuGetRepack/tasks/src/ReplacePackageParts.cs @@ -1,4 +1,5 @@ -// Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. using System; using System.Collections.Generic; diff --git a/src/Microsoft.DotNet.NuGetRepack/tasks/src/UpdatePackageVersionTask.cs b/src/Microsoft.DotNet.NuGetRepack/tasks/src/UpdatePackageVersionTask.cs index 15731be682d4..863dd049ca40 100644 --- a/src/Microsoft.DotNet.NuGetRepack/tasks/src/UpdatePackageVersionTask.cs +++ b/src/Microsoft.DotNet.NuGetRepack/tasks/src/UpdatePackageVersionTask.cs @@ -1,4 +1,5 @@ -// Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. using System; using System.Collections.Generic; diff --git a/src/Microsoft.DotNet.NuGetRepack/tests/Microsoft.DotNet.NuGetRepack.Tests.csproj b/src/Microsoft.DotNet.NuGetRepack/tests/Microsoft.DotNet.NuGetRepack.Tests.csproj index 98f73d71421f..f2b3eef1fb65 100644 --- a/src/Microsoft.DotNet.NuGetRepack/tests/Microsoft.DotNet.NuGetRepack.Tests.csproj +++ b/src/Microsoft.DotNet.NuGetRepack/tests/Microsoft.DotNet.NuGetRepack.Tests.csproj @@ -1,4 +1,4 @@ - + netcoreapp3.1 @@ -34,7 +34,7 @@ F.1.0.0-beta.12345.1.nupkg - + A.1.0.0-beta-final.nupkg diff --git a/src/Microsoft.DotNet.NuGetRepack/tests/ReplacePackagePartsTests.cs b/src/Microsoft.DotNet.NuGetRepack/tests/ReplacePackagePartsTests.cs index b873e8b1ba5b..c03085f75c26 100644 --- a/src/Microsoft.DotNet.NuGetRepack/tests/ReplacePackagePartsTests.cs +++ b/src/Microsoft.DotNet.NuGetRepack/tests/ReplacePackagePartsTests.cs @@ -1,4 +1,5 @@ -// Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. using System; using System.IO; diff --git a/src/Microsoft.DotNet.NuGetRepack/tests/TestHelpers/AssertEx.cs b/src/Microsoft.DotNet.NuGetRepack/tests/TestHelpers/AssertEx.cs index c254b131cfbf..5ae86b144aba 100644 --- a/src/Microsoft.DotNet.NuGetRepack/tests/TestHelpers/AssertEx.cs +++ b/src/Microsoft.DotNet.NuGetRepack/tests/TestHelpers/AssertEx.cs @@ -1,4 +1,5 @@ -// Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. using System; using System.Collections; diff --git a/src/Microsoft.DotNet.NuGetRepack/tests/TestHelpers/DiffUtil.cs b/src/Microsoft.DotNet.NuGetRepack/tests/TestHelpers/DiffUtil.cs index cc7fd418a7d4..d18497fbb55f 100644 --- a/src/Microsoft.DotNet.NuGetRepack/tests/TestHelpers/DiffUtil.cs +++ b/src/Microsoft.DotNet.NuGetRepack/tests/TestHelpers/DiffUtil.cs @@ -1,4 +1,5 @@ -// Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. using System; using System.Collections.Generic; @@ -213,23 +214,23 @@ protected double ComputeDistance(TSequence sequenceA, int lengthA, TSequence seq } /// - /// Calculates costs of all paths in an edit graph starting from vertex (0,0) and ending in vertex (lengthA, lengthB). + /// Calculates costs of all paths in an edit graph starting from vertex (0,0) and ending in vertex (lengthA, lengthB). /// /// /// The edit graph for A and B has a vertex at each point in the grid (i,j), i in [0, lengthA] and j in [0, lengthB]. - /// + /// /// The vertices of the edit graph are connected by horizontal, vertical, and diagonal directed edges to form a directed acyclic graph. - /// Horizontal edges connect each vertex to its right neighbor. + /// Horizontal edges connect each vertex to its right neighbor. /// Vertical edges connect each vertex to the neighbor below it. /// Diagonal edges connect vertex (i,j) to vertex (i-1,j-1) if (sequenceA[i-1],sequenceB[j-1]) is true. - /// - /// Editing starts with S = []. + /// + /// Editing starts with S = []. /// Move along horizontal edge (i-1,j)-(i,j) represents the fact that sequenceA[i-1] is not added to S. /// Move along vertical edge (i,j-1)-(i,j) represents an insert of sequenceB[j-1] to S. - /// Move along diagonal edge (i-1,j-1)-(i,j) represents an addition of sequenceB[j-1] to S via an acceptable + /// Move along diagonal edge (i-1,j-1)-(i,j) represents an addition of sequenceB[j-1] to S via an acceptable /// change of sequenceA[i-1] to sequenceB[j-1]. - /// - /// In every vertex the cheapest outgoing edge is selected. + /// + /// In every vertex the cheapest outgoing edge is selected. /// The number of diagonal edges on the path from (0,0) to (lengthA, lengthB) is the length of the longest common subsequence. /// private int[,] ComputeCostMatrix(TSequence sequenceA, int lengthA, TSequence sequenceB, int lengthB) diff --git a/src/Microsoft.DotNet.NuGetRepack/tests/TestHelpers/ResourceLoader.cs b/src/Microsoft.DotNet.NuGetRepack/tests/TestHelpers/ResourceLoader.cs index 011005dde01a..c0c34a418405 100644 --- a/src/Microsoft.DotNet.NuGetRepack/tests/TestHelpers/ResourceLoader.cs +++ b/src/Microsoft.DotNet.NuGetRepack/tests/TestHelpers/ResourceLoader.cs @@ -1,4 +1,5 @@ -// Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. using System; using System.IO; @@ -45,4 +46,4 @@ public static byte[] GetOrCreateResource(ref byte[] resource, string name) return resource; } } -} \ No newline at end of file +} diff --git a/src/Microsoft.DotNet.NuGetRepack/tests/TestHelpers/TestResources.cs b/src/Microsoft.DotNet.NuGetRepack/tests/TestHelpers/TestResources.cs index 27308dcb611f..bcc990b8220f 100644 --- a/src/Microsoft.DotNet.NuGetRepack/tests/TestHelpers/TestResources.cs +++ b/src/Microsoft.DotNet.NuGetRepack/tests/TestHelpers/TestResources.cs @@ -1,4 +1,5 @@ - // Copyright(c) Microsoft.All Rights Reserved.Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. namespace TestResources { diff --git a/src/Microsoft.DotNet.NuGetRepack/tests/VersionUpdaterTests.cs b/src/Microsoft.DotNet.NuGetRepack/tests/VersionUpdaterTests.cs index 60d4f84c97d6..61ab3cedfdaf 100644 --- a/src/Microsoft.DotNet.NuGetRepack/tests/VersionUpdaterTests.cs +++ b/src/Microsoft.DotNet.NuGetRepack/tests/VersionUpdaterTests.cs @@ -1,4 +1,5 @@ -// Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. using System; using System.IO; @@ -51,7 +52,7 @@ private static void AssertPackagesEqual(byte[] expected, byte[] actual) // change to match the platform that is executing. The reference packages that we use to validate // the SemVer tests were built on Windows which makes these test only valid for Windows. // - // This can be removed when https://github.com/dotnet/corefx/issues/39931 is fixed. + // This can be removed when https://github.com/dotnet/corefx/issues/39931 is fixed. [WindowsOnlyFact(Skip = "https://github.com/dotnet/arcade/issues/3794")] public void TestPackagesSemVer1() { diff --git a/src/Microsoft.DotNet.SharedFramework.Sdk/Microsoft.DotNet.SharedFramework.Sdk.csproj b/src/Microsoft.DotNet.SharedFramework.Sdk/Microsoft.DotNet.SharedFramework.Sdk.csproj index 4405a1fecaae..8478c79c8d2c 100644 --- a/src/Microsoft.DotNet.SharedFramework.Sdk/Microsoft.DotNet.SharedFramework.Sdk.csproj +++ b/src/Microsoft.DotNet.SharedFramework.Sdk/Microsoft.DotNet.SharedFramework.Sdk.csproj @@ -1,4 +1,4 @@ - + net472;netcoreapp3.1 @@ -44,11 +44,11 @@ - + - + diff --git a/src/Microsoft.DotNet.SharedFramework.Sdk/src/CreateFrameworkListFile.cs b/src/Microsoft.DotNet.SharedFramework.Sdk/src/CreateFrameworkListFile.cs index be0e8b2b6ecb..6e2e6f965e7e 100644 --- a/src/Microsoft.DotNet.SharedFramework.Sdk/src/CreateFrameworkListFile.cs +++ b/src/Microsoft.DotNet.SharedFramework.Sdk/src/CreateFrameworkListFile.cs @@ -1,6 +1,5 @@ // 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 Microsoft.Build.Framework; using Microsoft.DotNet.Build.Tasks; @@ -53,7 +52,7 @@ public class CreateFrameworkListFile : BuildTask /// /// Extra attributes to place on the root node. - /// + /// /// %(Identity): Attribute name. /// %(Value): Attribute value. /// @@ -239,7 +238,7 @@ public override bool Execute() if (f.IsNative) { - // presence of inclusion list indicates that + // presence of inclusion list indicates that // all other native files should be marked as "DropFromSingleFile" if (singleFileHostIncludeFilenames != null && !singleFileHostIncludeFilenames.Contains(f.Filename)) diff --git a/src/Microsoft.DotNet.SharedFramework.Sdk/src/FileUtilities.cs b/src/Microsoft.DotNet.SharedFramework.Sdk/src/FileUtilities.cs index 97ab8b182c86..b8d9348bf982 100644 --- a/src/Microsoft.DotNet.SharedFramework.Sdk/src/FileUtilities.cs +++ b/src/Microsoft.DotNet.SharedFramework.Sdk/src/FileUtilities.cs @@ -1,6 +1,5 @@ // 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.Collections.Generic; diff --git a/src/Microsoft.DotNet.SharedFramework.Sdk/src/GeneratePlatformManifestEntriesFromFileList.cs b/src/Microsoft.DotNet.SharedFramework.Sdk/src/GeneratePlatformManifestEntriesFromFileList.cs index 20ea4a123163..2e4ba8dd5a9f 100644 --- a/src/Microsoft.DotNet.SharedFramework.Sdk/src/GeneratePlatformManifestEntriesFromFileList.cs +++ b/src/Microsoft.DotNet.SharedFramework.Sdk/src/GeneratePlatformManifestEntriesFromFileList.cs @@ -1,6 +1,5 @@ // 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 Microsoft.Build.Framework; using Microsoft.Build.Utilities; diff --git a/src/Microsoft.DotNet.SharedFramework.Sdk/src/GeneratePlatformManifestEntriesFromTemplate.cs b/src/Microsoft.DotNet.SharedFramework.Sdk/src/GeneratePlatformManifestEntriesFromTemplate.cs index e8346c2b79a8..73f032a2d39a 100644 --- a/src/Microsoft.DotNet.SharedFramework.Sdk/src/GeneratePlatformManifestEntriesFromTemplate.cs +++ b/src/Microsoft.DotNet.SharedFramework.Sdk/src/GeneratePlatformManifestEntriesFromTemplate.cs @@ -1,6 +1,5 @@ // 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 Microsoft.Build.Framework; using Microsoft.Build.Utilities; diff --git a/src/Microsoft.DotNet.SharedFramework.Sdk/src/GenerateSharedFrameworkDepsFile.cs b/src/Microsoft.DotNet.SharedFramework.Sdk/src/GenerateSharedFrameworkDepsFile.cs index 84f7eda188b6..76b1c22d9de3 100644 --- a/src/Microsoft.DotNet.SharedFramework.Sdk/src/GenerateSharedFrameworkDepsFile.cs +++ b/src/Microsoft.DotNet.SharedFramework.Sdk/src/GenerateSharedFrameworkDepsFile.cs @@ -1,6 +1,5 @@ // 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 Microsoft.Build.Framework; using Microsoft.Build.Utilities; diff --git a/src/Microsoft.DotNet.SharedFramework.Sdk/src/Packaging/Extensions.cs b/src/Microsoft.DotNet.SharedFramework.Sdk/src/Packaging/Extensions.cs index f8da82b11985..be63e1cb5a5d 100644 --- a/src/Microsoft.DotNet.SharedFramework.Sdk/src/Packaging/Extensions.cs +++ b/src/Microsoft.DotNet.SharedFramework.Sdk/src/Packaging/Extensions.cs @@ -1,6 +1,5 @@ // 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 Microsoft.Build.Framework; using NuGet; diff --git a/src/Microsoft.DotNet.SharedFramework.Sdk/src/PlatformManifestEntry.cs b/src/Microsoft.DotNet.SharedFramework.Sdk/src/PlatformManifestEntry.cs index cf54a35ef064..74cb71351a90 100644 --- a/src/Microsoft.DotNet.SharedFramework.Sdk/src/PlatformManifestEntry.cs +++ b/src/Microsoft.DotNet.SharedFramework.Sdk/src/PlatformManifestEntry.cs @@ -1,6 +1,5 @@ // 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. namespace Microsoft.DotNet.SharedFramework.Sdk { diff --git a/src/Microsoft.DotNet.SharedFramework.Sdk/src/ValidateFileVersions.cs b/src/Microsoft.DotNet.SharedFramework.Sdk/src/ValidateFileVersions.cs index 7942a4bb7beb..2946be252769 100644 --- a/src/Microsoft.DotNet.SharedFramework.Sdk/src/ValidateFileVersions.cs +++ b/src/Microsoft.DotNet.SharedFramework.Sdk/src/ValidateFileVersions.cs @@ -1,6 +1,5 @@ // 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 Microsoft.Build.Construction; using Microsoft.Build.Framework; @@ -54,7 +53,7 @@ public override bool Execute() } } - if (current.FileVersion != null && + if (current.FileVersion != null && existing.FileVersion != null) { if (current.FileVersion > existing.FileVersion)