Skip to content

Commit a86bc78

Browse files
author
Mirroring
committed
Merge commit '4710a90862ddcd13bc7edce6ea12a86f583c0f49'
2 parents 93b9d2b + 4710a90 commit a86bc78

File tree

5 files changed

+34
-14
lines changed

5 files changed

+34
-14
lines changed

‎NuGet.config‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,19 @@
66
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
77
<!-- Begin: Package sources from dotnet-runtime -->
88
<add key="darc-int-dotnet-runtime-c8acea2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-c8acea22/nuget/v3/index.json" />
9+
<add key="darc-int-dotnet-runtime-c8acea2-8" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-c8acea22-8/nuget/v3/index.json" />
10+
<add key="darc-int-dotnet-runtime-c8acea2-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-c8acea22-3/nuget/v3/index.json" />
911
<!-- End: Package sources from dotnet-runtime -->
1012
<!-- Begin: Package sources from dotnet-winforms -->
1113
<add key="darc-int-dotnet-winforms-5a82e6f" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-winforms-5a82e6f3/nuget/v3/index.json" />
14+
<add key="darc-int-dotnet-winforms-5a82e6f-8" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-winforms-5a82e6f3-8/nuget/v3/index.json" />
15+
<add key="darc-int-dotnet-winforms-5a82e6f-7" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-winforms-5a82e6f3-7/nuget/v3/index.json" />
16+
<add key="darc-int-dotnet-winforms-5a82e6f-6" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-winforms-5a82e6f3-6/nuget/v3/index.json" />
17+
<add key="darc-int-dotnet-winforms-5a82e6f-5" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-winforms-5a82e6f3-5/nuget/v3/index.json" />
18+
<add key="darc-int-dotnet-winforms-5a82e6f-4" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-winforms-5a82e6f3-4/nuget/v3/index.json" />
19+
<add key="darc-int-dotnet-winforms-5a82e6f-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-winforms-5a82e6f3-3/nuget/v3/index.json" />
20+
<add key="darc-int-dotnet-winforms-5a82e6f-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-winforms-5a82e6f3-2/nuget/v3/index.json" />
21+
<add key="darc-int-dotnet-winforms-5a82e6f-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-winforms-5a82e6f3-1/nuget/v3/index.json" />
1222
<!-- End: Package sources from dotnet-winforms -->
1323
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
1424
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
@@ -24,9 +34,19 @@
2434
<disabledPackageSources>
2535
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
2636
<!-- Begin: Package sources from dotnet-runtime -->
37+
<add key="darc-int-dotnet-runtime-c8acea2-3" value="true" />
38+
<add key="darc-int-dotnet-runtime-c8acea2-8" value="true" />
2739
<add key="darc-int-dotnet-runtime-c8acea2" value="true" />
2840
<!-- End: Package sources from dotnet-runtime -->
2941
<!-- Begin: Package sources from dotnet-winforms -->
42+
<add key="darc-int-dotnet-winforms-5a82e6f-1" value="true" />
43+
<add key="darc-int-dotnet-winforms-5a82e6f-2" value="true" />
44+
<add key="darc-int-dotnet-winforms-5a82e6f-3" value="true" />
45+
<add key="darc-int-dotnet-winforms-5a82e6f-4" value="true" />
46+
<add key="darc-int-dotnet-winforms-5a82e6f-5" value="true" />
47+
<add key="darc-int-dotnet-winforms-5a82e6f-6" value="true" />
48+
<add key="darc-int-dotnet-winforms-5a82e6f-7" value="true" />
49+
<add key="darc-int-dotnet-winforms-5a82e6f-8" value="true" />
3050
<add key="darc-int-dotnet-winforms-5a82e6f" value="true" />
3151
<!-- End: Package sources from dotnet-winforms -->
3252
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->

‎eng/Version.Details.xml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -165,25 +165,25 @@
165165
</Dependency>
166166
</ProductDependencies>
167167
<ToolsetDependencies>
168-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25058.5">
168+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25065.2">
169169
<Uri>https://github.com/dotnet/arcade</Uri>
170-
<Sha>8cc6ecd76c24ef6665579a5c5e386a211a1e7c54</Sha>
170+
<Sha>c4bbc67763bf0c5a868862df874079380e647d61</Sha>
171171
</Dependency>
172-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="9.0.0-beta.25058.5">
172+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="9.0.0-beta.25065.2">
173173
<Uri>https://github.com/dotnet/arcade</Uri>
174-
<Sha>8cc6ecd76c24ef6665579a5c5e386a211a1e7c54</Sha>
174+
<Sha>c4bbc67763bf0c5a868862df874079380e647d61</Sha>
175175
</Dependency>
176-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.25058.5">
176+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.25065.2">
177177
<Uri>https://github.com/dotnet/arcade</Uri>
178-
<Sha>8cc6ecd76c24ef6665579a5c5e386a211a1e7c54</Sha>
178+
<Sha>c4bbc67763bf0c5a868862df874079380e647d61</Sha>
179179
</Dependency>
180180
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="9.0.0-beta.24053.1">
181181
<Uri>https://github.com/dotnet/arcade</Uri>
182182
<Sha>f4e11a15c7b8a949d4a366e792a9843ff6e88cd5</Sha>
183183
</Dependency>
184-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="9.0.0-beta.25058.5">
184+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="9.0.0-beta.25065.2">
185185
<Uri>https://github.com/dotnet/arcade</Uri>
186-
<Sha>8cc6ecd76c24ef6665579a5c5e386a211a1e7c54</Sha>
186+
<Sha>c4bbc67763bf0c5a868862df874079380e647d61</Sha>
187187
</Dependency>
188188
<Dependency Name="Microsoft.SourceLink.AzureRepos.Git" Version="8.0.0-beta.23409.2">
189189
<Uri>https://github.com/dotnet/sourcelink</Uri>

‎eng/Versions.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
<!-- Packages that come from https://github.com/dotnet/arcade -->
5353
<PropertyGroup>
5454
<MicrosoftDotNetApiCompatVersion>9.0.0-beta.24053.1</MicrosoftDotNetApiCompatVersion>
55-
<MicrosoftDotNetCodeAnalysisPackageVersion>9.0.0-beta.25058.5</MicrosoftDotNetCodeAnalysisPackageVersion>
55+
<MicrosoftDotNetCodeAnalysisPackageVersion>9.0.0-beta.25065.2</MicrosoftDotNetCodeAnalysisPackageVersion>
5656
</PropertyGroup>
5757
<!-- Sourcelink -->
5858
<PropertyGroup>

‎eng/common/template-guidance.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ extends:
5757
5858
Note: Multiple outputs are ONLY applicable to 1ES PT publishing (only usable when referencing `templates-official`).
5959

60-
# Development notes
60+
## Development notes
6161

6262
**Folder / file structure**
6363

‎global.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"tools": {
3-
"dotnet": "9.0.100",
3+
"dotnet": "9.0.102",
44
"runtimes": {
55
"dotnet": [
66
"2.1.7",
@@ -12,11 +12,11 @@
1212
}
1313
},
1414
"msbuild-sdks": {
15-
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25058.5",
16-
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25058.5"
15+
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25065.2",
16+
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25065.2"
1717
},
1818
"sdk": {
19-
"version": "9.0.100"
19+
"version": "9.0.102"
2020
},
2121
"native-tools": {
2222
"strawberry-perl": "5.38.0.1",

0 commit comments

Comments
 (0)