Skip to content

Commit 3cf723e

Browse files
Merge pull request #851 from WildGums/GitHubSync/20251201-094358
GitHubSync update
2 parents 812e057 + 5b9e56a commit 3cf723e

File tree

2 files changed

+2
-17
lines changed

2 files changed

+2
-17
lines changed

.github/workflows/build-and-test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323

2424
- name: Setup .NET Core
2525
id: setup-dotnet
26-
uses: actions/setup-dotnet@d4c94342e560b34958eacfc5d055d21461ed1c5d # v5.0.0
26+
uses: actions/setup-dotnet@2016bd2012dba4e32de620c46fe006a3ac9f0602 # v5.0.1
2727
with:
2828
dotnet-version: '10.0.x'
2929

src/Directory.Build.shared.mat.props

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -5,27 +5,12 @@
55
<Import Project="$(MSBuildProjectDirectory)\..\Directory.Build.shared.mat.props" Condition="Exists('$(MSBuildProjectDirectory)\..\Directory.Build.shared.mat.props')" />
66
-->
77

8-
<PropertyGroup Label="MultilingualAppToolkit">
9-
<MultilingualAppToolkitVersion>4.0</MultilingualAppToolkitVersion>
10-
<MultilingualFallbackLanguage>en-US</MultilingualFallbackLanguage>
11-
<TranslationReport Condition="'$(Configuration)' == 'Release'">true</TranslationReport>
12-
<SuppressPseudoWarning Condition="'$(Configuration)' == 'Debug'">true</SuppressPseudoWarning>
13-
<DisableMAT Condition="'$(Configuration)' == 'Release'">true</DisableMAT>
14-
</PropertyGroup>
8+
<!-- Multilingual App Toolkit is retired, configuration and includes are no longer required, only the itemgroup is -->
159

1610
<ItemGroup>
1711
<_ResxFiles Remove="Properties\*.resx" />
1812
<None Remove="MultilingualResources\*.xlf" />
1913
<XliffResource Include="MultilingualResources\*.xlf" />
2014
</ItemGroup>
2115

22-
<!-- Only needed in release mode -->
23-
24-
<Import Project="$(MSBuildExtensionsPath)\Microsoft\Multilingual App Toolkit\Microsoft.Multilingual.ResxResources.targets" Label="MultilingualAppToolkit"
25-
Condition="'$(DisableMAT)' != 'true' And Exists('$(MSBuildExtensionsPath)\Microsoft\Multilingual App Toolkit\v$(MultilingualAppToolkitVersion)\Microsoft.Multilingual.ResxResources.targets')" />
26-
27-
<Target Name="MATPrerequisite" BeforeTargets="PrepareForBuild" Condition="'$(DisableMAT)' != 'true' And !Exists('$(MSBuildExtensionsPath)\Microsoft\Multilingual App Toolkit\Microsoft.Multilingual.ResxResources.targets')" Label="MultilingualAppToolkit">
28-
<Warning Text="$(MSBuildProjectFile) is Multilingual build enabled, but the Multilingual App Toolkit is unavailable during the build. If building with Visual Studio, please check to ensure that toolkit is properly installed." />
29-
</Target>
30-
3116
</Project>

0 commit comments

Comments
 (0)