Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bump swift-dotnetmetadata #272

Merged
merged 3 commits into from
Sep 8, 2024
Merged

Bump swift-dotnetmetadata #272

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7553acb
Bump swift-dotnetmetadata
tristanlabelle Sep 8, 2024
132216e
Fix API change
tristanlabelle Sep 8, 2024
b27a336
Also bump for SPM
tristanlabelle Sep 8, 2024
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
4 changes: 2 additions & 2 deletions Generator/Dependencies/swift-dotnetmetadata/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FetchContent_Declare(
swift-dotnetmetadata
GIT_REPOSITORY https://github.com/tristanlabelle/swift-dotnetmetadata.git
GIT_TAG 9dd4ea6b10a5e5c4a5fc503564a229522b896b44
GIT_TAG 266e0200f0f1b603f3ed1286f519d748978dcaab
SOURCE_SUBDIR "don't use cmakelists")
FetchContent_MakeAvailable(swift-dotnetmetadata)

Expand All @@ -22,4 +22,4 @@ add_library(DotNetXMLDocs STATIC ${SOURCES})

file(GLOB_RECURSE SOURCES ${swift-dotnetmetadata_SOURCE_DIR}/Sources/WindowsMetadata/*.swift)
add_library(WindowsMetadata STATIC ${SOURCES})
target_link_libraries(WindowsMetadata PUBLIC DotNetMetadata)
target_link_libraries(WindowsMetadata PUBLIC DotNetMetadata)
2 changes: 1 addition & 1 deletion Generator/Package.resolved
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"location" : "https://github.com/tristanlabelle/swift-dotnetmetadata",
"state" : {
"branch" : "main",
"revision" : "9dd4ea6b10a5e5c4a5fc503564a229522b896b44"
"revision" : "266e0200f0f1b603f3ed1286f519d748978dcaab"
}
}
],
Expand Down
6 changes: 3 additions & 3 deletions Generator/Sources/SwiftWinRT/createProjection.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,12 +75,12 @@ internal func createProjection(commandLineArguments: CommandLineArguments, proje
}

fileprivate func getWindowsSdkWinMDPaths(sdkVersion: String) throws -> [String] {
let sdkVersion = try FourPartVersion(parsing: sdkVersion)
guard let windowsKit = try WindowsKit.getInstalled().first(where: { $0.version == sdkVersion }) else {
guard let sdkVersion = FourPartVersion(parsing: sdkVersion),
let windowsKit = try WindowsKit.getInstalled().first(where: { $0.version == sdkVersion }) else {
enum WindowsSDKError: Error {
case notFound(version: String)
}
throw WindowsSDKError.notFound(version: sdkVersion.description)
throw WindowsSDKError.notFound(version: sdkVersion)
}

let applicationPlatform = try windowsKit.readApplicationPlatform()
Expand Down
Loading