Skip to content

Commit 4130e2c

Browse files
author
Mirroring
committed
Merge commit 'ff8e3690dee1f9278fec6055a91e936300c35c37'
2 parents 4377305 + ff8e369 commit 4130e2c

File tree

27 files changed

+212
-151
lines changed

27 files changed

+212
-151
lines changed

.azure/pipelines/jobs/default-build.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ jobs:
106106
# See https://github.com/dotnet/arcade/blob/master/Documentation/ChoosingAMachinePool.md
107107
pool:
108108
${{ if eq(parameters.agentOs, 'macOS') }}:
109-
vmImage: macOS-12
109+
vmImage: macOS-13
110110
${{ if eq(parameters.agentOs, 'Linux') }}:
111111
${{ if eq(parameters.useHostedUbuntu, true) }}:
112112
vmImage: ubuntu-20.04
@@ -164,8 +164,8 @@ jobs:
164164
- script: df -h
165165
displayName: Disk size
166166
- ${{ if eq(parameters.agentOs, 'macOS') }}:
167-
- script: sudo xcode-select -s /Applications/Xcode_14.2.0.app/Contents/Developer
168-
displayName: Use XCode 14.2.0
167+
- script: sudo xcode-select -s /Applications/Xcode_15.2.0.app/Contents/Developer
168+
displayName: Use XCode 15.2.0
169169
- checkout: self
170170
clean: true
171171
- ${{ if and(eq(parameters.agentOs, 'Windows'), eq(parameters.isAzDOTestingJob, true)) }}:
@@ -323,7 +323,7 @@ jobs:
323323
pool:
324324
${{ if eq(parameters.agentOs, 'macOS') }}:
325325
name: Azure Pipelines
326-
image: macOS-12
326+
image: macOS-13
327327
os: macOS
328328
${{ if eq(parameters.agentOs, 'Linux') }}:
329329
name: $(DncEngInternalBuildPool)
@@ -391,8 +391,8 @@ jobs:
391391
- script: df -h
392392
displayName: Disk size
393393
- ${{ if eq(parameters.agentOs, 'macOS') }}:
394-
- script: sudo xcode-select -s /Applications/Xcode_14.2.0.app/Contents/Developer
395-
displayName: Use XCode 14.2.0
394+
- script: sudo xcode-select -s /Applications/Xcode_15.2.0.app/Contents/Developer
395+
displayName: Use XCode 15.2.0
396396
- checkout: self
397397
clean: true
398398
- ${{ if and(eq(parameters.agentOs, 'Windows'), eq(parameters.isAzDOTestingJob, true)) }}:

eng/targets/Java.Common.targets

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,8 @@
6464

6565
<Target Name="Pack" Condition="'$(IsPackable)' == 'true'" DependsOnTargets="$(PackDependsOn)">
6666
<Telemetry EventName="NETCORE_ENGINEERING_TELEMETRY" EventData="Category=Pack" />
67-
<Message Text="> gradlew $(GradleOptions) createPackage" Importance="high" />
68-
<Exec Command="../gradlew $(GradleOptions) createPackage" />
67+
<Message Text="> gradlew $(GradleOptions) publishToMavenLocal" Importance="high" />
68+
<Exec Command="../gradlew $(GradleOptions) publishToMavenLocal" />
6969
<Message Importance="high" Text="$(PackageId) -> $(PackageOutputPath)%(JavaBuildFiles.Identity)" />
7070
<Copy SourceFiles="$(MSBuildProjectDirectory)\build\libs\%(JavaBuildFiles.Identity)" DestinationFolder="$(PackageOutputPath)" />
7171
</Target>

global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
"xcopy-msbuild": "17.1.0"
2525
},
2626
"native-tools": {
27-
"jdk": "11"
27+
"jdk": "11.0.24"
2828
},
2929
"msbuild-sdks": {
3030
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24516.2",

package-lock.json

Lines changed: 37 additions & 37 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"name": "aspnetcore",
2+
"name": "@microsoft/aspnetcore",
33
"version": "1.0.0",
44
"private": true,
55
"workspaces": [

src/Components/CustomElements/src/js/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"private": true,
3-
"name": "microsoft.components.customelements",
3+
"name": "@microsoft/microsoft.components.customelements",
44
"scripts": {
55
"clean": "rimraf ./dist/Debug ./dist/Release",
66
"prebuild": "npm run clean",

src/Components/Web.JS/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"name": "microsoft.aspnetcore.components.web.js",
2+
"name": "@microsoft/microsoft.aspnetcore.components.web.js",
33
"private": true,
44
"version": "0.0.1",
55
"description": "",

src/Components/WebAssembly/Authentication.Msal/src/Interop/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"name": "microsoft.msal.components.webassembly",
2+
"name": "@microsoft/microsoft.msal.components.webassembly",
33
"private": true,
44
"scripts": {
55
"clean": "rimraf ./dist/Debug ./dist/Release",

src/Components/WebAssembly/WebAssembly.Authentication/src/Interop/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"name": "components.authentication",
2+
"name": "@microsoft/components.authentication",
33
"private": true,
44
"scripts": {
55
"clean": "rimraf ./dist/Debug ./dist/Release",

src/Middleware/Diagnostics/src/_package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"name": "DiagnosticsPages",
2+
"name": "@microsoft/DiagnosticsPages",
33
"version": "0.0.0",
44
"description": "",
55
"private": true,

0 commit comments

Comments
 (0)