Skip to content

Commit 95e71b1

Browse files
authored
Typos -- fix a couple of types in the last pm PR (#8358)
* Typos * references greater than 0
1 parent 3f9172a commit 95e71b1

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

src/fsharp/FSharp.DependencyManager/FSharp.DependencyManager.Utilities.fs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -242,15 +242,15 @@ $(PACKAGEREFERENCES)
242242
<__InteractiveReferencedAssemblies Include = "@(ReferencePath)" />
243243
<__InteractiveReferencedAssembliesCopyLocal Include = "@(RuntimeCopyLocalItems)" Condition="'$(TargetFrameworkIdentifier)'!='.NETFramework'" />
244244
<__InteractiveReferencedAssembliesCopyLocal Include = "@(ReferenceCopyLocalPaths)" Condition="'$(TargetFrameworkIdentifier)'=='.NETFramework'" />
245-
<__ConflictsList Include="(_ConflictPackageFiles.ConflictItemType)=%(_ConflictPackageFiles.Filename)%(_ConflictPackageFiles.Extension)" />
245+
<__ConflictsList Include="%(_ConflictPackageFiles.ConflictItemType)=%(_ConflictPackageFiles.Filename)%(_ConflictPackageFiles.Extension)" />
246246
</ItemGroup>
247247
<PropertyGroup>
248-
<__Conflicts>@(__ConflictsList, ';')</__Conflicts>
248+
<__Conflicts>@(__ConflictsList, ';');</__Conflicts>
249249
</PropertyGroup>
250250
251251
<ItemGroup>
252252
<InteractiveResolvedFile Include="@(__InteractiveReferencedAssemblies)"
253-
Condition="$([System.String]::new($(__Conflicts)).Contains($([System.String]::new('Reference=%(__InteractiveReferencedAssemblies.Filename)%(__InteractiveReferencedAssemblies.Extension)'))))"
253+
Condition="$([System.String]::new($(__Conflicts)).Contains($([System.String]::new('Reference=%(__InteractiveReferencedAssemblies.Filename)%(__InteractiveReferencedAssemblies.Extension);'))))"
254254
KeepDuplicates="false">
255255
<NormalizedIdentity Condition="'%(Identity)'!=''">$([System.String]::Copy('%(Identity)').Replace('\', '/'))</NormalizedIdentity>
256256
<NormalizedPathInPackage Condition="'%(__InteractiveReferencedAssemblies.PathInPackage)'!=''">$([System.String]::Copy('%(__InteractiveReferencedAssemblies.PathInPackage)').Replace('\', '/'))</NormalizedPathInPackage>

tests/FSharp.Compiler.Private.Scripting.UnitTests/DependencyManagerInteractiveTests.fs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ type DependencyManagerInteractiveTests() =
4040
let value = opt.Value
4141
Assert.AreEqual(typeof<int>, value.ReflectionType)
4242
Assert.AreEqual(0, value.ReflectionValue :?> int)
43-
Assert.AreEqual(1, assemblyResolveEventCount)
43+
Assert.Greater(assemblyResolveEventCount, 0)
4444
Assert.AreEqual(true, foundAssemblyReference)
4545

4646
[<Test>]

0 commit comments

Comments
 (0)