diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fa5ba32639..01e7722099 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -37,9 +37,9 @@ - + https://dev.azure.com/microsoft/ProjectReunion/_git/WindowsAppSDKAggregator - 7a1603e6ce6e274d9bb6889dce9d134206716333 + 471177124c73e330b44d6c7c271695e729e869ea https://github.com/microsoft/CsWinRT diff --git a/eng/common/VersionInfo/GenerateVersionInfo.ps1 b/eng/common/VersionInfo/GenerateVersionInfo.ps1 index b74c56abd0..e67c95ceb7 100644 --- a/eng/common/VersionInfo/GenerateVersionInfo.ps1 +++ b/eng/common/VersionInfo/GenerateVersionInfo.ps1 @@ -21,6 +21,9 @@ Param( [int]$ProductMinor ) +# Don't output file with Bom +$utf8NoBomEncoding = New-Object System.Text.UTF8Encoding $False + $scriptFullPath = (Split-Path -Parent $MyInvocation.MyCommand.Definition) Write-Host "scriptFullPath: $scriptFullPath" @@ -46,7 +49,7 @@ using System.Runtime.InteropServices; Write-Host $assemblyInfoCs $assemblyInfoCsPath = "$scriptFullPath/AssemblyInfo.cs" Write-Host "Writing $assemblyInfoCsPath..." -$assemblyInfoCs | Out-File -Encoding "UTF8" -FilePath $assemblyInfoCsPath +[System.IO.File]::WriteAllLines($assemblyInfoCsPath, $assemblyInfoCs, $utf8NoBomEncoding) # Generating AssemblyInfo.ver override $assemblyInfoVer = @" @@ -57,7 +60,6 @@ $assemblyInfoVer = @" #define DELIM STR1(.) #define STR2(a,b) STR1(a) DELIM STR1(b) - #ifndef WINDOWSAPPSDK_RELEASE_MAJOR #define WINDOWSAPPSDK_RELEASE_MAJOR $ProductMajor #endif @@ -124,10 +126,9 @@ VS_VERSION_INFO VERSIONINFO VALUE "Translation", 0x409, 1200 END END - "@ Write-Host $assemblyInfoVer $assemblyInfoVerPath = "$scriptFullPath/AssemblyInfo.ver" Write-Host "Writing $assemblyInfoVerPath..." -$assemblyInfoVer | Out-File -Encoding "UTF8" -FilePath $assemblyInfoVerPath +[System.IO.File]::WriteAllLines($assemblyInfoVerPath, $assemblyInfoVer, $utf8NoBomEncoding) diff --git a/global.json b/global.json index ff31e41c0e..615535fcfc 100644 --- a/global.json +++ b/global.json @@ -3,6 +3,6 @@ "dotnet": "6.0.104" }, "msbuild-sdks": { - "Microsoft.WinAppSDK.EngCommon": "1.3.230104100" + "Microsoft.WinAppSDK.EngCommon": "1.3.230109100" } }