Skip to content

Commit e1e0588

Browse files
[main] Source code updates from dotnet/templating (#1493)
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent c1dbdfb commit e1e0588

File tree

5 files changed

+21
-14
lines changed

5 files changed

+21
-14
lines changed

src/source-manifest.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,10 +121,10 @@
121121
"commitSha": "66c6797a1e9a9346d5f6de3f9edaecad6e4350d0"
122122
},
123123
{
124-
"barId": 274065,
124+
"barId": 275177,
125125
"path": "templating",
126126
"remoteUri": "https://github.com/dotnet/templating",
127-
"commitSha": "57150459685ad38272234d96c17036c2cd2f3b96"
127+
"commitSha": "43d52c423e7ed37cf59a01629f9bace5c6bf6f96"
128128
},
129129
{
130130
"barId": 272429,

src/templating/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="eaa19c281d34580a8168cff9ce1e7337da8bfe4f" BarId="273855" />
3+
<Source Uri="https://github.com/dotnet/dotnet" Mapping="templating" Sha="0b032b9f942c1ae8de535a434c4f4a9206fd3339" BarId="275039" />
44
<ProductDependencies>
5-
<Dependency Name="System.CommandLine" Version="2.0.0-beta6.25351.106">
5+
<Dependency Name="System.CommandLine" Version="2.0.0-beta7.25363.101">
66
<Uri>https://github.com/dotnet/dotnet</Uri>
7-
<Sha>eaa19c281d34580a8168cff9ce1e7337da8bfe4f</Sha>
7+
<Sha>0b032b9f942c1ae8de535a434c4f4a9206fd3339</Sha>
88
</Dependency>
99
</ProductDependencies>
1010
<ToolsetDependencies>
11-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25351.106">
11+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25363.101">
1212
<Uri>https://github.com/dotnet/dotnet</Uri>
13-
<Sha>eaa19c281d34580a8168cff9ce1e7337da8bfe4f</Sha>
13+
<Sha>0b032b9f942c1ae8de535a434c4f4a9206fd3339</Sha>
1414
</Dependency>
1515
<!-- Dependencies required for source build. We'll still update manually -->
1616
<Dependency Name="System.Formats.Asn1" Version="9.0.3">

src/templating/eng/Versions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<PropertyGroup>
1616
<!-- Non-maestro versions -->
1717
<SystemFormatsAsn1Version>9.0.3</SystemFormatsAsn1Version>
18-
<SystemCommandLinePackageVersion>2.0.0-beta6.25351.106</SystemCommandLinePackageVersion>
18+
<SystemCommandLinePackageVersion>2.0.0-beta7.25363.101</SystemCommandLinePackageVersion>
1919
<MicrosoftExtensionsLoggingPackageVersion>9.0.3</MicrosoftExtensionsLoggingPackageVersion>
2020
<MicrosoftExtensionsLoggingAbstractionsPackageVersion>9.0.3</MicrosoftExtensionsLoggingAbstractionsPackageVersion>
2121
<MicrosoftExtensionsLoggingConsolePackageVersion>9.0.3</MicrosoftExtensionsLoggingConsolePackageVersion>

src/templating/global.json

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,18 @@
11
{
2+
"sdk": {
3+
"version": "10.0.100-preview.7.25322.101",
4+
"allowPrerelease": true,
5+
"rollForward": "latestFeature",
6+
"paths": [
7+
".dotnet",
8+
"$host$"
9+
],
10+
"errorMessage": "The required .NET SDK wasn't found. Please run ./eng/common/dotnet.cmd/sh to install it."
11+
},
212
"tools": {
3-
"dotnet": "10.0.100-preview.6.25315.102"
13+
"dotnet": "10.0.100-preview.7.25322.101"
414
},
515
"msbuild-sdks": {
6-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25351.106"
16+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25363.101"
717
}
818
}

src/templating/tools/Microsoft.TemplateEngine.Authoring.CLI/Program.cs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,7 @@ internal static Task<int> Main(string[] args)
1616
rootCommand.Subcommands.Add(new VerifyCommand());
1717
rootCommand.Subcommands.Add(new ValidateCommand());
1818

19-
return rootCommand.Parse(args, new CommandLineConfiguration(rootCommand)
20-
{
21-
EnablePosixBundling = false,
22-
}).InvokeAsync();
19+
return rootCommand.Parse(args, new() { EnablePosixBundling = false }).InvokeAsync();
2320
}
2421
}
2522
}

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy