Skip to content

Commit abdae59

Browse files
author
Simon Zhao (BEYONDSOFT CONSULTING INC)
committed
Merge branch 'release/10.0.2xx' of https://github.com/dotnet/templating into merge/release/10.0.1xx-to-release/10.0.2xx
2 parents da9fa0f + 6804472 commit abdae59

File tree

19 files changed

+78
-67
lines changed

19 files changed

+78
-67
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -258,3 +258,4 @@ Microsoft.TemplateEngine.VC.db
258258

259259
#Rider
260260
.idea/
261+
.nuget/

‎NuGet.config‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
<clear />
55
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
66
<!-- Begin: Package sources from dotnet-dotnet -->
7-
<add key="darc-pub-dotnet-dotnet-976695d" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-dotnet-976695d4/nuget/v3/index.json" />
87
<!-- End: Package sources from dotnet-dotnet -->
98
<!-- Begin: Package sources from dotnet-runtime -->
109
<!-- End: Package sources from dotnet-runtime -->

‎eng/Version.Details.props‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ This file should be imported by eng/Versions.props
66
<Project>
77
<PropertyGroup>
88
<!-- dotnet/dotnet dependencies -->
9-
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.26062.108</MicrosoftDotNetArcadeSdkPackageVersion>
10-
<SystemCommandLinePackageVersion>2.0.3</SystemCommandLinePackageVersion>
9+
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.26059.104</MicrosoftDotNetArcadeSdkPackageVersion>
10+
<SystemCommandLinePackageVersion>2.0.1</SystemCommandLinePackageVersion>
1111
<!-- _git/dotnet-runtime dependencies -->
1212
<MicrosoftBclAsyncInterfacesPackageVersion>10.0.1</MicrosoftBclAsyncInterfacesPackageVersion>
1313
<MicrosoftExtensionsLoggingPackageVersion>10.0.1</MicrosoftExtensionsLoggingPackageVersion>

‎eng/Version.Details.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
3-
<Source Uri="https://github.com/dotnet/dotnet" Mapping="templating" Sha="976695d40cfde0801c78b8fed85ca80e997da085" BarId="297004" />
3+
<Source Uri="https://github.com/dotnet/dotnet" Mapping="templating" Sha="2956fcc86899a04394ca9c5387b37475408ea199" BarId="296620" />
44
<ProductDependencies>
5-
<Dependency Name="System.CommandLine" Version="2.0.3">
5+
<Dependency Name="System.CommandLine" Version="2.0.1">
66
<Uri>https://github.com/dotnet/dotnet</Uri>
7-
<Sha>976695d40cfde0801c78b8fed85ca80e997da085</Sha>
7+
<Sha>115a29577547ce136b754d96d2ebfb184595a923</Sha>
88
</Dependency>
99
</ProductDependencies>
1010
<ToolsetDependencies>
11-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.26062.108">
11+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.26059.104">
1212
<Uri>https://github.com/dotnet/dotnet</Uri>
13-
<Sha>976695d40cfde0801c78b8fed85ca80e997da085</Sha>
13+
<Sha>2956fcc86899a04394ca9c5387b37475408ea199</Sha>
1414
</Dependency>
1515
<!-- Dependencies required for source build. We'll still update manually -->
1616
<Dependency Name="System.Formats.Asn1" Version="10.0.1">

‎eng/Versions.props‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
<Project>
2-
3-
<Import Project="Version.Details.props" />
4-
2+
<Import Project="Version.Details.props" Condition="Exists('Version.Details.props')" />
53
<PropertyGroup>
6-
<VersionPrefix>10.0.103</VersionPrefix>
7-
<PreReleaseVersionLabel>servicing</PreReleaseVersionLabel>
8-
<PreReleaseVersionIteration></PreReleaseVersionIteration>
9-
<!-- Allowed values: '', 'prerelease', 'release'. Set to 'release' when stabilizing. -->
10-
<DotNetFinalVersionKind></DotNetFinalVersionKind>
11-
12-
<!-- Opt-in/out repo features -->
4+
<VersionPrefix>10.0.200</VersionPrefix>
5+
<!-- When StabilizePackageVersion is set to 'true', this branch will produce stable outputs for 'Shipping' packages -->
6+
<StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">false</StabilizePackageVersion>
7+
<DotNetFinalVersionKind Condition="'$(StabilizePackageVersion)' == 'true'">release</DotNetFinalVersionKind>
8+
<!-- Calculate prerelease label -->
9+
<PreReleaseVersionLabel Condition="'$(StabilizePackageVersion)' != 'true'">preview</PreReleaseVersionLabel>
10+
<PreReleaseVersionLabel Condition="'$(StabilizePackageVersion)' == 'true' and $(VersionPrefix.EndsWith('00'))">rtm</PreReleaseVersionLabel>
11+
<PreReleaseVersionLabel Condition="'$(StabilizePackageVersion)' == 'true' and !$(VersionPrefix.EndsWith('00'))">servicing</PreReleaseVersionLabel>
12+
<PreReleaseVersionIteration Condition="'$(StabilizePackageVersion)' != 'true'"></PreReleaseVersionIteration>
1313
<UsingToolXliff>true</UsingToolXliff>
14+
<FlagNetStandard1XDependencies>true</FlagNetStandard1XDependencies>
1415
</PropertyGroup>
15-
1616
</Project>

‎eng/common/tools.ps1‎

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -560,26 +560,19 @@ function LocateVisualStudio([object]$vsRequirements = $null){
560560
})
561561
}
562562

563-
if (!$vsRequirements) {
564-
if (Get-Member -InputObject $GlobalJson.tools -Name 'vs' -ErrorAction SilentlyContinue) {
565-
$vsRequirements = $GlobalJson.tools.vs
566-
} else {
567-
$vsRequirements = $null
568-
}
569-
}
570-
563+
if (!$vsRequirements) { $vsRequirements = $GlobalJson.tools.vs }
571564
$args = @('-latest', '-format', 'json', '-requires', 'Microsoft.Component.MSBuild', '-products', '*')
572565

573566
if (!$excludePrereleaseVS) {
574567
$args += '-prerelease'
575568
}
576569

577-
if ($vsRequirements -and (Get-Member -InputObject $vsRequirements -Name 'version' -ErrorAction SilentlyContinue)) {
570+
if (Get-Member -InputObject $vsRequirements -Name 'version') {
578571
$args += '-version'
579572
$args += $vsRequirements.version
580573
}
581574

582-
if ($vsRequirements -and (Get-Member -InputObject $vsRequirements -Name 'components' -ErrorAction SilentlyContinue)) {
575+
if (Get-Member -InputObject $vsRequirements -Name 'components') {
583576
foreach ($component in $vsRequirements.components) {
584577
$args += '-requires'
585578
$args += $component

‎global.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@
1313
"dotnet": "10.0.101"
1414
},
1515
"msbuild-sdks": {
16-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26062.108"
16+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26059.104"
1717
}
1818
}

‎src/Microsoft.TemplateEngine.Abstractions/Installer/InstallRequest.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public InstallRequest(string identifier, string? version = null, string? install
2424
/// <summary>
2525
/// Name to be used when display the request.
2626
/// </summary>
27-
public string DisplayName => string.IsNullOrWhiteSpace(Version) ? PackageIdentifier : $"{PackageIdentifier}::{Version}";
27+
public string DisplayName => string.IsNullOrWhiteSpace(Version) ? PackageIdentifier : $"{PackageIdentifier}@{Version}";
2828

2929
/// <summary>
3030
/// Installer to be used to install the request.

‎src/Microsoft.TemplateEngine.Edge/Installers/NuGet/Exceptions/DownloadException.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,21 +5,21 @@ namespace Microsoft.TemplateEngine.Edge.Installers.NuGet
55
{
66
internal class DownloadException : Exception
77
{
8-
public DownloadException(string packageIdentifier, string packageVersion, string filePath) : base($"Failed to download {packageIdentifier}::{packageVersion} from {filePath}")
8+
public DownloadException(string packageIdentifier, string packageVersion, string filePath) : base($"Failed to download {packageIdentifier}@{packageVersion} from {filePath}")
99
{
1010
PackageIdentifier = packageIdentifier;
1111
PackageVersion = packageVersion;
1212
PackageLocation = filePath;
1313
}
1414

15-
public DownloadException(string packageIdentifier, string packageVersion, IEnumerable<string> attemptedSources) : base($"Failed to download {packageIdentifier}::{packageVersion} from NuGet feeds {string.Join(";", attemptedSources)}")
15+
public DownloadException(string packageIdentifier, string packageVersion, IEnumerable<string> attemptedSources) : base($"Failed to download {packageIdentifier}@{packageVersion} from NuGet feeds {string.Join(";", attemptedSources)}")
1616
{
1717
PackageIdentifier = packageIdentifier;
1818
PackageVersion = packageVersion;
1919
SourcesList = attemptedSources;
2020
}
2121

22-
public DownloadException(string packageIdentifier, string packageVersion, IEnumerable<string> attemptedSources, Exception inner) : base($"Failed to download {packageIdentifier}::{packageVersion} from NuGet feeds {string.Join(";", attemptedSources)}", inner)
22+
public DownloadException(string packageIdentifier, string packageVersion, IEnumerable<string> attemptedSources, Exception inner) : base($"Failed to download {packageIdentifier}@{packageVersion} from NuGet feeds {string.Join(";", attemptedSources)}", inner)
2323
{
2424
PackageIdentifier = packageIdentifier;
2525
PackageVersion = packageVersion;

‎src/Microsoft.TemplateEngine.Edge/Installers/NuGet/Exceptions/PackageNotFoundException.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ internal class PackageNotFoundException : Exception
1313
SourcesList = attemptedSources;
1414
}
1515

16-
public PackageNotFoundException(string packageIdentifier, NuGetVersion packageVersion, IEnumerable<string> attemptedSources) : base($"{packageIdentifier}::{packageVersion} was not found in NuGet feeds {string.Join(";", attemptedSources)}")
16+
public PackageNotFoundException(string packageIdentifier, NuGetVersion packageVersion, IEnumerable<string> attemptedSources) : base($"{packageIdentifier}@{packageVersion} was not found in NuGet feeds {string.Join(";", attemptedSources)}")
1717
{
1818
PackageIdentifier = packageIdentifier;
1919
PackageVersion = packageVersion;

0 commit comments

Comments
 (0)