Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion DotnetRuntimeMetadata.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"quality": "daily",
"qualityFallback": "preview",
"packageVersionPattern": "9.0.0-preview.6",
"sdkImageVersion": "10.0.101",
"sdkImageVersion": "11.0.100-preview.1.26104.118",
"nextChannel": "9.0.0-preview.7",
"azureFeed": "",
"sdkImageOverride": ""
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

<ItemGroup>
<ProjectReference Include="..\System.Management.Automation\System.Management.Automation.csproj" />
<PackageReference Include="Markdig.Signed" Version="0.45.0" />
<PackageReference Include="Markdig.Signed" Version="1.0.0" />
<PackageReference Include="Microsoft.PowerShell.MarkdownRender" Version="7.2.1" />
</ItemGroup>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="11.0.0-preview.1.26104.118" />
<PackageReference Include="Microsoft.Extensions.ObjectPool" Version="11.0.0-preview.1.26104.118" />
<!-- the following package(s) are from https://github.com/dotnet/fxdac -->
<PackageReference Include="System.Data.SqlClient" Version="4.9.0" />
<PackageReference Include="System.Data.SqlClient" Version="4.9.1" />
<!-- the following package(s) are from https://github.com/dotnet/corefx -->
<PackageReference Include="System.IO.Packaging" Version="11.0.0-preview.1.26104.118" />
<PackageReference Include="System.Net.Http.WinHttpHandler" Version="11.0.0-preview.1.26104.118" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@
<PackageReference Include="MarkdownLog.NS20" Version="0.10.1" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
<PackageReference Include="BenchmarkDotNet" Version="0.15.8" />
<PackageReference Include="Perfolizer" Version="0.6.5" />
<PackageReference Include="Perfolizer" Version="0.6.7" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion test/tools/TestService/TestService.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

<ItemGroup>
<PackageReference Include="Microsoft.Windows.Compatibility" Version="11.0.0-preview.1.26104.118" />
<PackageReference Include="System.Data.SqlClient" Version="4.9.0" />
<PackageReference Include="System.Data.SqlClient" Version="4.9.1" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion test/xUnit/xUnit.tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="XunitXml.TestLogger" Version="8.0.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.3.0" />
Comment thread
TravisEz13 marked this conversation as resolved.
</ItemGroup>

<ItemGroup>
Expand Down
8 changes: 4 additions & 4 deletions tools/cgmanifest/main/cgmanifest.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"$schema": "https://json.schemastore.org/component-detection-manifest.json",
"Registrations": [
Comment thread
TravisEz13 marked this conversation as resolved.
{
"Component": {
Expand Down Expand Up @@ -65,7 +66,7 @@
"Type": "nuget",
"Nuget": {
"Name": "Markdig.Signed",
"Version": "0.45.0"
"Version": "1.0.0"
}
},
"DevelopmentDependency": false
Expand Down Expand Up @@ -495,7 +496,7 @@
"Type": "nuget",
"Nuget": {
"Name": "System.Data.SqlClient",
"Version": "4.9.0"
"Version": "4.9.1"
}
},
"DevelopmentDependency": false
Expand Down Expand Up @@ -750,6 +751,5 @@
},
"DevelopmentDependency": false
}
],
"$schema": "https://json.schemastore.org/component-detection-manifest.json"
]
}
27 changes: 19 additions & 8 deletions tools/clearlyDefined/src/ClearlyDefined/ClearlyDefined.psm1
Original file line number Diff line number Diff line change
Expand Up @@ -40,19 +40,30 @@ function ConvertFrom-ClearlyDefinedCoordinates {
[CmdletBinding()]
param(
[parameter(mandatory = $true, ValueFromPipeline = $true)]
[string]
[object]
$Coordinates
Comment thread
TravisEz13 marked this conversation as resolved.
)

Begin {}
Process {
$parts = $Coordinates.Split('/')
[PSCustomObject]@{
type = $parts[0]
provider = $parts[1]
namespace = $parts[2]
name = $parts[3]
revision = $parts[4]
if ($Coordinates -is [string]) {
$parts = $Coordinates.Split('/')
[PSCustomObject]@{
type = $parts[0]
provider = $parts[1]
namespace = $parts[2]
name = $parts[3]
revision = $parts[4]
}
} else {
# Coordinates is already an object (e.g., from ClearlyDefined API response)
[PSCustomObject]@{
type = $Coordinates.type
provider = $Coordinates.provider
namespace = $Coordinates.namespace
name = $Coordinates.name
revision = $Coordinates.revision
}
}
}
End {}
Expand Down
Loading