Merge release/2.0.0 to release/2.1 #1890
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Updating repo-toolset to 1.0.0-beta-62519-01
livarcocc
deleted the
merges/release/2.0.0-to-release/2.1-20180124-080048
branch
|
Don’t squash prs that merge between branches, even if no-op. Git won’t see that the branches are merged and the bot will try again |
johnbeisner
pushed a commit
that referenced
this pull request
Jan 26, 2018
johnbeisner
pushed a commit
that referenced
this pull request
Jan 30, 2018
GangWang01
pushed a commit
to GangWang01/sdk
that referenced
this pull request
Jun 7, 2022
* Join macro * Make default format for the GUID macro overridable Fixes dotnet#1737 * Add links to the different template content repos in the readme * Convert repo list to bullets * Adding netstandard2.1 to the list of TFMs for 3.0 * Releases the original source location mount point * Change Build pool for internal builds (dotnet#1823) * Removing the SourceLink packages since it is provided by Arcade * Lowercase the content include path in the template pack csproj files * Add gitignore template * Update azure-pipelines.yml * Update web.config item template This updates the web.config item template to align with what `dotnet publish` produces when publishing * Update template_feed/Microsoft.DotNet.Common.ItemTemplates/content/WebConfig/web.config Co-Authored-By: Justin Kotalik <jukotali@microsoft.com> * Merge master into stabilize (dotnet#1905) * Update dependencies from https://github.com/dotnet/arcade build 20190418.7 (dotnet#1867) - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19218.7 * Update dependencies from https://github.com/dotnet/arcade build 20190422.2 (dotnet#1870) - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19222.2 * Update dependencies from https://github.com/dotnet/arcade build 20190423.2 (dotnet#1871) - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19223.2 * Update dependencies from https://github.com/dotnet/arcade build 20190424.9 (dotnet#1873) - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19224.9 * Update dependencies from https://github.com/dotnet/arcade build 20190425.5 (dotnet#1874) - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19225.5 * Update dependencies from https://github.com/dotnet/arcade build 20190426.3 (dotnet#1875) - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19226.3 * Update dependencies from https://github.com/dotnet/arcade build 20190429.8 (dotnet#1876) - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19229.8 * Update dependencies from https://github.com/dotnet/arcade build 20190430.6 (dotnet#1877) - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19230.6 * [master] Update dependencies from dotnet/arcade (dotnet#1879) * Update dependencies from https://github.com/dotnet/arcade build 20190501.6 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19251.6 * Update dependencies from https://github.com/dotnet/arcade build 20190502.2 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19252.2 * Update dependencies from https://github.com/dotnet/arcade build 20190503.8 (dotnet#1881) - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19253.8 * Update dependencies from https://github.com/dotnet/arcade build 20190504.1 (dotnet#1882) - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19254.1 * Update dependencies from https://github.com/dotnet/arcade build 20190505.2 (dotnet#1883) - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19255.2 * Update dependencies from https://github.com/dotnet/arcade build 20190506.12 (dotnet#1886) - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19256.12 * [master] Update dependencies from dotnet/arcade (dotnet#1888) * Update dependencies from https://github.com/dotnet/arcade build 20190507.7 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19257.7 * Update dependencies from https://github.com/dotnet/arcade build 20190508.5 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19258.5 * Update dependencies from https://github.com/dotnet/arcade build 20190509.9 (dotnet#1889) - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19259.9 * Update dependencies from https://github.com/dotnet/arcade build 20190510.2 (dotnet#1890) - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19260.2 * Update dependencies from https://github.com/dotnet/arcade build 20190511.1 (dotnet#1891) - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19261.1 * Update dependencies from https://github.com/dotnet/arcade build 20190512.1 (dotnet#1892) - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19262.1 * Update dependencies from https://github.com/dotnet/arcade build 20190513.3 (dotnet#1893) - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19263.3 * [master] Update dependencies from dotnet/arcade (dotnet#1895) * Update dependencies from https://github.com/dotnet/arcade build 20190514.13 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19264.13 * Update dependencies from https://github.com/dotnet/arcade build 20190516.2 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19266.2 * Update dependencies from https://github.com/dotnet/arcade build 20190516.4 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19266.4 * Update dependencies from https://github.com/dotnet/arcade build 20190517.7 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19267.7 * Update dependencies from https://github.com/dotnet/arcade build 20190518.2 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19268.2 * Update dependencies from https://github.com/dotnet/arcade build 20190520.1 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19270.1 * Update dependencies from https://github.com/dotnet/arcade build 20190520.2 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19270.2 * Updating the glob.json to include the 2.1.x version * Update dependencies from https://github.com/dotnet/arcade build 20190521.7 (dotnet#1897) - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19271.7 * Update dependencies from https://github.com/dotnet/arcade build 20190522.13 (dotnet#1898) - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19272.13 * Update dependencies from https://github.com/dotnet/arcade build 20190523.11 (dotnet#1899) - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19273.11 * Update dependencies from https://github.com/dotnet/arcade build 20190524.6 (dotnet#1901) - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19274.6 * Update dependencies from https://github.com/dotnet/arcade build 20190528.1 (dotnet#1903) - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19278.1 * Merging stabilize into master (dotnet#1904) * Join macro * Make default format for the GUID macro overridable Fixes dotnet#1737 * Add links to the different template content repos in the readme * Convert repo list to bullets * Adding netstandard2.1 to the list of TFMs for 3.0 * Releases the original source location mount point * Change Build pool for internal builds (dotnet#1823) * Removing the SourceLink packages since it is provided by Arcade * Lowercase the content include path in the template pack csproj files * Add gitignore template * Update azure-pipelines.yml * Update web.config item template This updates the web.config item template to align with what `dotnet publish` produces when publishing * Update template_feed/Microsoft.DotNet.Common.ItemTemplates/content/WebConfig/web.config Co-Authored-By: Justin Kotalik <jukotali@microsoft.com> * Update --langVersion option's description * Removing Microsoft.Extensions.CommandLineUtils references from the repo
GangWang01
pushed a commit
to GangWang01/sdk
that referenced
this pull request
Jul 11, 2022
* Join macro * Make default format for the GUID macro overridable Fixes dotnet#1737 * Add links to the different template content repos in the readme * Convert repo list to bullets * Adding netstandard2.1 to the list of TFMs for 3.0 * Releases the original source location mount point * Change Build pool for internal builds (dotnet#1823) * Removing the SourceLink packages since it is provided by Arcade * Lowercase the content include path in the template pack csproj files * Add gitignore template * Update azure-pipelines.yml * Update web.config item template This updates the web.config item template to align with what `dotnet publish` produces when publishing * Update template_feed/Microsoft.DotNet.Common.ItemTemplates/content/WebConfig/web.config Co-Authored-By: Justin Kotalik <jukotali@microsoft.com> * Merge master into stabilize (dotnet#1905) * Update dependencies from https://github.com/dotnet/arcade build 20190418.7 (dotnet#1867) - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19218.7 * Update dependencies from https://github.com/dotnet/arcade build 20190422.2 (dotnet#1870) - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19222.2 * Update dependencies from https://github.com/dotnet/arcade build 20190423.2 (dotnet#1871) - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19223.2 * Update dependencies from https://github.com/dotnet/arcade build 20190424.9 (dotnet#1873) - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19224.9 * Update dependencies from https://github.com/dotnet/arcade build 20190425.5 (dotnet#1874) - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19225.5 * Update dependencies from https://github.com/dotnet/arcade build 20190426.3 (dotnet#1875) - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19226.3 * Update dependencies from https://github.com/dotnet/arcade build 20190429.8 (dotnet#1876) - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19229.8 * Update dependencies from https://github.com/dotnet/arcade build 20190430.6 (dotnet#1877) - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19230.6 * [master] Update dependencies from dotnet/arcade (dotnet#1879) * Update dependencies from https://github.com/dotnet/arcade build 20190501.6 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19251.6 * Update dependencies from https://github.com/dotnet/arcade build 20190502.2 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19252.2 * Update dependencies from https://github.com/dotnet/arcade build 20190503.8 (dotnet#1881) - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19253.8 * Update dependencies from https://github.com/dotnet/arcade build 20190504.1 (dotnet#1882) - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19254.1 * Update dependencies from https://github.com/dotnet/arcade build 20190505.2 (dotnet#1883) - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19255.2 * Update dependencies from https://github.com/dotnet/arcade build 20190506.12 (dotnet#1886) - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19256.12 * [master] Update dependencies from dotnet/arcade (dotnet#1888) * Update dependencies from https://github.com/dotnet/arcade build 20190507.7 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19257.7 * Update dependencies from https://github.com/dotnet/arcade build 20190508.5 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19258.5 * Update dependencies from https://github.com/dotnet/arcade build 20190509.9 (dotnet#1889) - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19259.9 * Update dependencies from https://github.com/dotnet/arcade build 20190510.2 (dotnet#1890) - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19260.2 * Update dependencies from https://github.com/dotnet/arcade build 20190511.1 (dotnet#1891) - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19261.1 * Update dependencies from https://github.com/dotnet/arcade build 20190512.1 (dotnet#1892) - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19262.1 * Update dependencies from https://github.com/dotnet/arcade build 20190513.3 (dotnet#1893) - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19263.3 * [master] Update dependencies from dotnet/arcade (dotnet#1895) * Update dependencies from https://github.com/dotnet/arcade build 20190514.13 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19264.13 * Update dependencies from https://github.com/dotnet/arcade build 20190516.2 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19266.2 * Update dependencies from https://github.com/dotnet/arcade build 20190516.4 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19266.4 * Update dependencies from https://github.com/dotnet/arcade build 20190517.7 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19267.7 * Update dependencies from https://github.com/dotnet/arcade build 20190518.2 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19268.2 * Update dependencies from https://github.com/dotnet/arcade build 20190520.1 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19270.1 * Update dependencies from https://github.com/dotnet/arcade build 20190520.2 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19270.2 * Updating the glob.json to include the 2.1.x version * Update dependencies from https://github.com/dotnet/arcade build 20190521.7 (dotnet#1897) - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19271.7 * Update dependencies from https://github.com/dotnet/arcade build 20190522.13 (dotnet#1898) - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19272.13 * Update dependencies from https://github.com/dotnet/arcade build 20190523.11 (dotnet#1899) - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19273.11 * Update dependencies from https://github.com/dotnet/arcade build 20190524.6 (dotnet#1901) - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19274.6 * Update dependencies from https://github.com/dotnet/arcade build 20190528.1 (dotnet#1903) - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19278.1 * Merging stabilize into master (dotnet#1904) * Join macro * Make default format for the GUID macro overridable Fixes dotnet#1737 * Add links to the different template content repos in the readme * Convert repo list to bullets * Adding netstandard2.1 to the list of TFMs for 3.0 * Releases the original source location mount point * Change Build pool for internal builds (dotnet#1823) * Removing the SourceLink packages since it is provided by Arcade * Lowercase the content include path in the template pack csproj files * Add gitignore template * Update azure-pipelines.yml * Update web.config item template This updates the web.config item template to align with what `dotnet publish` produces when publishing * Update template_feed/Microsoft.DotNet.Common.ItemTemplates/content/WebConfig/web.config Co-Authored-By: Justin Kotalik <jukotali@microsoft.com> * Update --langVersion option's description * Removing Microsoft.Extensions.CommandLineUtils references from the repo
JL03-Yue
pushed a commit
that referenced
this pull request
Mar 19, 2024
…e/6.x Merge release/6.0.3xx to release/6.x
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is an automatically generated pull request from release/2.0.0 into release/2.1.
git fetch --all git checkout merges/release/2.0.0-to-release/2.1-20180124-080048 git reset --hard upstream/release/2.1 git merge upstream/release/2.0.0 # Fix merge conflicts git commit git push merges/release/2.0.0-to-release/2.1-20180124-080048 --forceOnce all conflicts are resolved and all the tests pass, you are free to merge the pull request.