Skip to content

Commit 10c130c

Browse files
AArnottAArnott
committed
Merge branch 'dev/andarno/libtemplateUpdate' of https://github.com/microsoft/vs-mef into dev/andarno/libtemplateUpdate
2 parents cb97f84 + e07d709 commit 10c130c

20 files changed

+32
-45
lines changed

Diff for: ‎.github/dependabot.yml

+10-12
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,13 @@ updates:
77
directory: /
88
schedule:
99
interval: weekly
10-
groups:
11-
nerdbank-gitversioning:
12-
patterns:
13-
- nbgv
14-
- nerdbank.gitversioning
15-
xunit:
16-
patterns:
17-
- 'xunit*'
18-
- package-ecosystem: dotnet-sdk
19-
directory: /
20-
schedule:
21-
interval: monthly
10+
ignore:
11+
# # We want to match the minimum target .NET runtime
12+
- dependency-name: System.Collections.Immutable
13+
- dependency-name: System.Reflection.Metadata
14+
- dependency-name: System.Threading.Tasks.Dataflow
15+
# We need to be careful to update these only for tests, or when we intend to drop older IDE support:
16+
- dependency-name: Microsoft.CodeAnalysis
17+
- dependency-name: Microsoft.CodeAnalysis.CSharp
18+
- dependency-name: Microsoft.CodeAnalysis.CSharp.Workspaces
19+
- dependency-name: Microsoft.CodeAnalysis.VisualBasic.Workspaces

Diff for: ‎Directory.Packages.props

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
<MicroBuildVersion>2.0.171</MicroBuildVersion>
88
<CodeAnalysisVersion>3.11.0</CodeAnalysisVersion>
99
<CodeAnalysisVersionForTesting>4.8.0</CodeAnalysisVersionForTesting>
10-
<CodefixTestingVersion>1.1.1</CodefixTestingVersion>
11-
<MessagePackVersion>2.5.124</MessagePackVersion>
10+
<CodefixTestingVersion>1.1.2</CodefixTestingVersion>
11+
<MessagePackVersion>2.5.192</MessagePackVersion>
1212
</PropertyGroup>
1313
<ItemGroup>
1414
<PackageVersion Include="DiffPlex" Version="1.7.2" />

Diff for: ‎README.md

-2
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,6 @@ Adds a VS MEF system with a pre-computed, cached MEF graph.
4646

4747
## Microsoft.VisualStudio.Composition.VSMefx
4848

49-
[![NuGet package](https://img.shields.io/nuget/v/Microsoft.VisualStudio.Composition.VSMefx.svg)](https://nuget.org/packages/Microsoft.VisualStudio.Composition.VSMefx)
50-
5149
A diagnostic tool to understand catalogs, compositions and diagnose issues in them.
5250

5351
[Learn more about this package](src/Microsoft.VisualStudio.Composition.VSMefx/README.md).

Diff for: ‎init.ps1

100644100755
File mode changed.

Diff for: ‎loc/lcl/CHS/vsmefx.dll.lcl

+1-1
Original file line numberDiff line numberDiff line change
@@ -419,4 +419,4 @@
419419
<Item ItemId=";Version" ItemType="8" PsrId="211" Leaf="true">
420420
<Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
421421
</Item>
422-
</LCX>
422+
</LCX>

Diff for: ‎loc/lcl/CHT/vsmefx.dll.lcl

+2-2
Original file line numberDiff line numberDiff line change
@@ -395,7 +395,7 @@
395395
<Str Cat="Text">
396396
<Val><![CDATA[© Microsoft Corporation. All rights reserved.]]></Val>
397397
<Tgt Cat="Text" Stat="Loc" Orig="New">
398-
<Val><![CDATA[(C) Microsoft Corporation. 著作權所有，並保留一切權利。]]></Val>
398+
<Val><![CDATA[© Microsoft Corporation.著作權所有，並保留一切權利。]]></Val>
399399
</Tgt>
400400
</Str>
401401
<Disp Icon="Str" />
@@ -419,4 +419,4 @@
419419
<Item ItemId=";Version" ItemType="8" PsrId="211" Leaf="true">
420420
<Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
421421
</Item>
422-
</LCX>
422+
</LCX>

Diff for: ‎loc/lcl/CSY/vsmefx.dll.lcl

+1-1
Original file line numberDiff line numberDiff line change
@@ -419,4 +419,4 @@
419419
<Item ItemId=";Version" ItemType="8" PsrId="211" Leaf="true">
420420
<Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
421421
</Item>
422-
</LCX>
422+
</LCX>

Diff for: ‎loc/lcl/DEU/vsmefx.dll.lcl

+1-1
Original file line numberDiff line numberDiff line change
@@ -419,4 +419,4 @@
419419
<Item ItemId=";Version" ItemType="8" PsrId="211" Leaf="true">
420420
<Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
421421
</Item>
422-
</LCX>
422+
</LCX>

Diff for: ‎loc/lcl/ESN/vsmefx.dll.lcl

+2-2
Original file line numberDiff line numberDiff line change
@@ -395,7 +395,7 @@
395395
<Str Cat="Text">
396396
<Val><![CDATA[© Microsoft Corporation. All rights reserved.]]></Val>
397397
<Tgt Cat="Text" Stat="Loc" Orig="New">
398-
<Val><![CDATA[© Microsoft Corporation. Todos los derechos reservados.]]></Val>
398+
<Val><![CDATA[© Microsoft Corporation. Reservados todos los derechos.]]></Val>
399399
</Tgt>
400400
</Str>
401401
<Disp Icon="Str" />
@@ -419,4 +419,4 @@
419419
<Item ItemId=";Version" ItemType="8" PsrId="211" Leaf="true">
420420
<Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
421421
</Item>
422-
</LCX>
422+
</LCX>

Diff for: ‎loc/lcl/FRA/vsmefx.dll.lcl

+1-1
Original file line numberDiff line numberDiff line change
@@ -419,4 +419,4 @@
419419
<Item ItemId=";Version" ItemType="8" PsrId="211" Leaf="true">
420420
<Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
421421
</Item>
422-
</LCX>
422+
</LCX>

Diff for: ‎loc/lcl/ITA/vsmefx.dll.lcl

+1-1
Original file line numberDiff line numberDiff line change
@@ -419,4 +419,4 @@
419419
<Item ItemId=";Version" ItemType="8" PsrId="211" Leaf="true">
420420
<Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
421421
</Item>
422-
</LCX>
422+
</LCX>

Diff for: ‎loc/lcl/JPN/vsmefx.dll.lcl

+2-2
Original file line numberDiff line numberDiff line change
@@ -395,7 +395,7 @@
395395
<Str Cat="Text">
396396
<Val><![CDATA[© Microsoft Corporation. All rights reserved.]]></Val>
397397
<Tgt Cat="Text" Stat="Loc" Orig="New">
398-
<Val><![CDATA[(C) Microsoft Corporation. All rights reserved.]]></Val>
398+
<Val><![CDATA[© Microsoft Corporation.All rights reserved.]]></Val>
399399
</Tgt>
400400
</Str>
401401
<Disp Icon="Str" />
@@ -419,4 +419,4 @@
419419
<Item ItemId=";Version" ItemType="8" PsrId="211" Leaf="true">
420420
<Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
421421
</Item>
422-
</LCX>
422+
</LCX>

Diff for: ‎loc/lcl/KOR/vsmefx.dll.lcl

+1-1
Original file line numberDiff line numberDiff line change
@@ -419,4 +419,4 @@
419419
<Item ItemId=";Version" ItemType="8" PsrId="211" Leaf="true">
420420
<Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
421421
</Item>
422-
</LCX>
422+
</LCX>

Diff for: ‎loc/lcl/PLK/vsmefx.dll.lcl

+1-1
Original file line numberDiff line numberDiff line change
@@ -419,4 +419,4 @@
419419
<Item ItemId=";Version" ItemType="8" PsrId="211" Leaf="true">
420420
<Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
421421
</Item>
422-
</LCX>
422+
</LCX>

Diff for: ‎loc/lcl/PTB/vsmefx.dll.lcl

+1-1
Original file line numberDiff line numberDiff line change
@@ -419,4 +419,4 @@
419419
<Item ItemId=";Version" ItemType="8" PsrId="211" Leaf="true">
420420
<Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
421421
</Item>
422-
</LCX>
422+
</LCX>

Diff for: ‎loc/lcl/RUS/vsmefx.dll.lcl

+5-10
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<LCX SchemaVersion="6.0"
3-
Name="D:\a\_work\1\s\bin\Microsoft.VisualStudio.Composition.VSMefx\Release\net8.0\vsmefx.dll"
4-
PsrId="211" FileType="1" SrcCul="en-US" TgtCul="ru-RU"
5-
xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
2+
<LCX SchemaVersion="6.0" Name="D:\a\_work\1\s\bin\Microsoft.VisualStudio.Composition.VSMefx\Release\net8.0\vsmefx.dll" PsrId="211" FileType="1" SrcCul="en-US" TgtCul="ru-RU" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
63
<OwnedComments>
74
<Cmt Name="Dev" />
85
<Cmt Name="LcxAdmin" />
@@ -11,10 +8,8 @@
118
<Item ItemId=";Managed Resources" ItemType="0" PsrId="211" Leaf="true">
129
<Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
1310
</Item>
14-
<Item ItemId=";Microsoft.VisualStudio.Composition.VSMefx.Strings.resources" ItemType="0"
15-
PsrId="211" Leaf="false">
16-
<Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false"
17-
Path=" \ ;Managed Resources \ 0 \ 0" />
11+
<Item ItemId=";Microsoft.VisualStudio.Composition.VSMefx.Strings.resources" ItemType="0" PsrId="211" Leaf="false">
12+
<Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" Path=" \ ;Managed Resources \ 0 \ 0" />
1813
<Item ItemId=";Strings" ItemType="0" PsrId="211" Leaf="false">
1914
<Disp Icon="Str" Disp="true" LocTbl="false" />
2015
<Item ItemId=";AllRejectionsMessage" ItemType="0" PsrId="211" Leaf="true">
@@ -376,7 +371,7 @@
376371
<Str Cat="Text">
377372
<Val><![CDATA[Microsoft]]></Val>
378373
<Tgt Cat="Text" Stat="Loc" Orig="New">
379-
<Val><![CDATA[Microsoft]]></Val>
374+
<Val><![CDATA[Майкрософт]]></Val>
380375
</Tgt>
381376
</Str>
382377
<Disp Icon="Str" />
@@ -424,4 +419,4 @@
424419
<Item ItemId=";Version" ItemType="8" PsrId="211" Leaf="true">
425420
<Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
426421
</Item>
427-
</LCX>
422+
</LCX>

Diff for: ‎loc/lcl/TRK/vsmefx.dll.lcl

+1-1
Original file line numberDiff line numberDiff line change
@@ -419,4 +419,4 @@
419419
<Item ItemId=";Version" ItemType="8" PsrId="211" Leaf="true">
420420
<Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
421421
</Item>
422-
</LCX>
422+
</LCX>

Diff for: ‎src/Microsoft.VisualStudio.Composition/Microsoft.VisualStudio.Composition.csproj

-4
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,6 @@
2121
<PackageReference Include="System.Reflection.Metadata" Condition="'$(TargetFrameworkIdentifier)'!='.NETCoreApp'" />
2222
<PackageReference Include="System.Threading.Tasks.Dataflow" Condition="'$(TargetFrameworkIdentifier)'!='.NETCoreApp'" />
2323
</ItemGroup>
24-
<ItemGroup>
25-
<AdditionalFiles Include="PublicAPI.Shipped.txt" />
26-
<AdditionalFiles Include="PublicAPI.Unshipped.txt" />
27-
</ItemGroup>
2824
<ItemGroup>
2925
<Compile Update="Strings.Designer.cs">
3026
<DesignTime>True</DesignTime>

Diff for: ‎tools/Install-DotNetSdk.ps1

100644100755
File mode changed.

Diff for: ‎tools/Install-NuGetCredProvider.ps1

100644100755
File mode changed.

0 commit comments

Comments
 (0)