Skip to content

Commit 89da6f1

Browse files
grendellogrendello
committed
Merge branch 'main' into all-assemblies-per-rid
* main: Localized file check-in by OneLocBuild Task (dotnet#8350) [ci] Install signing plugin after building (dotnet#8346) Bump to dotnet/installer@e1fd7d9649 8.0.100-rc.2.23468.1 (dotnet#8330) Localized file check-in by OneLocBuild Task (dotnet#8341) LEGO: Merge pull request 8344
2 parents 248298c + c4208a9 commit 89da6f1

File tree

19 files changed

+113
-33
lines changed

19 files changed

+113
-33
lines changed

‎Localize/loc/es/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl‎

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,21 @@
5656
</Item>
5757
<Item ItemId=";APT2264" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
5858
<Str Cat="Text">
59-
<Val><![CDATA[This is probably caused by the project exceeding the Windows maximum path length limitation. See https://learn.microsoft.com/xamarin/android/errors-and-warnings/apt2264 for details.]]></Val>
59+
<Val><![CDATA[This could be caused by the project exceeding the Windows maximum path length limitation. See https://learn.microsoft.com/xamarin/android/errors-and-warnings/apt2264 for details.]]></Val>
6060
<Tgt Cat="Text" Stat="Loc" Orig="New">
61-
<Val><![CDATA[Esto probablemente se debe a que el proyecto supera la limitación de longitud máxima de la ruta de acceso de Windows. Consulte https://learn.microsoft.com/xamarin/android/errors-and-warnings/apt2264 para obtener más información.]]></Val>
61+
<Val><![CDATA[Esto puede deberse a que el proyecto supera la limitación de longitud máxima de la ruta de acceso de Windows. Vea https://learn.microsoft.com/xamarin/android/errors-and-warnings/apt2264 para obtener más información.]]></Val>
62+
</Tgt>
63+
<Prev Cat="Text">
64+
<Val><![CDATA[This is probably caused by the project exceeding the Windows maximum path length limitation. See https://learn.microsoft.com/xamarin/android/errors-and-warnings/apt2264 for details.]]></Val>
65+
</Prev>
66+
</Str>
67+
<Disp Icon="Str" />
68+
</Item>
69+
<Item ItemId=";APT2265" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
70+
<Str Cat="Text">
71+
<Val><![CDATA[This could be caused by the project having non-ASCII characters in its filename or path. See https://learn.microsoft.com/xamarin/android/errors-and-warnings/apt2265 for details.]]></Val>
72+
<Tgt Cat="Text" Stat="Loc" Orig="New">
73+
<Val><![CDATA[Esto puede deberse a que el proyecto tiene caracteres que no son ASCII en su nombre de archivo o ruta de acceso. Vea https://learn.microsoft.com/xamarin/android/errors-and-warnings/apt2265 para obtener más información.]]></Val>
6274
</Tgt>
6375
</Str>
6476
<Disp Icon="Str" />

‎Localize/loc/ja/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,22 @@
5656
</Item>
5757
<Item ItemId=";APT2264" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
5858
<Str Cat="Text">
59-
<Val><![CDATA[This is probably caused by the project exceeding the Windows maximum path length limitation. See https://learn.microsoft.com/xamarin/android/errors-and-warnings/apt2264 for details.]]></Val>
59+
<Val><![CDATA[This could be caused by the project exceeding the Windows maximum path length limitation. See https://learn.microsoft.com/xamarin/android/errors-and-warnings/apt2264 for details.]]></Val>
6060
<Tgt Cat="Text" Stat="Loc" Orig="New">
6161
<Val><![CDATA[これは、プロジェクトが Windows のパスの最大の長さの制限を超えたことが原因の可能性があります。詳細については、https://learn.microsoft.com/xamarin/android/errors-and-warnings/apt2264 を参照してください。]]></Val>
6262
</Tgt>
63+
<Prev Cat="Text">
64+
<Val><![CDATA[This is probably caused by the project exceeding the Windows maximum path length limitation. See https://learn.microsoft.com/xamarin/android/errors-and-warnings/apt2264 for details.]]></Val>
65+
</Prev>
66+
</Str>
67+
<Disp Icon="Str" />
68+
</Item>
69+
<Item ItemId=";APT2265" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
70+
<Str Cat="Text">
71+
<Val><![CDATA[This could be caused by the project having non-ASCII characters in its filename or path. See https://learn.microsoft.com/xamarin/android/errors-and-warnings/apt2265 for details.]]></Val>
72+
<Tgt Cat="Text" Stat="Loc" Orig="New">
73+
<Val><![CDATA[これは、プロジェクトのファイル名またはパスに ASCII 以外の文字が含まれている場合に発生する可能性があります。詳細については、「https://learn.microsoft.com/xamarin/android/errors-and-warnings/apt2265」を参照してください。]]></Val>
74+
</Tgt>
6375
</Str>
6476
<Disp Icon="Str" />
6577
</Item>

‎build-tools/automation/yaml-templates/build-macos.yaml‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -45,21 +45,13 @@ stages:
4545
path: ${{ parameters.checkoutPath }}
4646
persistCredentials: ${{ parameters.checkoutPersistCredentials }}
4747

48-
- template: install-microbuild-tooling.yaml
49-
parameters:
50-
condition: and(succeeded(), eq(variables['MicroBuildSignType'], 'Real'))
51-
5248
- template: commercial-build.yaml
5349
parameters:
5450
installerArtifactName: ${{ parameters.installerArtifactName }}
5551
nugetArtifactName: ${{ parameters.nugetArtifactName }}
5652
provisionatorChannel: ${{ parameters.provisionatorChannel }}
5753
testAssembliesArtifactName: ${{ parameters.testAssembliesArtifactName }}
5854

59-
- template: remove-microbuild-tooling.yaml
60-
parameters:
61-
condition: and(succeededOrFailed(), eq(variables['MicroBuildSignType'], 'Real'))
62-
6355
- powershell: |
6456
[IO.Directory]::CreateDirectory("$(Build.StagingDirectory)/empty")
6557
[IO.Directory]::CreateDirectory("$(Build.StagingDirectory)/sbom-components")

‎build-tools/automation/yaml-templates/commercial-build.yaml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,16 +77,22 @@ steps:
7777
displayName: CodeQL 3000 Finalize
7878
condition: and(succeededOrFailed(), eq(variables['Codeql.Enabled'], 'true'), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
7979

80+
- template: install-microbuild-tooling.yaml
81+
parameters:
82+
condition: and(succeeded(), eq(variables['MicroBuildSignType'], 'Real'))
83+
8084
# Restore needs to be executed first or MicroBuild targets won't be imported in time
8185
- task: MSBuild@1
8286
displayName: msbuild /t:Restore sign-content.proj
87+
condition: and(succeeded(), eq(variables['MicroBuildSignType'], 'Real'))
8388
inputs:
8489
solution: ${{ parameters.xaSourcePath }}/build-tools/installers/sign-content.proj
8590
configuration: $(XA.Build.Configuration)
8691
msbuildArguments: /t:Restore /bl:${{ parameters.xaSourcePath }}/bin/Build$(XA.Build.Configuration)/restore-sign-content.binlog
8792

8893
- task: MSBuild@1
8994
displayName: PKG signing - add entitlements and sign
95+
condition: and(succeeded(), eq(variables['MicroBuildSignType'], 'Real'))
9096
inputs:
9197
solution: ${{ parameters.xaSourcePath }}/build-tools/installers/sign-content.proj
9298
configuration: $(XA.Build.Configuration)
@@ -98,6 +104,7 @@ steps:
98104
99105
- task: MSBuild@1
100106
displayName: PKG signing - sign binutils libraries
107+
condition: and(succeeded(), eq(variables['MicroBuildSignType'], 'Real'))
101108
inputs:
102109
solution: ${{ parameters.xaSourcePath }}/build-tools/installers/sign-content.proj
103110
configuration: $(XA.Build.Configuration)
@@ -109,6 +116,7 @@ steps:
109116
110117
- task: MSBuild@1
111118
displayName: PKG signing - sign binutils executables
119+
condition: and(succeeded(), eq(variables['MicroBuildSignType'], 'Real'))
112120
inputs:
113121
solution: ${{ parameters.xaSourcePath }}/build-tools/installers/sign-content.proj
114122
configuration: $(XA.Build.Configuration)
@@ -118,6 +126,10 @@ steps:
118126
/p:MicroBuildOverridePluginDirectory=$(Build.StagingDirectory)/MicroBuild/Plugins
119127
/bl:${{ parameters.xaSourcePath }}/bin/Build$(XA.Build.Configuration)/sign-bu-ex.binlog
120128
129+
- template: remove-microbuild-tooling.yaml
130+
parameters:
131+
condition: and(succeededOrFailed(), eq(variables['MicroBuildSignType'], 'Real'))
132+
121133
- script: make create-installers CONFIGURATION=$(XA.Build.Configuration) MSBUILD_ARGS='${{ parameters.makeMSBuildArgs }}'
122134
workingDirectory: ${{ parameters.xaSourcePath }}
123135
displayName: make create-installers

‎eng/Version.Details.xml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
11
<Dependencies>
22
<ProductDependencies>
3-
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="8.0.100-rc.2.23462.1">
3+
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="8.0.100-rc.2.23468.1">
44
<Uri>https://github.com/dotnet/installer</Uri>
5-
<Sha>a6b903004774fb1b4e638f47c602fc968b43a8c0</Sha>
5+
<Sha>e1fd7d964980ed478fa30457cf750e81105caee1</Sha>
66
</Dependency>
7-
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="8.0.0-rc.2.23431.9" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
7+
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="8.0.0-rc.2.23466.4" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
88
<Uri>https://github.com/dotnet/runtime</Uri>
9-
<Sha>3c48925a6c1ab31865b4438a6cb88242d1a8fe4d</Sha>
9+
<Sha>287c10d2539d47268a1083c4d533cf84124900cf</Sha>
1010
</Dependency>
11-
<Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.0-rc.2.23431.9" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
11+
<Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.0-rc.2.23466.4" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
1212
<Uri>https://github.com/dotnet/runtime</Uri>
13-
<Sha>3c48925a6c1ab31865b4438a6cb88242d1a8fe4d</Sha>
13+
<Sha>287c10d2539d47268a1083c4d533cf84124900cf</Sha>
1414
</Dependency>
15-
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport" Version="8.0.0-rc.1.23415.5" CoherentParentDependency="Microsoft.NETCore.App.Ref">
15+
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport" Version="8.0.0-rc.2.23463.1" CoherentParentDependency="Microsoft.NETCore.App.Ref">
1616
<Uri>https://github.com/dotnet/emsdk</Uri>
17-
<Sha>66dbaefff04250dc72849f0172e0c53bcfb3ab38</Sha>
17+
<Sha>1999c8c8ab7473a7e1c5b7bdf5ba6d9a985a69cc</Sha>
1818
</Dependency>
19-
<Dependency Name="Microsoft.DotNet.Cecil" Version="0.11.4-alpha.23428.2" CoherentParentDependency="Microsoft.NET.ILLink.Tasks">
19+
<Dependency Name="Microsoft.DotNet.Cecil" Version="0.11.4-alpha.23461.1" CoherentParentDependency="Microsoft.NET.ILLink.Tasks">
2020
<Uri>https://github.com/dotnet/cecil</Uri>
21-
<Sha>fa5acbd2ccba88c9d46ce0dd8f5310f9d3c5c46d</Sha>
21+
<Sha>a112f15aa032c029b7d9c77df3427111d93cf407</Sha>
2222
</Dependency>
2323
</ProductDependencies>
2424
<ToolsetDependencies>

‎eng/Versions.props‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
<Project>
22
<!--Package versions-->
33
<PropertyGroup>
4-
<MicrosoftDotnetSdkInternalPackageVersion>8.0.100-rc.2.23462.1</MicrosoftDotnetSdkInternalPackageVersion>
5-
<MicrosoftNETILLinkTasksPackageVersion>8.0.0-rc.2.23431.9</MicrosoftNETILLinkTasksPackageVersion>
6-
<MicrosoftNETCoreAppRefPackageVersion>8.0.0-rc.2.23431.9</MicrosoftNETCoreAppRefPackageVersion>
4+
<MicrosoftDotnetSdkInternalPackageVersion>8.0.100-rc.2.23468.1</MicrosoftDotnetSdkInternalPackageVersion>
5+
<MicrosoftNETILLinkTasksPackageVersion>8.0.0-rc.2.23466.4</MicrosoftNETILLinkTasksPackageVersion>
6+
<MicrosoftNETCoreAppRefPackageVersion>8.0.0-rc.2.23466.4</MicrosoftNETCoreAppRefPackageVersion>
77
<MicrosoftDotNetApiCompatPackageVersion>7.0.0-beta.22103.1</MicrosoftDotNetApiCompatPackageVersion>
88
<MicrosoftDotNetBuildTasksFeedPackageVersion>7.0.0-beta.22103.1</MicrosoftDotNetBuildTasksFeedPackageVersion>
9-
<MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion>8.0.0-rc.1.23415.5</MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion>
9+
<MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion>8.0.0-rc.2.23463.1</MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion>
1010
<MicrosoftNETWorkloadEmscriptenPackageVersion>$(MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion)</MicrosoftNETWorkloadEmscriptenPackageVersion>
1111
<MicrosoftTemplateEngineTasksPackageVersion>7.0.100-rc.1.22410.7</MicrosoftTemplateEngineTasksPackageVersion>
12-
<MicrosoftDotNetCecilPackageVersion>0.11.4-alpha.23428.2</MicrosoftDotNetCecilPackageVersion>
12+
<MicrosoftDotNetCecilPackageVersion>0.11.4-alpha.23461.1</MicrosoftDotNetCecilPackageVersion>
1313
<SystemIOHashingPackageVersion>$(MicrosoftNETCoreAppRefPackageVersion)</SystemIOHashingPackageVersion>
1414
</PropertyGroup>
1515
<PropertyGroup>

‎src/Xamarin.Android.Build.Tasks/Properties/Resources.cs.resx‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -545,6 +545,10 @@ Buď změňte hodnotu v souboru AndroidManifest.xml tak, aby odpovídala hodnot
545545
<value>To je pravděpodobně způsobeno tím, že projekt překračuje omezení maximální délky cesty systému Windows. Podrobnosti najdete v https://learn.microsoft.com/xamarin/android/errors-and-warnings/apt2264.</value>
546546
<comment>The following are literal names and should not be translated:</comment>
547547
</data>
548+
<data name="APT2265" xml:space="preserve">
549+
<value>Příčinou může být to, že projekt má v názvu souboru nebo cestě jiné znaky než ASCII. Podrobnosti najdete v https://learn.microsoft.com/xamarin/android/errors-and-warnings/apt2265.</value>
550+
<comment>The following are literal names and should not be translated:</comment>
551+
</data>
548552
<data name="XA3001" xml:space="preserve">
549553
<value>Sestavení se nepovedlo zkompilovat AOT: {0}</value>
550554
<comment>The abbreviation "AOT" should not be translated.</comment>

‎src/Xamarin.Android.Build.Tasks/Properties/Resources.de.resx‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -542,7 +542,11 @@ Bitte ändern Sie den Wert in einen Assembly-basierten Typnamen, der von „{1}
542542
{0} - The assembly name</comment>
543543
</data>
544544
<data name="APT2264" xml:space="preserve">
545-
<value>Dies ist wahrscheinlich darauf zurückzuführen, dass das Projekt die Beschränkung der maximalen Pfadlänge von Windows überschreitet. Weitere Informationen finden Sie unter https://learn.microsoft.com/xamarin/android/errors-and-warnings/apt2264.</value>
545+
<value>This could be caused by the project exceeding the Windows maximum path length limitation. See https://learn.microsoft.com/xamarin/android/errors-and-warnings/apt2264 for details.</value>
546+
<comment>The following are literal names and should not be translated:</comment>
547+
</data>
548+
<data name="APT2265" xml:space="preserve">
549+
<value>This could be caused by the project having non-ASCII characters in its filename or path. See https://learn.microsoft.com/xamarin/android/errors-and-warnings/apt2265 for details.</value>
546550
<comment>The following are literal names and should not be translated:</comment>
547551
</data>
548552
<data name="XA3001" xml:space="preserve">

‎src/Xamarin.Android.Build.Tasks/Properties/Resources.es.resx‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -542,7 +542,11 @@ Cambie el valor de AndroidManifest.xml para que coincida con el valor $(Supporte
542542
{0} - The assembly name</comment>
543543
</data>
544544
<data name="APT2264" xml:space="preserve">
545-
<value>Esto probablemente se debe a que el proyecto supera la limitación de longitud máxima de la ruta de acceso de Windows. Consulte https://learn.microsoft.com/xamarin/android/errors-and-warnings/apt2264 para obtener más información.</value>
545+
<value>Esto puede deberse a que el proyecto supera la limitación de longitud máxima de la ruta de acceso de Windows. Vea https://learn.microsoft.com/xamarin/android/errors-and-warnings/apt2264 para obtener más información.</value>
546+
<comment>The following are literal names and should not be translated:</comment>
547+
</data>
548+
<data name="APT2265" xml:space="preserve">
549+
<value>Esto puede deberse a que el proyecto tiene caracteres que no son ASCII en su nombre de archivo o ruta de acceso. Vea https://learn.microsoft.com/xamarin/android/errors-and-warnings/apt2265 para obtener más información.</value>
546550
<comment>The following are literal names and should not be translated:</comment>
547551
</data>
548552
<data name="XA3001" xml:space="preserve">

‎src/Xamarin.Android.Build.Tasks/Properties/Resources.fr.resx‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -542,7 +542,11 @@ Modifiez la valeur dans AndroidManifest.xml pour qu’elle corresponde à la val
542542
{0} - The assembly name</comment>
543543
</data>
544544
<data name="APT2264" xml:space="preserve">
545-
<value>Cela est probablement dû au fait que le projet dépasse la limite de longueur maximale du chemin d’accès Windows. Pour plus d’informations, consultez https://learn.microsoft.com/xamarin/android/errors-and-warnings/apt2264.</value>
545+
<value>Cela peut être dû au fait que le projet dépasse la limite de longueur maximale du chemin d’accès Windows. Pour plus d’informations, consultez https://learn.microsoft.com/xamarin/android/errors-and-warnings/apt2264.</value>
546+
<comment>The following are literal names and should not be translated:</comment>
547+
</data>
548+
<data name="APT2265" xml:space="preserve">
549+
<value>Cela peut être dû au fait que le projet contient des caractères non-ASCII dans son nom de fichier ou son chemin d’accès. Pour plus d’informations, consultez https://learn.microsoft.com/xamarin/android/errors-and-warnings/apt2265.</value>
546550
<comment>The following are literal names and should not be translated:</comment>
547551
</data>
548552
<data name="XA3001" xml:space="preserve">

0 commit comments

Comments
 (0)