Skip to content

Commit 4ca0b3c

Browse files
csigscsigs
authored
Juno: check in to juno/hb_dd8dbf7b-874d-49f2-9313-853dd6e34f6c_20251212180150479. (#664)
1 parent d16eba0 commit 4ca0b3c

13 files changed

+1229
-86
lines changed

‎loc/lcl/CHS/Microsoft.VisualStudio.Composition.Analyzers.dll.lcl‎

Lines changed: 147 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" Path=" \ ;Managed Resources \ 0 \ 0" />
1313
<Item ItemId=";Strings" ItemType="0" PsrId="211" Leaf="false">
1414
<Disp Icon="Str" Disp="true" LocTbl="false" />
15-
<Item ItemId=";VSMEF001_MessageFormat" ItemType="0" PsrId="211" Leaf="true">
15+
<Item ItemId=";VSMEF001_MessageFormat" ItemType="0" PsrId="211" InstFlg="true" Leaf="true">
1616
<Str Cat="Text">
1717
<Val><![CDATA[A property with an [ImportAttribute]5D; must define a setter so the export can be set on the property.]]></Val>
1818
<Tgt Cat="Text" Stat="Loc" Orig="New">
@@ -30,7 +30,7 @@
3030
</Str>
3131
<Disp Icon="Str" />
3232
</Item>
33-
<Item ItemId=";VSMEF002_MessageFormat" ItemType="0" PsrId="211" Leaf="true">
33+
<Item ItemId=";VSMEF002_MessageFormat" ItemType="0" PsrId="211" InstFlg="true" Leaf="true">
3434
<Str Cat="Text">
3535
<Val><![CDATA[The type "{0}" contains a mix of attributes from MEFv1 and MEFv2. Consolidate to just one variety of attributes.]]></Val>
3636
<Tgt Cat="Text" Stat="Loc" Orig="New">
@@ -39,7 +39,7 @@
3939
</Str>
4040
<Disp Icon="Str" />
4141
</Item>
42-
<Item ItemId=";VSMEF002_Title" ItemType="0" PsrId="211" Leaf="true">
42+
<Item ItemId=";VSMEF002_Title" ItemType="0" PsrId="211" InstFlg="true" Leaf="true">
4343
<Str Cat="Text">
4444
<Val><![CDATA[Avoid mixing MEF attribute varieties]]></Val>
4545
<Tgt Cat="Text" Stat="Loc" Orig="New">
@@ -66,6 +66,150 @@
6666
</Str>
6767
<Disp Icon="Str" />
6868
</Item>
69+
<Item ItemId=";VSMEF004_CodeFix_AddImportingConstructorAttribute" ItemType="0" PsrId="211" InstFlg="true" Leaf="true">
70+
<Str Cat="Text">
71+
<Val><![CDATA[Add [ImportingConstructor]5D; attribute]]></Val>
72+
<Tgt Cat="Text" Stat="Loc" Orig="New">
73+
<Val><![CDATA[添加 [ImportingConstructor]5D; 特性]]></Val>
74+
</Tgt>
75+
</Str>
76+
<Disp Icon="Str" />
77+
</Item>
78+
<Item ItemId=";VSMEF004_CodeFix_AddParameterlessConstructor" ItemType="0" PsrId="211" Leaf="true">
79+
<Str Cat="Text">
80+
<Val><![CDATA[Add parameterless constructor]]></Val>
81+
<Tgt Cat="Text" Stat="Loc" Orig="New">
82+
<Val><![CDATA[添加无参数构造函数]]></Val>
83+
</Tgt>
84+
</Str>
85+
<Disp Icon="Str" />
86+
</Item>
87+
<Item ItemId=";VSMEF004_CodeFix_AddPartNotDiscoverableAttribute" ItemType="0" PsrId="211" InstFlg="true" Leaf="true">
88+
<Str Cat="Text">
89+
<Val><![CDATA[Add [PartNotDiscoverable]5D; attribute]]></Val>
90+
<Tgt Cat="Text" Stat="Loc" Orig="New">
91+
<Val><![CDATA[添加 [PartNotDiscoverable]5D; 属性]]></Val>
92+
</Tgt>
93+
</Str>
94+
<Disp Icon="Str" />
95+
</Item>
96+
<Item ItemId=";VSMEF004_MessageFormat" ItemType="0" PsrId="211" InstFlg="true" Leaf="true">
97+
<Str Cat="Text">
98+
<Val><![CDATA[The type "{0}" defines exports but has non-default constructors that are not annotated with [ImportingConstructor]5D;. Add a parameterless constructor, or annotate a constructor with [ImportingConstructor]5D;.]]></Val>
99+
<Tgt Cat="Text" Stat="Loc" Orig="New">
100+
<Val><![CDATA[类型“{0}”定义导出，但具有未批注 [ImportingConstructor]5D; 的非默认构造函数。添加无参数构造函数，或使用 [ImportingConstructor]5D; 批注构造函数。]]></Val>
101+
</Tgt>
102+
</Str>
103+
<Disp Icon="Str" />
104+
</Item>
105+
<Item ItemId=";VSMEF004_Title" ItemType="0" PsrId="211" Leaf="true">
106+
<Str Cat="Text">
107+
<Val><![CDATA[Exported type missing importing constructor]]></Val>
108+
<Tgt Cat="Text" Stat="Loc" Orig="New">
109+
<Val><![CDATA[导出的类型缺少导入构造函数]]></Val>
110+
</Tgt>
111+
</Str>
112+
<Disp Icon="Str" />
113+
</Item>
114+
<Item ItemId=";VSMEF005_MessageFormat" ItemType="0" PsrId="211" InstFlg="true" Leaf="true">
115+
<Str Cat="Text">
116+
<Val><![CDATA[The type "{0}" has multiple constructors annotated with [ImportingConstructor]5D;. Only one constructor should be marked as importing.]]></Val>
117+
<Tgt Cat="Text" Stat="Loc" Orig="New">
118+
<Val><![CDATA[类型“{0}”具有多个批注了 [ImportingConstructor]5D; 的构造函数。只应将一个构造函数标记为导入。]]></Val>
119+
</Tgt>
120+
</Str>
121+
<Disp Icon="Str" />
122+
</Item>
123+
<Item ItemId=";VSMEF005_Title" ItemType="0" PsrId="211" Leaf="true">
124+
<Str Cat="Text">
125+
<Val><![CDATA[Multiple importing constructors]]></Val>
126+
<Tgt Cat="Text" Stat="Loc" Orig="New">
127+
<Val><![CDATA[多个导入构造函数]]></Val>
128+
</Tgt>
129+
</Str>
130+
<Disp Icon="Str" />
131+
</Item>
132+
<Item ItemId=";VSMEF006_AllowDefaultWithoutNullable_MessageFormat" ItemType="0" PsrId="211" InstFlg="true" Leaf="true">
133+
<Str Cat="Text">
134+
<Val><![CDATA[The import "{0}" has AllowDefault = true but is not nullable. Consider making the type nullable or removing AllowDefault.]]></Val>
135+
<Tgt Cat="Text" Stat="Loc" Orig="New">
136+
<Val><![CDATA[导入“{0}”具有 AllowDefault = true，但不可为 null。请考虑使类型可为 null 或移除 AllowDefault。]]></Val>
137+
</Tgt>
138+
</Str>
139+
<Disp Icon="Str" />
140+
</Item>
141+
<Item ItemId=";VSMEF006_CodeFix_AddAllowDefault" ItemType="0" PsrId="211" InstFlg="true" Leaf="true">
142+
<Str Cat="Text">
143+
<Val><![CDATA[Add AllowDefault = true]]></Val>
144+
<Tgt Cat="Text" Stat="Loc" Orig="New">
145+
<Val><![CDATA[添加 AllowDefault = true]]></Val>
146+
</Tgt>
147+
</Str>
148+
<Disp Icon="Str" />
149+
</Item>
150+
<Item ItemId=";VSMEF006_CodeFix_MakeTypeNonNullable" ItemType="0" PsrId="211" Leaf="true">
151+
<Str Cat="Text">
152+
<Val><![CDATA[Make type non-nullable]]></Val>
153+
<Tgt Cat="Text" Stat="Loc" Orig="New">
154+
<Val><![CDATA[将类型设为不可为 null]]></Val>
155+
</Tgt>
156+
</Str>
157+
<Disp Icon="Str" />
158+
</Item>
159+
<Item ItemId=";VSMEF006_CodeFix_MakeTypeNullable" ItemType="0" PsrId="211" Leaf="true">
160+
<Str Cat="Text">
161+
<Val><![CDATA[Make type nullable]]></Val>
162+
<Tgt Cat="Text" Stat="Loc" Orig="New">
163+
<Val><![CDATA[将类型设为可为 null]]></Val>
164+
</Tgt>
165+
</Str>
166+
<Disp Icon="Str" />
167+
</Item>
168+
<Item ItemId=";VSMEF006_CodeFix_RemoveAllowDefault" ItemType="0" PsrId="211" InstFlg="true" Leaf="true">
169+
<Str Cat="Text">
170+
<Val><![CDATA[Remove AllowDefault = true]]></Val>
171+
<Tgt Cat="Text" Stat="Loc" Orig="New">
172+
<Val><![CDATA[移除 AllowDefault = true]]></Val>
173+
</Tgt>
174+
</Str>
175+
<Disp Icon="Str" />
176+
</Item>
177+
<Item ItemId=";VSMEF006_NullableWithoutAllowDefault_MessageFormat" ItemType="0" PsrId="211" InstFlg="true" Leaf="true">
178+
<Str Cat="Text">
179+
<Val><![CDATA[The import "{0}" is nullable but does not have AllowDefault = true. Consider adding AllowDefault = true or making the type non-nullable (and either add a 'required' modifier or an '= null!' initializer).]]></Val>
180+
<Tgt Cat="Text" Stat="Loc" Orig="New">
181+
<Val><![CDATA[导入“{0}”可为 null，但没有 AllowDefault = true。请考虑添加 AllowDefault = true 或使类型不可为 null (并添加 "required" 修饰符或 "= null!" 初始化器)。]]></Val>
182+
</Tgt>
183+
</Str>
184+
<Disp Icon="Str" />
185+
</Item>
186+
<Item ItemId=";VSMEF006_Title" ItemType="0" PsrId="211" InstFlg="true" Leaf="true">
187+
<Str Cat="Text">
188+
<Val><![CDATA[Import nullability and AllowDefault mismatch]]></Val>
189+
<Tgt Cat="Text" Stat="Loc" Orig="New">
190+
<Val><![CDATA[导入的为 Null 性和 AllowDefault 不匹配]]></Val>
191+
</Tgt>
192+
</Str>
193+
<Disp Icon="Str" />
194+
</Item>
195+
<Item ItemId=";VSMEF007_MessageFormat" ItemType="0" PsrId="211" Leaf="true">
196+
<Str Cat="Text">
197+
<Val><![CDATA[The type "{0}" imports the same contract "{1}" multiple times. Each contract should only be imported once per type.]]></Val>
198+
<Tgt Cat="Text" Stat="Loc" Orig="New">
199+
<Val><![CDATA[类型“{0}”多次导入同一协定“{1}”。每个协定每种类型只应导入一次。]]></Val>
200+
</Tgt>
201+
</Str>
202+
<Disp Icon="Str" />
203+
</Item>
204+
<Item ItemId=";VSMEF007_Title" ItemType="0" PsrId="211" Leaf="true">
205+
<Str Cat="Text">
206+
<Val><![CDATA[Duplicate import contract]]></Val>
207+
<Tgt Cat="Text" Stat="Loc" Orig="New">
208+
<Val><![CDATA[重复的导入协定]]></Val>
209+
</Tgt>
210+
</Str>
211+
<Disp Icon="Str" />
212+
</Item>
69213
</Item>
70214
</Item>
71215
<Item ItemId=";Version" ItemType="0" PsrId="211" Leaf="false">

‎loc/lcl/CHT/Microsoft.VisualStudio.Composition.Analyzers.dll.lcl‎

Lines changed: 71 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" Path=" \ ;Managed Resources \ 0 \ 0" />
1313
<Item ItemId=";Strings" ItemType="0" PsrId="211" Leaf="false">
1414
<Disp Icon="Str" Disp="true" LocTbl="false" />
15-
<Item ItemId=";VSMEF001_MessageFormat" ItemType="0" PsrId="211" Leaf="true">
15+
<Item ItemId=";VSMEF001_MessageFormat" ItemType="0" PsrId="211" InstFlg="true" Leaf="true">
1616
<Str Cat="Text">
1717
<Val><![CDATA[A property with an [ImportAttribute]5D; must define a setter so the export can be set on the property.]]></Val>
1818
<Tgt Cat="Text" Stat="Loc" Orig="New">
@@ -30,7 +30,7 @@
3030
</Str>
3131
<Disp Icon="Str" />
3232
</Item>
33-
<Item ItemId=";VSMEF002_MessageFormat" ItemType="0" PsrId="211" Leaf="true">
33+
<Item ItemId=";VSMEF002_MessageFormat" ItemType="0" PsrId="211" InstFlg="true" Leaf="true">
3434
<Str Cat="Text">
3535
<Val><![CDATA[The type "{0}" contains a mix of attributes from MEFv1 and MEFv2. Consolidate to just one variety of attributes.]]></Val>
3636
<Tgt Cat="Text" Stat="Loc" Orig="New">
@@ -39,7 +39,7 @@
3939
</Str>
4040
<Disp Icon="Str" />
4141
</Item>
42-
<Item ItemId=";VSMEF002_Title" ItemType="0" PsrId="211" Leaf="true">
42+
<Item ItemId=";VSMEF002_Title" ItemType="0" PsrId="211" InstFlg="true" Leaf="true">
4343
<Str Cat="Text">
4444
<Val><![CDATA[Avoid mixing MEF attribute varieties]]></Val>
4545
<Tgt Cat="Text" Stat="Loc" Orig="New">
@@ -66,7 +66,34 @@
6666
</Str>
6767
<Disp Icon="Str" />
6868
</Item>
69-
<Item ItemId=";VSMEF004_MessageFormat" ItemType="0" PsrId="211" Leaf="true">
69+
<Item ItemId=";VSMEF004_CodeFix_AddImportingConstructorAttribute" ItemType="0" PsrId="211" InstFlg="true" Leaf="true">
70+
<Str Cat="Text">
71+
<Val><![CDATA[Add [ImportingConstructor]5D; attribute]]></Val>
72+
<Tgt Cat="Text" Stat="Loc" Orig="New">
73+
<Val><![CDATA[新增 [ImportingConstructor]5D; 屬性]]></Val>
74+
</Tgt>
75+
</Str>
76+
<Disp Icon="Str" />
77+
</Item>
78+
<Item ItemId=";VSMEF004_CodeFix_AddParameterlessConstructor" ItemType="0" PsrId="211" Leaf="true">
79+
<Str Cat="Text">
80+
<Val><![CDATA[Add parameterless constructor]]></Val>
81+
<Tgt Cat="Text" Stat="Loc" Orig="New">
82+
<Val><![CDATA[新增無參數建構函式]]></Val>
83+
</Tgt>
84+
</Str>
85+
<Disp Icon="Str" />
86+
</Item>
87+
<Item ItemId=";VSMEF004_CodeFix_AddPartNotDiscoverableAttribute" ItemType="0" PsrId="211" InstFlg="true" Leaf="true">
88+
<Str Cat="Text">
89+
<Val><![CDATA[Add [PartNotDiscoverable]5D; attribute]]></Val>
90+
<Tgt Cat="Text" Stat="Loc" Orig="New">
91+
<Val><![CDATA[新增 [PartNotDiscoverable]5D; 屬性]]></Val>
92+
</Tgt>
93+
</Str>
94+
<Disp Icon="Str" />
95+
</Item>
96+
<Item ItemId=";VSMEF004_MessageFormat" ItemType="0" PsrId="211" InstFlg="true" Leaf="true">
7097
<Str Cat="Text">
7198
<Val><![CDATA[The type "{0}" defines exports but has non-default constructors that are not annotated with [ImportingConstructor]5D;. Add a parameterless constructor, or annotate a constructor with [ImportingConstructor]5D;.]]></Val>
7299
<Tgt Cat="Text" Stat="Loc" Orig="New">
@@ -84,7 +111,7 @@
84111
</Str>
85112
<Disp Icon="Str" />
86113
</Item>
87-
<Item ItemId=";VSMEF005_MessageFormat" ItemType="0" PsrId="211" Leaf="true">
114+
<Item ItemId=";VSMEF005_MessageFormat" ItemType="0" PsrId="211" InstFlg="true" Leaf="true">
88115
<Str Cat="Text">
89116
<Val><![CDATA[The type "{0}" has multiple constructors annotated with [ImportingConstructor]5D;. Only one constructor should be marked as importing.]]></Val>
90117
<Tgt Cat="Text" Stat="Loc" Orig="New">
@@ -102,7 +129,7 @@
102129
</Str>
103130
<Disp Icon="Str" />
104131
</Item>
105-
<Item ItemId=";VSMEF006_AllowDefaultWithoutNullable_MessageFormat" ItemType="0" PsrId="211" Leaf="true">
132+
<Item ItemId=";VSMEF006_AllowDefaultWithoutNullable_MessageFormat" ItemType="0" PsrId="211" InstFlg="true" Leaf="true">
106133
<Str Cat="Text">
107134
<Val><![CDATA[The import "{0}" has AllowDefault = true but is not nullable. Consider making the type nullable or removing AllowDefault.]]></Val>
108135
<Tgt Cat="Text" Stat="Loc" Orig="New">
@@ -111,7 +138,43 @@
111138
</Str>
112139
<Disp Icon="Str" />
113140
</Item>
114-
<Item ItemId=";VSMEF006_NullableWithoutAllowDefault_MessageFormat" ItemType="0" PsrId="211" Leaf="true">
141+
<Item ItemId=";VSMEF006_CodeFix_AddAllowDefault" ItemType="0" PsrId="211" InstFlg="true" Leaf="true">
142+
<Str Cat="Text">
143+
<Val><![CDATA[Add AllowDefault = true]]></Val>
144+
<Tgt Cat="Text" Stat="Loc" Orig="New">
145+
<Val><![CDATA[新增 AllowDefault = true]]></Val>
146+
</Tgt>
147+
</Str>
148+
<Disp Icon="Str" />
149+
</Item>
150+
<Item ItemId=";VSMEF006_CodeFix_MakeTypeNonNullable" ItemType="0" PsrId="211" Leaf="true">
151+
<Str Cat="Text">
152+
<Val><![CDATA[Make type non-nullable]]></Val>
153+
<Tgt Cat="Text" Stat="Loc" Orig="New">
154+
<Val><![CDATA[將型別設為不可為 null]]></Val>
155+
</Tgt>
156+
</Str>
157+
<Disp Icon="Str" />
158+
</Item>
159+
<Item ItemId=";VSMEF006_CodeFix_MakeTypeNullable" ItemType="0" PsrId="211" Leaf="true">
160+
<Str Cat="Text">
161+
<Val><![CDATA[Make type nullable]]></Val>
162+
<Tgt Cat="Text" Stat="Loc" Orig="New">
163+
<Val><![CDATA[將型別設為可 null]]></Val>
164+
</Tgt>
165+
</Str>
166+
<Disp Icon="Str" />
167+
</Item>
168+
<Item ItemId=";VSMEF006_CodeFix_RemoveAllowDefault" ItemType="0" PsrId="211" InstFlg="true" Leaf="true">
169+
<Str Cat="Text">
170+
<Val><![CDATA[Remove AllowDefault = true]]></Val>
171+
<Tgt Cat="Text" Stat="Loc" Orig="New">
172+
<Val><![CDATA[移除 AllowDefault = true]]></Val>
173+
</Tgt>
174+
</Str>
175+
<Disp Icon="Str" />
176+
</Item>
177+
<Item ItemId=";VSMEF006_NullableWithoutAllowDefault_MessageFormat" ItemType="0" PsrId="211" InstFlg="true" Leaf="true">
115178
<Str Cat="Text">
116179
<Val><![CDATA[The import "{0}" is nullable but does not have AllowDefault = true. Consider adding AllowDefault = true or making the type non-nullable (and either add a 'required' modifier or an '= null!' initializer).]]></Val>
117180
<Tgt Cat="Text" Stat="Loc" Orig="New">
@@ -120,7 +183,7 @@
120183
</Str>
121184
<Disp Icon="Str" />
122185
</Item>
123-
<Item ItemId=";VSMEF006_Title" ItemType="0" PsrId="211" Leaf="true">
186+
<Item ItemId=";VSMEF006_Title" ItemType="0" PsrId="211" InstFlg="true" Leaf="true">
124187
<Str Cat="Text">
125188
<Val><![CDATA[Import nullability and AllowDefault mismatch]]></Val>
126189
<Tgt Cat="Text" Stat="Loc" Orig="New">

0 commit comments

Comments
 (0)