Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | Work around inability of .NET Core SDK to properly generate resources from a 'resx' file that refers to other files. |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | netStandard20 |
Files: | files | file ages | folders |
SHA1: |
681cdd1dde942554c76941c3ed6236de |
User & Date: | mistachkin 2018-04-05 15:25:29 |
Context
2018-04-05
| ||
15:27 | Update Eagle script library in externals to pre-Beta 42. check-in: 90c8dbfba8 user: mistachkin tags: netStandard20 | |
15:25 | Work around inability of .NET Core SDK to properly generate resources from a 'resx' file that refers to other files. check-in: 681cdd1dde user: mistachkin tags: netStandard20 | |
15:21 | Adjust test constraints for .NET Core. check-in: ceb6a84975 user: mistachkin tags: netStandard20 | |
Changes
Added Externals/ResGen/ResGen.exe.
cannot compute difference between binary files
Added Externals/ResGen/ResGen.exe.config.
> > > > > > > > > > > > > > > > > > > > > > > |
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 |
<?xml version="1.0" encoding="UTF-8" ?> <!-- * * ResGen.exe.config - * * Copyright (c) 2007-2012 by Joe Mistachkin. All rights reserved. * * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * * RCS: @(#) $Id: $ * --> <configuration> <startup> <supportedRuntime version="v2.0.50727" /> <supportedRuntime version="v4.0.30319" /> </startup> <runtime> <generatePublisherEvidence enabled="false" /> </runtime> </configuration> |
Changes to Setup/data/verify.lst.
577
578
579
580
581
582
583
584
585
586
587
588
589
590
....
1005
1006
1007
1008
1009
1010
1011
1012
1013
1014
1015
1016
1017
1018
|
System.Data.SQLite.url
System.Data.SQLite/
System.Data.SQLite/AssemblyInfo.cs
System.Data.SQLite/AssemblySourceIdAttribute.cs
System.Data.SQLite/AssemblySourceTimeStampAttribute.cs
System.Data.SQLite/Configurations/
System.Data.SQLite/Configurations/System.Data.SQLite.dll.config
System.Data.SQLite/ISQLiteNativeModule.cs
System.Data.SQLite/LINQ/
System.Data.SQLite/LINQ/SQLiteConnection_Linq.cs
System.Data.SQLite/LINQ/SQLiteFactory_Linq.cs
System.Data.SQLite/Resources/
System.Data.SQLite/Resources/DataTypes.xml
System.Data.SQLite/Resources/MetaDataCollections.xml
................................................................................
#
# NOTE: This is the list of external files that should be present in the full
# source code archive. These files may be required by the build and/or
# during release processing. If missing, some features and/or build
# options may be unavailable.
#
set sds_manifests(external) {
Externals/vswhere/
Externals/vswhere/vswhere.exe
}
###############################################################################
#
# NOTE: This is the list of core files that should be present in all binary
|
>
>
>
>
>
|
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
....
1007
1008
1009
1010
1011
1012
1013
1014
1015
1016
1017
1018
1019
1020
1021
1022
1023
|
System.Data.SQLite.url System.Data.SQLite/ System.Data.SQLite/AssemblyInfo.cs System.Data.SQLite/AssemblySourceIdAttribute.cs System.Data.SQLite/AssemblySourceTimeStampAttribute.cs System.Data.SQLite/Configurations/ System.Data.SQLite/Configurations/System.Data.SQLite.dll.config System.Data.SQLite/Generated/ System.Data.SQLite/Generated/SR.resources System.Data.SQLite/ISQLiteNativeModule.cs System.Data.SQLite/LINQ/ System.Data.SQLite/LINQ/SQLiteConnection_Linq.cs System.Data.SQLite/LINQ/SQLiteFactory_Linq.cs System.Data.SQLite/Resources/ System.Data.SQLite/Resources/DataTypes.xml System.Data.SQLite/Resources/MetaDataCollections.xml ................................................................................ # # NOTE: This is the list of external files that should be present in the full # source code archive. These files may be required by the build and/or # during release processing. If missing, some features and/or build # options may be unavailable. # set sds_manifests(external) { Externals/ResGen/ Externals/ResGen/ResGen.exe Externals/ResGen/ResGen.exe.config Externals/vswhere/ Externals/vswhere/vswhere.exe } ############################################################################### # # NOTE: This is the list of core files that should be present in all binary |
Added System.Data.SQLite/Generated/SR.resources.
cannot compute difference between binary files
Changes to System.Data.SQLite/System.Data.SQLite.NetStandard20.csproj.
48 49 50 51 52 53 54 55 56 57 58 59 60 61 ... 123 124 125 126 127 128 129 130 131 132 133 134 135 136 ... 144 145 146 147 148 149 150 151 152 153 154 155 156 157 |
<ConfigurationYear>NetStandard20</ConfigurationYear> <TargetFramework>netstandard2.0</TargetFramework> <GenerateAssemblyInfo>false</GenerateAssemblyInfo> <Deterministic>False</Deterministic> <EnableDefaultItems>false</EnableDefaultItems> </PropertyGroup> <!-- ****************************************************************************** ** Import Project Default Settings ** ****************************************************************************** --> <Import Project="$(SQLiteNetDir)\Targets\SQLite.NET.Platform.Settings.targets" /> ................................................................................ ****************************************************************************** ** Import Project Source Code Files ** ****************************************************************************** --> <Import Project="$(MSBuildProjectDirectory)\Targets\System.Data.SQLite.Files.targets" /> <!-- ****************************************************************************** ** Import .NET Core SDK Targets ** ****************************************************************************** --> <!-- ................................................................................ ****************************************************************************** ** Add Targets To BuildDependsOn Property ** ****************************************************************************** --> <PropertyGroup> <BuildDependsOn> $(BuildDependsOn); CopyConfigurations; </BuildDependsOn> <CleanDependsOn> $(CleanDependsOn); CleanConfigurations; </CleanDependsOn> |
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > |
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 ... 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 ... 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 |
<ConfigurationYear>NetStandard20</ConfigurationYear> <TargetFramework>netstandard2.0</TargetFramework> <GenerateAssemblyInfo>false</GenerateAssemblyInfo> <Deterministic>False</Deterministic> <EnableDefaultItems>false</EnableDefaultItems> </PropertyGroup> <!-- ****************************************************************************** ** .NET Standard 2.0 Specific Targets ** ****************************************************************************** --> <Target Name="GenerateResourcesForNetStandard20" Condition="'$(GenerateResourcesForNetStandard20)' != 'false' And '$(BuildTool)' == 'DotNetCore' And '$(OperatingSystem)' == 'Windows' And '$(MSBuildProjectDirectory)' != '' And !HasTrailingSlash('$(MSBuildProjectDirectory)') And Exists('$(MSBuildProjectDirectory)\..\Externals\ResGen\ResGen.exe')" Inputs="Resources\SR.resx" Outputs="Generated\SR.resources"> <MakeDir Directories="Generated" /> <Exec Command=""$(MSBuildProjectDirectory)\..\Externals\ResGen\ResGen.exe" Resources\SR.resx Generated\SR.resources "$(MSBuildProjectDirectory)\Resources"" /> </Target> <!-- ****************************************************************************** ** Import Project Default Settings ** ****************************************************************************** --> <Import Project="$(SQLiteNetDir)\Targets\SQLite.NET.Platform.Settings.targets" /> ................................................................................ ****************************************************************************** ** Import Project Source Code Files ** ****************************************************************************** --> <Import Project="$(MSBuildProjectDirectory)\Targets\System.Data.SQLite.Files.targets" /> <!-- ****************************************************************************** ** Project Embedded Resource Files ** ****************************************************************************** --> <ItemGroup> <EmbeddedResource Include="Generated\SR.resources"> <LogicalName>System.Data.SQLite.SR.resources</LogicalName> </EmbeddedResource> </ItemGroup> <!-- ****************************************************************************** ** Import .NET Core SDK Targets ** ****************************************************************************** --> <!-- ................................................................................ ****************************************************************************** ** Add Targets To BuildDependsOn Property ** ****************************************************************************** --> <PropertyGroup> <BuildDependsOn> DetectBuildTool; DetectOperatingSystem; GenerateResourcesForNetStandard20; $(BuildDependsOn); CopyConfigurations; </BuildDependsOn> <CleanDependsOn> $(CleanDependsOn); CleanConfigurations; </CleanDependsOn> |
Changes to System.Data.SQLite/Targets/System.Data.SQLite.Files.targets.
5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 .. 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 ... 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 |
* Written by Joe Mistachkin. * Released to the public domain, use at your own risk! * --> <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <!-- ****************************************************************************** ** Core Files (Common) ** ****************************************************************************** --> <ItemGroup> <Compile Include="AssemblyInfo.cs" /> <Compile Include="AssemblySourceIdAttribute.cs" /> <Compile Include="AssemblySourceTimeStampAttribute.cs" /> ................................................................................ <Compile Include="SQLiteTransactionBase.cs" /> <Compile Include="UnsafeNativeMethods.cs" /> <Compile Include="Resources\SR.Designer.cs"> <DependentUpon>SR.resx</DependentUpon> <AutoGen>True</AutoGen> <DesignTime>True</DesignTime> </Compile> <EmbeddedResource Include="Resources\SR.resx"> <SubType>Designer</SubType> <Generator>ResXFileCodeGenerator</Generator> <LastGenOutput>SR.Designer.cs</LastGenOutput> <LogicalName>System.Data.SQLite.SR.resources</LogicalName> </EmbeddedResource> <None Include="Configurations\System.Data.SQLite.dll.config" /> </ItemGroup> <!-- ****************************************************************************** ** Core Files (Full Framework) ** ****************************************************************************** --> <ItemGroup Condition="'$(IsCompactFramework)' == 'false'"> <Compile Include="SQLiteEnlistment.cs" /> <Compile Condition="'$(NetFx35)' != 'false' Or '$(NetFx40)' != 'false' Or ................................................................................ <EmbeddedResource Include="Resources\SQLiteCommand.bmp" /> <EmbeddedResource Include="Resources\SQLiteConnection.bmp" /> <EmbeddedResource Include="Resources\SQLiteDataAdapter.bmp" /> </ItemGroup> <!-- ****************************************************************************** ** Virtual Table Files ** ****************************************************************************** --> <ItemGroup Condition="'$(InteropVirtualTable)' != 'false'"> <Compile Include="ISQLiteNativeModule.cs" /> <Compile Include="SQLiteModule.cs" /> <Compile Include="SQLiteModuleCommon.cs" /> <Compile Include="SQLiteModuleEnumerable.cs" /> <Compile Include="SQLiteModuleNoop.cs" /> </ItemGroup> <!-- ****************************************************************************** ** Session Extension Files ** ****************************************************************************** --> <ItemGroup Condition="'$(InteropSessionExtension)' != 'false'"> <Compile Include="SQLiteSession.cs" /> </ItemGroup> </Project> |
| > > > > > > > > > > < | | | |
5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 .. 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 ... 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 |
* Written by Joe Mistachkin. * Released to the public domain, use at your own risk! * --> <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <!-- ****************************************************************************** ** Project Source Code Files (Common) ** ****************************************************************************** --> <ItemGroup> <Compile Include="AssemblyInfo.cs" /> <Compile Include="AssemblySourceIdAttribute.cs" /> <Compile Include="AssemblySourceTimeStampAttribute.cs" /> ................................................................................ <Compile Include="SQLiteTransactionBase.cs" /> <Compile Include="UnsafeNativeMethods.cs" /> <Compile Include="Resources\SR.Designer.cs"> <DependentUpon>SR.resx</DependentUpon> <AutoGen>True</AutoGen> <DesignTime>True</DesignTime> </Compile> <None Include="Configurations\System.Data.SQLite.dll.config" /> </ItemGroup> <!-- ****************************************************************************** ** Project Embedded Resource Files ** ****************************************************************************** --> <ItemGroup Condition="'$(IsDotNetStandard)' == 'false'"> <EmbeddedResource Include="Resources\SR.resx"> <SubType>Designer</SubType> <Generator>ResXFileCodeGenerator</Generator> <LastGenOutput>SR.Designer.cs</LastGenOutput> <LogicalName>System.Data.SQLite.SR.resources</LogicalName> </EmbeddedResource> </ItemGroup> <!-- ****************************************************************************** ** Project Source Code Files (Full Framework) ** ****************************************************************************** --> <ItemGroup Condition="'$(IsCompactFramework)' == 'false'"> <Compile Include="SQLiteEnlistment.cs" /> <Compile Condition="'$(NetFx35)' != 'false' Or '$(NetFx40)' != 'false' Or ................................................................................ <EmbeddedResource Include="Resources\SQLiteCommand.bmp" /> <EmbeddedResource Include="Resources\SQLiteConnection.bmp" /> <EmbeddedResource Include="Resources\SQLiteDataAdapter.bmp" /> </ItemGroup> <!-- ****************************************************************************** ** Virtual Table Source Code Files ** ****************************************************************************** --> <ItemGroup Condition="'$(InteropVirtualTable)' != 'false'"> <Compile Include="ISQLiteNativeModule.cs" /> <Compile Include="SQLiteModule.cs" /> <Compile Include="SQLiteModuleCommon.cs" /> <Compile Include="SQLiteModuleEnumerable.cs" /> <Compile Include="SQLiteModuleNoop.cs" /> </ItemGroup> <!-- ****************************************************************************** ** Session Extension Source Code Files ** ****************************************************************************** --> <ItemGroup Condition="'$(InteropSessionExtension)' != 'false'"> <Compile Include="SQLiteSession.cs" /> </ItemGroup> </Project> |
Changes to Targets/SQLite.NET.targets.
255 256 257 258 259 260 261 262 263 264 265 266 267 268 |
'$(Platform)' != ''"> <Exec Command="XCOPY "$(OutDir)$(TargetName).*" "$(OutDir)..\..\$(BaseConfiguration)\bin\$(Platform)\" /D /E /V /I /F /H /Y" /> <Exec Condition="'$(DoesMachineMatchPlatform)' != 'false'" Command="XCOPY "$(OutDir)$(TargetName).*" "$(OutDir)..\..\$(BaseConfiguration)\bin\" /D /E /V /I /F /H /Y" /> </Target> <!-- ****************************************************************************** ** Visual Studio 2017 Targets ** ****************************************************************************** --> <Target Name="MaybeFindVsSdk2017" |
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > |
255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 |
'$(Platform)' != ''"> <Exec Command="XCOPY "$(OutDir)$(TargetName).*" "$(OutDir)..\..\$(BaseConfiguration)\bin\$(Platform)\" /D /E /V /I /F /H /Y" /> <Exec Condition="'$(DoesMachineMatchPlatform)' != 'false'" Command="XCOPY "$(OutDir)$(TargetName).*" "$(OutDir)..\..\$(BaseConfiguration)\bin\" /D /E /V /I /F /H /Y" /> </Target> <!-- ****************************************************************************** --> <Target Name="DetectBuildTool" Condition="'$(DetectBuildTool)' != 'false' And '$(MSBuildBinPath)' != '' And !HasTrailingSlash('$(MSBuildBinPath)')"> <CreateProperty Condition="Exists('$(MSBuildBinPath)\MSBuild.exe')" Value="MSBuild"> <Output TaskParameter="Value" PropertyName="BuildTool" /> </CreateProperty> <CreateProperty Condition="Exists('$(MSBuildBinPath)\xbuild.exe')" Value="XBuild"> <Output TaskParameter="Value" PropertyName="BuildTool" /> </CreateProperty> <CreateProperty Condition="Exists('$(MSBuildBinPath)\MSBuild.dll')" Value="DotNetCore"> <Output TaskParameter="Value" PropertyName="BuildTool" /> </CreateProperty> <CreateProperty Condition="!Exists('$(MSBuildBinPath)\MSBuild.exe') And !Exists('$(MSBuildBinPath)\xbuild.exe') And !Exists('$(MSBuildBinPath)\MSBuild.dll')" Value="Unknown"> <Output TaskParameter="Value" PropertyName="BuildTool" /> </CreateProperty> </Target> <!-- ****************************************************************************** --> <Target Name="DetectOperatingSystem" Condition="'$(DetectOperatingSystem)' != 'false'"> <CreateProperty Condition="'$(OS)' == 'Windows_NT'" Value="Windows"> <Output TaskParameter="Value" PropertyName="OperatingSystem" /> </CreateProperty> <CreateProperty Condition="'$(OS)' == 'Unix'" Value="Unix"> <Output TaskParameter="Value" PropertyName="OperatingSystem" /> </CreateProperty> <CreateProperty Condition="'$(OS)' == 'OSX'" Value="MacOSX"> <Output TaskParameter="Value" PropertyName="OperatingSystem" /> </CreateProperty> <CreateProperty Condition="'$(OS)' != 'Windows_NT' And '$(OS)' != 'Unix' And '$(OS)' != 'OSX'" Value="Unknown"> <Output TaskParameter="Value" PropertyName="OperatingSystem" /> </CreateProperty> </Target> <!-- ****************************************************************************** ** Visual Studio 2017 Targets ** ****************************************************************************** --> <Target Name="MaybeFindVsSdk2017" |
Changes to data/exclude_src.txt.
60 61 62 63 64 65 66 67 68 69 70 71 72 73 |
Externals/Eagle/lib/Eagle1.0/update.eagle Externals/Eagle/lib/Eagle1.0/word.tcl Externals/Eagle/lib/Test1.0/* Externals/EntityFramework/* Externals/HtmlHelp/* Externals/MSVCPP/* Externals/NDoc3/* Externals/vswhere/* obj/* Setup/Output/* Setup/set_user_*.bat SQLite.Designer/obj/* SQLite.Designer/Properties/* SQLite.Designer/VSDesign/* |
> |
60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 |
Externals/Eagle/lib/Eagle1.0/update.eagle
Externals/Eagle/lib/Eagle1.0/word.tcl
Externals/Eagle/lib/Test1.0/*
Externals/EntityFramework/*
Externals/HtmlHelp/*
Externals/MSVCPP/*
Externals/NDoc3/*
Externals/ResGen/*
Externals/vswhere/*
obj/*
Setup/Output/*
Setup/set_user_*.bat
SQLite.Designer/obj/*
SQLite.Designer/Properties/*
SQLite.Designer/VSDesign/*
|