Skip to content

Commit f173729

Browse files
authored
Merge branch 'release/8.0.1xx' into darc-release/8.0.1xx-84b82671-f8e7-4753-82c1-3a729271b801
2 parents e9e793d + 7051f0f commit f173729

File tree

10 files changed

+852
-211
lines changed

10 files changed

+852
-211
lines changed

.vsts-ci.yml

Lines changed: 266 additions & 155 deletions
Large diffs are not rendered by default.

.vsts-pr.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ stages:
6767
- publish: $(Build.SourcesDirectory)\eng\BuildConfiguration
6868
artifact: BuildConfiguration
6969
displayName: Publish Build Config
70-
- template: /eng/build.yml
70+
- template: /eng/build-pr.yml
7171
parameters:
7272
agentOs: Windows_NT
7373
pool:
@@ -98,7 +98,7 @@ stages:
9898
name: 'Managed'
9999
container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream8'
100100
- ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}:
101-
- template: /eng/build.yml
101+
- template: /eng/build-pr.yml
102102
parameters:
103103
agentOs: Windows_NT_FullFramework
104104
pool:
@@ -120,7 +120,7 @@ stages:
120120
_SignType: test
121121
_Test: -test
122122

123-
- template: /eng/build.yml
123+
- template: /eng/build-pr.yml
124124
parameters:
125125
agentOs: Windows_NT_TestAsTools
126126
pool:
@@ -136,7 +136,7 @@ stages:
136136
_PublishArgs: ''
137137
_SignType: test
138138

139-
- template: /eng/build.yml
139+
- template: /eng/build-pr.yml
140140
parameters:
141141
agentOs: Ubuntu_22_04
142142
pool:
@@ -157,7 +157,7 @@ stages:
157157
_SignType: test
158158
_Test: -test
159159

160-
- template: /eng/build.yml
160+
- template: /eng/build-pr.yml
161161
parameters:
162162
agentOs: Darwin
163163
pool:

NuGet.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@
2525
<!-- End: Package sources from dotnet-runtime -->
2626
<!-- Begin: Package sources from dotnet-templating -->
2727
<add key="darc-pub-dotnet-templating-2d33450" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-2d334501/nuget/v3/index.json" />
28-
<add key="darc-pub-dotnet-templating-2d33450-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-2d334501-2/nuget/v3/index.json" />
2928
<add key="darc-pub-dotnet-templating-2d33450-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-2d334501-1/nuget/v3/index.json" />
29+
<add key="darc-pub-dotnet-templating-2d33450-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-2d334501-2/nuget/v3/index.json" />
3030
<!-- End: Package sources from dotnet-templating -->
3131
<!-- Begin: Package sources from dotnet-windowsdesktop -->
3232
<!-- End: Package sources from dotnet-windowsdesktop -->

eng/Version.Details.xml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -183,6 +183,10 @@
183183
<Uri>https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted</Uri>
184184
<Sha>550277e0616e549446f03fda35d3e23dff75dc01</Sha>
185185
</Dependency>
186+
<Dependency Name="NuGet.Localization" Version="6.8.1-rc.2">
187+
<Uri>https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted</Uri>
188+
<Sha>550277e0616e549446f03fda35d3e23dff75dc01</Sha>
189+
</Dependency>
186190
<Dependency Name="Microsoft.NET.Test.Sdk" Version="17.8.0-release-23615-02">
187191
<Uri>https://github.com/microsoft/vstest</Uri>
188192
<Sha>aa59400b11e1aeee2e8af48928dbd48748a8bef9</Sha>
@@ -337,9 +341,9 @@
337341
<Sha>02fe27cd6a9b001c8feb7938e6ef4b3799745759</Sha>
338342
<SourceBuild RepoName="command-line-api" ManagedOnly="true" />
339343
</Dependency>
340-
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-externals" Version="8.0.0-alpha.1.24168.2">
344+
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-externals" Version="8.0.0-alpha.1.24175.3">
341345
<Uri>https://github.com/dotnet/source-build-externals</Uri>
342-
<Sha>0fac378047750fa8bd850a98b159560f9f7627c3</Sha>
346+
<Sha>300e99190e6ae1983681694dbdd5f75f0c692081</Sha>
343347
<SourceBuild RepoName="source-build-externals" ManagedOnly="true" />
344348
</Dependency>
345349
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="8.0.0-alpha.1.24163.3">

eng/Versions.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
</PropertyGroup>
1212
<!-- Repo Version Information -->
1313
<PropertyGroup>
14-
<VersionPrefix>8.0.104</VersionPrefix>
14+
<VersionPrefix>8.0.105</VersionPrefix>
1515
<!-- Enable to remove prerelease label. -->
1616
<StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">true</StabilizePackageVersion>
1717
<DotNetFinalVersionKind Condition="'$(StabilizePackageVersion)' == 'true'">release</DotNetFinalVersionKind>
@@ -81,7 +81,7 @@
8181
<!-- Dependencies from https://github.com/nuget/nuget.client -->
8282
<NuGetBuildTasksPackageVersion>6.8.1-rc.2</NuGetBuildTasksPackageVersion>
8383
<NuGetBuildTasksConsolePackageVersion>6.8.1-rc.2</NuGetBuildTasksConsolePackageVersion>
84-
<NuGetLocalizationPackageVersion>6.0.0-rc.278</NuGetLocalizationPackageVersion>
84+
<NuGetLocalizationPackageVersion>6.8.1-rc.2</NuGetLocalizationPackageVersion>
8585
<NuGetBuildTasksPackPackageVersion>6.8.1-rc.2</NuGetBuildTasksPackPackageVersion>
8686
<NuGetCommandLineXPlatPackageVersion>6.8.1-rc.2</NuGetCommandLineXPlatPackageVersion>
8787
<NuGetProjectModelPackageVersion>6.8.1-rc.2</NuGetProjectModelPackageVersion>

0 commit comments

Comments
 (0)