Skip to content

Commit 2708109

Browse files
committed
Merge remote-tracking branch 'origin/net8.0' into darc-net8.0-a57a48d0-413b-4c88-b015-59b48e8a052e
2 parents 771edd0 + d9150f6 commit 2708109

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+352
-1901
lines changed

.github/fabricbot.json

Lines changed: 0 additions & 1021 deletions
This file was deleted.
Lines changed: 148 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,148 @@
1+
id:
2+
name: GitOps.PullRequestIssueManagement
3+
description: GitOps.PullRequestIssueManagement primitive
4+
owner:
5+
resource: repository
6+
disabled: false
7+
where:
8+
configuration:
9+
resourceManagementConfiguration:
10+
scheduledSearches:
11+
- description:
12+
frequencies:
13+
- weekday:
14+
day: Monday
15+
time: 0:0
16+
- weekday:
17+
day: Tuesday
18+
time: 0:0
19+
- weekday:
20+
day: Wednesday
21+
time: 0:0
22+
- weekday:
23+
day: Thursday
24+
time: 0:0
25+
- weekday:
26+
day: Friday
27+
time: 0:0
28+
filters:
29+
- isIssue
30+
- isOpen
31+
- hasLabel:
32+
label: need-info
33+
- noActivitySince:
34+
days: 7
35+
actions:
36+
- addReply:
37+
reply: Hi @${issueAuthor}. Due to inactivity, we will be closing this issue. Please feel free to re-open this issue if the issue persists. For enhanced visibility, if over 7 days have passed, please open a new issue and link this issue there. Thank you.
38+
- closeIssue
39+
- description:
40+
frequencies:
41+
- weekday:
42+
day: Monday
43+
time: 0:0
44+
- weekday:
45+
day: Tuesday
46+
time: 0:0
47+
- weekday:
48+
day: Wednesday
49+
time: 0:0
50+
- weekday:
51+
day: Thursday
52+
time: 0:0
53+
- weekday:
54+
day: Friday
55+
time: 0:0
56+
filters:
57+
- isIssue
58+
- isOpen
59+
- hasLabel:
60+
label: need-repro
61+
- noActivitySince:
62+
days: 7
63+
actions:
64+
- addReply:
65+
reply: Hi @${issueAuthor}. Due to inactivity, we will be closing this issue. Please feel free to re-open this issue if the issue persists. For enhanced visibility, if over 7 days have passed, please open a new issue and link this issue there. Thank you.
66+
- closeIssue
67+
- description:
68+
frequencies:
69+
- hourly:
70+
hour: 6
71+
filters:
72+
- isOpen
73+
- hasLabel:
74+
label: move-to-vs-feedback
75+
- noActivitySince:
76+
days: 3
77+
actions:
78+
- addReply:
79+
reply: This issue is being closed due to inactivity. If this issue is still affecting you, please follow the steps above to use the VS Feedback Tool to report the issue.
80+
- closeIssue
81+
eventResponderTasks:
82+
- if:
83+
- payloadType: Issues
84+
- labelAdded:
85+
label: need-info
86+
then:
87+
- addReply:
88+
reply: Hi @${issueAuthor}. We have added the "need-info" label to this issue, which indicates that we have an open question for you before we can take further action. This issue will be closed automatically in 7 days if we do not hear back from you by then - please feel free to re-open it if you come back to this issue after that time.
89+
description:
90+
- if:
91+
- payloadType: Issues
92+
- labelAdded:
93+
label: need-repro
94+
then:
95+
- addReply:
96+
reply: >-
97+
Hi @${issueAuthor}. We have added the "need-repro" label to this issue, which indicates that we require steps and sample code to reproduce the issue before we can take further action. Please try to create a minimal sample project/solution or code samples which reproduce the issue, ideally as a GitHub repo that we can clone. See more details about creating repros here: https://github.com/xamarin/xamarin-macios/blob/main/docs/bug-repro.md
98+
99+
100+
This issue will be closed automatically in 7 days if we do not hear back from you by then - please feel free to re-open it if you come back to this issue after that time.
101+
description:
102+
- if:
103+
- payloadType: Issue_Comment
104+
- isAction:
105+
action: Created
106+
- isOpen
107+
- or:
108+
- hasLabel:
109+
label: need-info
110+
- hasLabel:
111+
label: need-repro
112+
- not:
113+
activitySenderHasPermission:
114+
permission: Admin
115+
- not:
116+
activitySenderHasPermission:
117+
permission: Write
118+
then:
119+
- removeLabel:
120+
label: need-info
121+
- removeLabel:
122+
label: need-repro
123+
- addLabel:
124+
label: need-attention
125+
description:
126+
- if:
127+
- payloadType: Issues
128+
- isOpen
129+
- labelAdded:
130+
label: move-to-vs-feedback
131+
then:
132+
- addReply:
133+
reply: >-
134+
Thanks for the issue report @${issueAuthor}! This issue appears to be a problem with Visual Studio, so we ask that you use the VS feedback tool to report the issue. That way it will get to the routed to the team that owns this experience in VS.
135+
136+
137+
If you encounter a problem with Visual Studio, we want to know about it so that we can diagnose and fix it. By using the Report a Problem tool, you can collect detailed information about the problem, and send it to Microsoft with just a few button clicks.
138+
139+
140+
1. Go to the [Visual Studio for Windows feedback tool](https://docs.microsoft.com/visualstudio/ide/how-to-report-a-problem-with-visual-studio?view=vs-2022) or [Visual Studio for Mac feedback tool](https://learn.microsoft.com/en-us/visualstudio/mac/report-a-problem?view=vsmac-2022) to report the issue
141+
142+
2. Close this bug, and consider adding a link to the VS Feedback issue so that others can follow its activity there.
143+
144+
145+
This issue will be automatically closed in 3 days if there are no further comments.
146+
description:
147+
onFailure:
148+
onSuccess:

dotnet/Makefile

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -191,12 +191,6 @@ $(DOTNET_NUPKG_DIR)/vs-workload.props: Makefile generate-vs-workload.csharp
191191
--output $@.tmp
192192
$(Q) mv $@.tmp $@
193193

194-
$(DOTNET_NUPKG_DIR)/SignList.xml: Workloads/SignList.xml
195-
$(Q) $(CP) $< $@
196-
197-
$(DOTNET_NUPKG_DIR)/SignList.targets: Workloads/SignList.targets
198-
$(Q) $(CP) $< $@
199-
200194
TEMPLATED_FILES = \
201195
$(foreach platform,$(DOTNET_PLATFORMS),Microsoft.$(platform).Sdk/targets/Microsoft.$(platform).Sdk.Versions.props) \
202196
$(foreach platform,$(DOTNET_PLATFORMS),Microsoft.$(platform).Sdk/targets/Microsoft.$(platform).Sdk.SupportedTargetPlatforms.props) \
@@ -259,7 +253,7 @@ pack-$(shell echo $(1) | tr A-Z a-z): $$(RUNTIME_PACKS_$(1)) $$(REF_PACKS_$(1))
259253
endef
260254
$(foreach platform,$(DOTNET_PLATFORMS_UPPERCASE),$(eval $(call PacksDefinitions,$(platform))))
261255

262-
TARGETS += $(RUNTIME_PACKS) $(REF_PACKS) $(SDK_PACKS) $(TEMPLATE_PACKS) $(WORKLOAD_PACKS) $(DOTNET_NUPKG_DIR)/vs-workload.props $(DOTNET_NUPKG_DIR)/SignList.xml $(DOTNET_NUPKG_DIR)/SignList.targets $(SDK_PACKS_WINDOWS)
256+
TARGETS += $(RUNTIME_PACKS) $(REF_PACKS) $(SDK_PACKS) $(TEMPLATE_PACKS) $(WORKLOAD_PACKS) $(DOTNET_NUPKG_DIR)/vs-workload.props $(SDK_PACKS_WINDOWS)
263257

264258
define InstallWorkload
265259
# .NET comes with a workload for us, but we don't want that, we want our own. So delete the workload that comes with .NET.
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
**\*.xml,ignore unsigned .xml
2+
**\cab*.cab.cab,ignore unsigned .cab

dotnet/targets/Xamarin.Shared.Sdk.props

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -140,8 +140,5 @@
140140

141141
<!-- This turns off some NativeAOT logic we don't want nor need -->
142142
<NativeCompilationDuringPublish>false</NativeCompilationDuringPublish>
143-
144-
<!-- This works around an issue in NativeAOT: https://github.com/dotnet/runtime/issues/86186 -->
145-
<IlcKeepManagedDebuggerSupport>true</IlcKeepManagedDebuggerSupport>
146143
</PropertyGroup>
147144
</Project>

dotnet/targets/Xamarin.Shared.Sdk.targets

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,8 @@
140140
<!-- Verify DI trimmability at development-time, but turn the validation off for production/trimmed builds. -->
141141
<VerifyDependencyInjectionOpenGenericServiceTrimmability Condition="'$(VerifyDependencyInjectionOpenGenericServiceTrimmability)' == '' And '$(_BundlerDebug)' != 'true'">false</VerifyDependencyInjectionOpenGenericServiceTrimmability>
142142
<VerifyDependencyInjectionOpenGenericServiceTrimmability Condition="'$(VerifyDependencyInjectionOpenGenericServiceTrimmability)' == ''">true</VerifyDependencyInjectionOpenGenericServiceTrimmability>
143+
<!-- This should be set by dotnet/sdk instead, once https://github.com/dotnet/sdk/issues/25392 gets resolved. -->
144+
<DynamicCodeSupport Condition="'$(DynamicCodeSupport)' == '' And '$(UseInterpreter)' != 'true' And ('$(_PlatformName)' == 'iOS' Or '$(_PlatformName)' == 'tvOS' Or '$(_PlatformName)' == 'MacCatalyst')">false</DynamicCodeSupport>
143145

144146
<!-- We don't need to generate reference assemblies for apps or app extensions -->
145147
<ProduceReferenceAssembly Condition="'$(ProduceReferenceAssembly)' == '' And ('$(OutputType)' == 'Exe' Or '$(IsAppExtension)' == 'true')">false</ProduceReferenceAssembly>

eng/Version.Details.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,5 +57,9 @@
5757
<Uri>https://github.com/dotnet/templating</Uri>
5858
<Sha />
5959
</Dependency>
60+
<Dependency Name="Microsoft.DotNet.XHarness.iOS.Shared" Version="8.0.0-prerelease.23401.3">
61+
<Uri>https://github.com/dotnet/xharness</Uri>
62+
<Sha>c1216531b6c19ac4a6dcd447503e09fe28687cbd</Sha>
63+
</Dependency>
6064
</ToolsetDependencies>
6165
</Dependencies>

eng/Versions.props

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
<MicrosoftNETRuntimeMonoTargetsSdkPackageVersion>7.0.7</MicrosoftNETRuntimeMonoTargetsSdkPackageVersion>
1111
<MicrosoftTemplateEngineTasksVersion>7.0.100-alpha.1.21601.1</MicrosoftTemplateEngineTasksVersion>
1212
<MicrosoftDotNetCecilPackageVersion>0.11.4-alpha.23374.2</MicrosoftDotNetCecilPackageVersion>
13+
<MicrosoftDotNetXHarnessiOSSharedPackageVersion>8.0.0-prerelease.23401.3</MicrosoftDotNetXHarnessiOSSharedPackageVersion>
1314
<!-- Manually updated versions -->
1415
<Emscriptennet7WorkloadVersion>$(MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion)</Emscriptennet7WorkloadVersion>
1516
<EmscriptenWorkloadVersion>$(MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion)</EmscriptenWorkloadVersion>

msbuild/Xamarin.Localization.MSBuild/TranslatedAssemblies/MSBStrings.cs.resx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1206,7 +1206,7 @@
12061206
<value>Úloze “{0}“ nebyla určena hodnota parametru „{1}“, která se při sestavování na této platformě vyžaduje.</value>
12071207
</data>
12081208
<data name="E7115" xml:space="preserve">
1209-
<value>The illink assembly doesn't exist: '{0}'.</value>
1209+
<value>Sestavení illink neexistuje: „{0}</value>
12101210
<comment>
12111211
{0}: the path to the linker assembly
12121212
</comment>

msbuild/Xamarin.Localization.MSBuild/TranslatedAssemblies/MSBStrings.de.resx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1206,7 +1206,7 @@
12061206
<value>Der "{0}"-Aufgabe wurde kein Wert für den Parameter "{1}" übergeben, der beim Erstellen auf dieser Plattform erforderlich ist.</value>
12071207
</data>
12081208
<data name="E7115" xml:space="preserve">
1209-
<value>The illink assembly doesn't exist: '{0}'.</value>
1209+
<value>Die illink-Assembly ist nicht vorhanden: „{0}.</value>
12101210
<comment>
12111211
{0}: the path to the linker assembly
12121212
</comment>

0 commit comments

Comments
 (0)