Skip to content

Commit d862a96

Browse files
committed
fix: Adjust for duplicate package references in 6.0.300
1 parent b97733f commit d862a96

File tree

5 files changed

+2
-13
lines changed

5 files changed

+2
-13
lines changed

src/SourceGenerators/Uno.UI.SourceGenerators/Uno.UI.SourceGenerators.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
<PackageReference Include="Microsoft.Build" Version="15.4.8" ExcludeAssets="runtime" />
1515
<PackageReference Include="Microsoft.Build.Engine" Version="15.4.8" ExcludeAssets="runtime" />
1616
<PackageReference Include="Microsoft.Build.Tasks.Core" Version="15.4.8" ExcludeAssets="runtime" />
17-
<PackageReference Include="Microsoft.Build.Tasks.Core" Version="15.4.8" ExcludeAssets="runtime" />
1817
<PackageReference Include="Microsoft.CodeAnalysis">
1918
<Version>3.3.1</Version>
2019
<ExcludeAssets>runtime</ExcludeAssets>

src/Uno.Foundation.Logging/Uno.Foundation.Logging.csproj

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,16 +29,8 @@
2929
<None Include="..\Common\uno.png" Pack="true" PackagePath="\" />
3030
</ItemGroup>
3131

32-
<ItemGroup>
33-
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.2" />
34-
</ItemGroup>
35-
3632
<Import Project="..\Uno.CrossTargetting.props" />
3733

38-
<ItemGroup>
39-
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.2" />
40-
</ItemGroup>
41-
4234
<ItemGroup>
4335
<EmbeddedResource Include="LinkerDefinition.Wasm.xml">
4436
<LogicalName>$(AssemblyName).xml</LogicalName>

src/Uno.UI.RemoteControl.VS/Uno.UI.RemoteControl.VS.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
<PackageReference Include="Newtonsoft.Json" version="12.0.3" />
3737
<PackageReference Include="NuGet.VisualStudio" version="4.5.0" />
3838
<PackageReference Include="Microsoft.VisualStudio.ProjectSystem" Version="16.0.374-pre" />
39-
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
4039
</ItemGroup>
4140

4241
<ItemGroup>

src/Uno.UI/Uno.UI.net6.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,6 @@
102102
<ItemGroup>
103103
<PackageReference Include="Uno.SourceGenerationTasks" />
104104
<PackageReference Include="System.Memory" Version="4.5.2" />
105-
<PackageReference Include="xamarin.build.download" Version="0.11.2" />
106105
</ItemGroup>
107106

108107
<ItemGroup Condition="'$(TargetFramework)' == 'net6.0-android'">

src/Uno.UWP/ApplicationModel/DataTransfer/DataTransferManager.macOS.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,9 @@ private static async Task<bool> ShowShareUIAsync(ShareUIOptions options, DataPac
4343
}
4444

4545
var uri = await GetSharedUriAsync(dataPackageView);
46-
if (uri != null)
46+
if (uri != null && NSUrl.FromString(uri.OriginalString) is { } nsUrl)
4747
{
48-
sharedData.Add(NSUrl.FromString(uri.OriginalString));
48+
sharedData.Add(nsUrl);
4949
}
5050

5151
CGRect targetRect;

0 commit comments

Comments
 (0)