File size: 11,366 Bytes
ff994b2 |
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 |
{
"number": 100004,
"title": "Include versions and checksums in VMR publishing and remove prepare-artifacts.proj",
"body": "Fixes https://github.com/dotnet/source-build/issues/4239\r\n\r\nFollows the pattern that we established in windowsdesktop: https://github.com/dotnet/windowsdesktop/blob/main/eng/Publishing.props\r\n\r\n**Important: No Merge until I verified the changes in a runtime official build and a VMR build.**\r\n\r\nRuntime official build: https://dnceng.visualstudio.com/internal/_build/results?buildId=2414748&view=results",
"createdAt": "2024-03-20T09:44:23Z",
"closedAt": "2024-11-29T08:36:33Z",
"mergedAt": null,
"state": "CLOSED",
"author": {
"login": "ViktorHofer"
},
"labels": {
"nodes": [
{
"name": "NO-MERGE"
},
{
"name": "area-Infrastructure-libraries"
}
]
},
"headRefName": "ViktorHofer-patch-1",
"additions": 223,
"deletions": 500,
"changedFiles": 14,
"comments": {
"totalCount": 0,
"nodes": []
},
"reviewThreads": {
"totalCount": 6,
"nodes": [
{
"comments": {
"nodes": [
{
"path": "src/native/corehost/corehost.proj",
"diffHunk": "@@ -8,7 +8,7 @@\n \n <PropertyGroup>\n <IncrementalNativeBuild Condition=\"'$(IncrementalNativeBuild)' == ''\">true</IncrementalNativeBuild>\n- <BuildCoreHostDependsOn>GetProductVersions;GenerateRuntimeVersionFile</BuildCoreHostDependsOn>\n+ <BuildCoreHostDependsOn>GenerateRuntimeVersionFile</BuildCoreHostDependsOn>",
"body": "I checked and I couldn't find a place under src/native that still depended on the `GetProductVersions` target.",
"createdAt": "2024-03-25T14:02:05Z"
}
]
}
},
{
"comments": {
"nodes": [
{
"path": "src/mono/wasm/templates/Microsoft.NET.Runtime.WebAssembly.Templates.csproj",
"diffHunk": "@@ -24,10 +24,5 @@\n \n <Target Name=\"CreateManifestResourceNames\" />\n <Target Name=\"CoreCompile\" />\n- <Target Name=\"_SetProductVersion\" DependsOnTargets=\"GetProductVersions\" BeforeTargets=\"Pack\">\n- <PropertyGroup>\n- <PackageVersion>$(ProductVersion)</PackageVersion>\n- </PropertyGroup>\n- </Target>",
"body": "From what I could see, this setting shouldn't be necessary as PackageVersion is already automatically set by Arcade.",
"createdAt": "2024-03-25T14:03:07Z"
}
]
}
},
{
"comments": {
"nodes": [
{
"path": "src/mono/browser/browser.proj",
"diffHunk": "@@ -533,12 +533,20 @@\n <_RollupInputs Include=\"$(BrowserProjectRoot)runtime/*.js\"/>\n </ItemGroup>\n \n- <Target Name=\"SetMonoRollupEnvironment\" DependsOnTargets=\"GetProductVersions\">\n+ <Target Name=\"SetMonoRollupEnvironment\">\n+ <!-- Retrieve the runtime pack product version. -->\n+ <MSBuild Projects=\"$(RepoRoot)src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.sfxproj\"\n+ Targets=\"ReturnProductVersion\"\n+ Properties=\"Crossgen2SdkOverridePropsPath=;\n+ Crossgen2SdkOverrideTargetsPath=\">\n+ <Output TaskParameter=\"TargetOutputs\" PropertyName=\"RuntimePackProductVersion\" />\n+ </MSBuild>\n+\n <ItemGroup>\n <_MonoRollupEnvironmentVariable Include=\"Configuration:$(Configuration)\" />\n <_MonoRollupEnvironmentVariable Include=\"NativeBinDir:$(NativeBinDir)\" />\n <_MonoRollupEnvironmentVariable Include=\"WasmObjDir:$(WasmObjDir)\" />\n- <_MonoRollupEnvironmentVariable Include=\"ProductVersion:$(ProductVersion)\" />\n+ <_MonoRollupEnvironmentVariable Include=\"ProductVersion:$(RuntimePackProductVersion)\" />",
"body": "Calling into sfxproj to retrieve the version felt safer than just relying on PackageVersion here in case this project sets IsShipping or any other properties already or in the future.",
"createdAt": "2024-03-25T14:03:56Z"
}
]
}
},
{
"comments": {
"nodes": [
{
"path": "src/installer/tests/Directory.Build.targets",
"diffHunk": "@@ -37,7 +37,6 @@\n <Target Name=\"SetupTestContextVariables\"\n Condition=\"'$(IsTestProject)' == 'true'\"\n DependsOnTargets=\"\n- GetProductVersions;",
"body": "I couldn't find any place that still depends on this target or its properties.",
"createdAt": "2024-03-25T14:04:27Z"
}
]
}
},
{
"comments": {
"nodes": [
{
"path": "src/installer/pkg/projects/Directory.Build.targets",
"diffHunk": "@@ -16,20 +18,6 @@\n <SymbolPackageOutputPath>$(PackageOutputPath)</SymbolPackageOutputPath>\n </PropertyGroup>\n \n- <Target Name=\"SetTargetBasedPackageVersion\"\n- BeforeTargets=\"GenerateNuSpec\"\n- DependsOnTargets=\"GetProductVersions\">\n- <PropertyGroup>\n- <Version>$(ProductVersion)</Version>\n- <!--\n- PackageVersion is normally calculated using Version during static property evaluation, but\n- we need some info from GetProductVersions, so it's too late to rely on that. We need to set\n- both in target evaluation, here.\n- -->\n- <PackageVersion>$(ProductVersion)</PackageVersion>\n- </PropertyGroup>\n- </Target>\n-",
"body": "This might have been necessary in the past but AFAIK, NuGet calculates PackageVersion correctly, even for pkgprojs.",
"createdAt": "2024-03-25T14:06:13Z"
}
]
}
},
{
"comments": {
"nodes": [
{
"path": "eng/Signing.props",
"diffHunk": "@@ -55,14 +44,30 @@\n <FileSignInfo Update=\"@(FileSignInfo->WithMetadataValue('CertificateName','Microsoft400'))\" CertificateName=\"MicrosoftDotNet500\" />\n </ItemGroup>\n \n- <ItemGroup Condition=\"'$(PrepareArtifacts)' == 'true'\">\n- <ItemsToSignWithPaths Include=\"$(DownloadDirectory)**\\*.msi\" />\n- <ItemsToSignWithPaths Include=\"$(DownloadDirectory)**\\*.exe\" />\n- <ItemsToSignWithPaths Include=\"$(DownloadDirectory)**\\*.nupkg\" />\n- <ItemsToSignWithPaths Include=\"$(DownloadDirectory)**\\*.zip\" />\n+ <!-- In build signing and publishing without a join point -->\n+ <ItemGroup Condition=\"'$(SignAndPublishAsJoinPoint)' != 'true'\">\n+ <Artifact Include=\"$(ArtifactsPackagesDir)**\\*.tar.gz;\n+ $(ArtifactsPackagesDir)**\\*.zip;\n+ $(ArtifactsPackagesDir)**\\*.deb;\n+ $(ArtifactsPackagesDir)**\\*.rpm;\n+ $(ArtifactsPackagesDir)**\\*.pkg;\n+ $(ArtifactsPackagesDir)**\\*.exe;\n+ $(ArtifactsPackagesDir)**\\*.msi\"\n+ Exclude=\"$(ArtifactsPackagesDir)**\\Symbols.runtime.tar.gz\"\n+ IsShipping=\"$([System.String]::Copy('%(RecursiveDir)').StartsWith('Shipping'))\">",
"body": "Can you point me to the docs for `ItemsToSign` vs `Artifact`? ",
"createdAt": "2024-04-01T18:39:36Z"
},
{
"path": "eng/Signing.props",
"diffHunk": "@@ -55,14 +44,30 @@\n <FileSignInfo Update=\"@(FileSignInfo->WithMetadataValue('CertificateName','Microsoft400'))\" CertificateName=\"MicrosoftDotNet500\" />\n </ItemGroup>\n \n- <ItemGroup Condition=\"'$(PrepareArtifacts)' == 'true'\">\n- <ItemsToSignWithPaths Include=\"$(DownloadDirectory)**\\*.msi\" />\n- <ItemsToSignWithPaths Include=\"$(DownloadDirectory)**\\*.exe\" />\n- <ItemsToSignWithPaths Include=\"$(DownloadDirectory)**\\*.nupkg\" />\n- <ItemsToSignWithPaths Include=\"$(DownloadDirectory)**\\*.zip\" />\n+ <!-- In build signing and publishing without a join point -->\n+ <ItemGroup Condition=\"'$(SignAndPublishAsJoinPoint)' != 'true'\">\n+ <Artifact Include=\"$(ArtifactsPackagesDir)**\\*.tar.gz;\n+ $(ArtifactsPackagesDir)**\\*.zip;\n+ $(ArtifactsPackagesDir)**\\*.deb;\n+ $(ArtifactsPackagesDir)**\\*.rpm;\n+ $(ArtifactsPackagesDir)**\\*.pkg;\n+ $(ArtifactsPackagesDir)**\\*.exe;\n+ $(ArtifactsPackagesDir)**\\*.msi\"\n+ Exclude=\"$(ArtifactsPackagesDir)**\\Symbols.runtime.tar.gz\"\n+ IsShipping=\"$([System.String]::Copy('%(RecursiveDir)').StartsWith('Shipping'))\">",
"body": "Just checked Arcade and this makes sense (Artifact feeds into ItemsToSign)",
"createdAt": "2024-04-05T17:21:49Z"
}
]
}
}
]
},
"commits": {
"totalCount": 11,
"nodes": [
{
"commit": {
"oid": "684ff76979aeb60fc02332c769c8add360ec290c",
"message": "Include versions and checksums in VMR publishing",
"committedDate": "2024-03-20T09:43:52Z"
}
},
{
"commit": {
"oid": "df52116e7e8d3d58e7e0090c4852b19676c7028d",
"message": "Create AfterSigning.targets",
"committedDate": "2024-03-20T09:50:45Z"
}
},
{
"commit": {
"oid": "98f0bb68a01586dc01ef9b9391c95c876bdc8ea7",
"message": "Update Publishing.props",
"committedDate": "2024-03-20T09:52:39Z"
}
},
{
"commit": {
"oid": "8ec942dee98ac6812f4bf33cea76bc088e36d51b",
"message": "Update Publishing.props",
"committedDate": "2024-03-20T09:54:55Z"
}
},
{
"commit": {
"oid": "be3b37beceb99a36794c6131c6a31f8fc86f0349",
"message": "Update Publishing.props",
"committedDate": "2024-03-20T10:04:11Z"
}
},
{
"commit": {
"oid": "3e7855889467dc74d8d21926137e6c2927e5bb6b",
"message": "Update Publishing.props",
"committedDate": "2024-03-25T14:01:16Z"
}
},
{
"commit": {
"oid": "65660ec908be9196470062db00c849155d8a5c93",
"message": "Update Signing.props",
"committedDate": "2024-03-25T14:07:43Z"
}
},
{
"commit": {
"oid": "5f3d52a6abf4015a67d4a8c6a06a9ecc01cc16f2",
"message": "Clean-up and fixes",
"committedDate": "2024-03-26T06:27:07Z"
}
},
{
"commit": {
"oid": "020baf9424882fa96fbcc3e6f172ef0b4dc5d0ef",
"message": "Merge branch 'ViktorHofer-patch-1' of https://github.com/dotnet/runtime into ViktorHofer-patch-1",
"committedDate": "2024-03-26T06:28:48Z"
}
},
{
"commit": {
"oid": "b3fe52e81d0094bc769f33dc10cf60648b4592d0",
"message": "style nit",
"committedDate": "2024-03-26T06:30:50Z"
}
},
{
"commit": {
"oid": "f35ffde0407866e996b3d4f1ead7b5360c7e5295",
"message": "Remove prepare-artifacts.proj",
"committedDate": "2024-03-26T10:31:27Z"
}
}
]
}
} |