diff --git a/HdtCollectionExporter.sln b/HdtCollectionExporter.sln index e075e82..00a8ed2 100644 --- a/HdtCollectionExporter.sln +++ b/HdtCollectionExporter.sln @@ -6,14 +6,14 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HdtCollectionExporter", "sr EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|x86 = Debug|x86 - Release|x86 = Release|x86 + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {8B0A46F7-154C-46B2-93CE-280C83C10A75}.Debug|x86.ActiveCfg = Debug|x86 - {8B0A46F7-154C-46B2-93CE-280C83C10A75}.Debug|x86.Build.0 = Debug|x86 - {8B0A46F7-154C-46B2-93CE-280C83C10A75}.Release|x86.ActiveCfg = Release|x86 - {8B0A46F7-154C-46B2-93CE-280C83C10A75}.Release|x86.Build.0 = Release|x86 + {8B0A46F7-154C-46B2-93CE-280C83C10A75}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {8B0A46F7-154C-46B2-93CE-280C83C10A75}.Debug|Any CPU.Build.0 = Debug|Any CPU + {8B0A46F7-154C-46B2-93CE-280C83C10A75}.Release|Any CPU.ActiveCfg = Release|Any CPU + {8B0A46F7-154C-46B2-93CE-280C83C10A75}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/README.md b/README.md index 5ce1324..8563b04 100644 --- a/README.md +++ b/README.md @@ -151,7 +151,7 @@ Build from the repository root: Build output: ```text -src\HdtCollectionExporter\bin\x86\Release\HdtCollectionExporter.dll +src\HdtCollectionExporter\bin\Release\HdtCollectionExporter.dll ``` ## Project Structure diff --git a/build.ps1 b/build.ps1 index a7dd1c9..d3643ad 100644 --- a/build.ps1 +++ b/build.ps1 @@ -29,7 +29,7 @@ if (Test-Path $targetingPack) { & $msbuild ".\HdtCollectionExporter.sln" ` /m ` /p:Configuration=$Configuration ` - /p:Platform=x86 ` + /p:Platform="Any CPU" ` /p:HDTInstallDir="$HDTInstallDir" if ($LASTEXITCODE -ne 0) { @@ -41,14 +41,14 @@ if (Test-Path $targetingPack) { Write-Host ".NET Framework 4.7.2 targeting pack was not found. Using local fallback compiler path." $projectDir = Join-Path $PSScriptRoot "src\HdtCollectionExporter" -$objDir = Join-Path $projectDir "obj\x86\$Configuration" -$outDir = Join-Path $projectDir "bin\x86\$Configuration" +$objDir = Join-Path $projectDir "obj\$Configuration" +$outDir = Join-Path $projectDir "bin\$Configuration" New-Item -ItemType Directory -Force -Path $objDir, $outDir | Out-Null $legacyMsbuild = Join-Path $env:WINDIR "Microsoft.NET\Framework\v4.0.30319\MSBuild.exe" & $legacyMsbuild (Join-Path $projectDir "HdtCollectionExporter.csproj") ` /p:Configuration=$Configuration ` - /p:Platform=x86 ` + /p:Platform="Any CPU" ` /p:TargetFrameworkVersion=v4.0 ` /p:HDTInstallDir="$HDTInstallDir" *> $null @@ -109,7 +109,7 @@ $sources = @( "Settings\PluginSettings.cs", "UI\ExportWindowText.cs", "UI\ExportWindow.xaml.cs", - "obj\x86\$Configuration\UI\ExportWindow.g.cs" + "obj\$Configuration\UI\ExportWindow.g.cs" ) Push-Location $projectDir @@ -117,7 +117,7 @@ try { & $csc ` /noconfig ` /target:library ` - /platform:x86 ` + /platform:anycpu ` /langversion:latest ` /optimize+ ` "/out:$outDir\HdtCollectionExporter.dll" ` diff --git a/docs/INSTALL.en.md b/docs/INSTALL.en.md index 466360c..96d4bde 100644 --- a/docs/INSTALL.en.md +++ b/docs/INSTALL.en.md @@ -38,7 +38,7 @@ If the script cannot find HDT automatically, pass the HDT app folder: The build output is: ```text -src\HdtCollectionExporter\bin\x86\Release\HdtCollectionExporter.dll +src\HdtCollectionExporter\bin\Release\HdtCollectionExporter.dll ``` ## 4. Open The HDT Plugins Folder diff --git a/docs/INSTALL.ru.md b/docs/INSTALL.ru.md index 1a605a7..d32cc5e 100644 --- a/docs/INSTALL.ru.md +++ b/docs/INSTALL.ru.md @@ -38,7 +38,7 @@ HdtCollectionExporter.dll Готовый файл будет здесь: ```text -src\HdtCollectionExporter\bin\x86\Release\HdtCollectionExporter.dll +src\HdtCollectionExporter\bin\Release\HdtCollectionExporter.dll ``` ## 4. Открыть папку расширений HDT diff --git a/src/HdtCollectionExporter/HdtCollectionExporter.csproj b/src/HdtCollectionExporter/HdtCollectionExporter.csproj index 701d30f..b2c14a8 100644 --- a/src/HdtCollectionExporter/HdtCollectionExporter.csproj +++ b/src/HdtCollectionExporter/HdtCollectionExporter.csproj @@ -4,7 +4,7 @@ Debug - x86 + AnyCPU {8B0A46F7-154C-46B2-93CE-280C83C10A75} Library HdtCollectionExporter @@ -17,23 +17,23 @@ $(LocalAppData)\HearthstoneDeckTracker\app-1.52.7 - + true full false - bin\x86\Debug\ + bin\Debug\ DEBUG;TRACE - x86 - true + AnyCPU + false - + pdbonly true - bin\x86\Release\ + bin\Release\ TRACE - x86 - true + AnyCPU + false