summaryrefslogtreecommitdiff
path: root/src/dlls/mscorrc
diff options
context:
space:
mode:
Diffstat (limited to 'src/dlls/mscorrc')
-rw-r--r--src/dlls/mscorrc/dirs.proj18
-rw-r--r--src/dlls/mscorrc/full/mscorrc.nativeproj25
-rw-r--r--src/dlls/mscorrc/mscorrc.rc3
-rw-r--r--src/dlls/mscorrc/mscorrc.rc252
-rw-r--r--src/dlls/mscorrc/resource.h3
-rw-r--r--src/dlls/mscorrc/small/mscorrc.nativeproj22
6 files changed, 5 insertions, 118 deletions
diff --git a/src/dlls/mscorrc/dirs.proj b/src/dlls/mscorrc/dirs.proj
deleted file mode 100644
index 1792a6ed67..0000000000
--- a/src/dlls/mscorrc/dirs.proj
+++ /dev/null
@@ -1,18 +0,0 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <Import Project="$(_NTDRIVE)$(_NTROOT)\ndp\clr\clr.props" />
-
- <PropertyGroup>
- <BuildInPhase1>true</BuildInPhase1>
- <BuildInPhaseDefault>false</BuildInPhaseDefault>
- <BuildCoreBinaries>true</BuildCoreBinaries>
- <BuildSysBinaries>true</BuildSysBinaries>
- </PropertyGroup>
-
- <!--The following projects will build during PHASE 1-->
- <ItemGroup Condition="'$(BuildExePhase)' == '1'">
- <ProjectFile Include="full\mscorrc.nativeproj" />
- <ProjectFile Condition="'$(FeatureCoreClr)' == 'true'" Include="small\mscorrc.nativeproj" />
- </ItemGroup>
-
- <Import Project="$(_NTDRIVE)$(_NTROOT)\tools\Microsoft.DevDiv.Traversal.targets" />
-</Project>
diff --git a/src/dlls/mscorrc/full/mscorrc.nativeproj b/src/dlls/mscorrc/full/mscorrc.nativeproj
deleted file mode 100644
index 66262603c5..0000000000
--- a/src/dlls/mscorrc/full/mscorrc.nativeproj
+++ /dev/null
@@ -1,25 +0,0 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="dogfood">
-
- <Import Project="$(_NTDRIVE)$(_NTROOT)\ndp\clr\clr.props" />
-
- <PropertyGroup>
- <BuildCoreBinaries>true</BuildCoreBinaries>
- <BuildSysBinaries>true</BuildSysBinaries>
- <OutputName Condition="'$(FeatureCoreclr)'=='true'">mscorrc.debug</OutputName>
- <OutputName Condition="'$(FeatureCoreclr)'!='true'">mscorrc</OutputName>
- <TargetType>DYNLINK</TargetType>
- <LinkSubsystem>windows</LinkSubsystem>
- <LinkResourceOnlyDll>true</LinkResourceOnlyDll>
- <IsProjectKLibrary>true</IsProjectKLibrary>
- <IsTestNetCoreRuntimeLibrary>true</IsTestNetCoreRuntimeLibrary>
- <IsPhoneLibrary>true</IsPhoneLibrary>
- <IsDesktopTool>true</IsDesktopTool>
- </PropertyGroup>
-
- <ItemGroup>
- <RCResourceFile Include="..\include.rc" />
- </ItemGroup>
-
- <Import Project="$(_NTDRIVE)$(_NTROOT)\ndp\clr\clr.targets" />
-
-</Project>
diff --git a/src/dlls/mscorrc/mscorrc.rc b/src/dlls/mscorrc/mscorrc.rc
index be9fb1cfa6..138db55b66 100644
--- a/src/dlls/mscorrc/mscorrc.rc
+++ b/src/dlls/mscorrc/mscorrc.rc
@@ -1230,6 +1230,9 @@ BEGIN
IDS_CLASSLOAD_NOTINTERFACE "Could not load type '%1' from assembly '%2' because it attempts to implement a class as an interface."
IDS_CLASSLOAD_VALUEINSTANCEFIELD "Could not load the value type '%1' from assembly '%2' because it has an instance field of itself."
+ IDS_CLASSLOAD_BYREFLIKE_STATICFIELD "A value type containing a by-ref instance field, such as Span<T>, cannot be used as the type for a static field."
+ IDS_CLASSLOAD_BYREFLIKE_NOTVALUECLASSFIELD "A value type containing a by-ref instance field, such as Span<T>, cannot be used as the type for a class instance field."
+
IDS_CLASSLOAD_BAD_NAME "Type name '%1' from assembly '%2' is invalid."
IDS_CLASSLOAD_RANK_TOOLARGE "'%1' from assembly '%2' has too many dimensions."
IDS_CLASSLOAD_BAD_MANAGED_RVA "Managed method '%3' on type '%1' from assembly '%2' is not supported."
diff --git a/src/dlls/mscorrc/mscorrc.rc2 b/src/dlls/mscorrc/mscorrc.rc2
deleted file mode 100644
index 3e08368699..0000000000
--- a/src/dlls/mscorrc/mscorrc.rc2
+++ /dev/null
@@ -1,52 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-//*****************************************************************************
-// CompRC.rc2
-//
-// Holds version stamp for this program.
-//
-//*****************************************************************************
-#ifdef APSTUDIO_INVOKED
- #error this file is not editable by App Studio
-#endif //APSTUDIO_INVOKED
-
-#include <winver.h>
-#include <__file__.ver> //file version info - variable, but same for all files
-#include <__product__.ver> //product version info - variable
-#include <corver.h> //product version info - fixed
-#include "__file__.h" // file version info - fixed per file
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION VER_FILEVERSION
- PRODUCTVERSION VER_PRODUCTVERSION
- FILEFLAGSMASK VER_FILEFLAGSMASK
- FILEFLAGS VER_FILEFLAGS
- FILEOS VER_FILEOS
- FILETYPE VER_FILETYPE
-BEGIN
- BLOCK "VarFileInfo"
- BEGIN
- VALUE "Translation", 0x409, 1252
- // English language (0x409) and the Windows ANSI codepage (1252)
- END
- BLOCK "StringFileInfo"
- BEGIN
- BLOCK "040904E4" // Lang=US English, CharSet=Windows Multilingual
- BEGIN
- // Note: Non-standard value strings must be first as FileManager has a bug
- // that leaves garbage in its name buffer otherwise.
- VALUE "CompanyName", VER_COMPANYNAME_STR
- VALUE "FileDescription", VER_FILEDESCRIPTION_STR
- VALUE "FileVersion", VER_FILEVERSION_STR
- VALUE "InternalName", VER_INTERNALNAME_STR
- VALUE "LegalCopyright", VER_LEGALCOPYRIGHT_STR
- VALUE "LegalTrademarks", VER_LEGALTRADEMARKS_STR
- VALUE "OriginalFilename",VER_ORIGFILENAME_STR
- VALUE "ProductName", VER_PRODUCTNAME_STR
- VALUE "ProductVersion", VER_PRODUCTVERSION_STR
- VALUE "Comments", VER_FILEDESCRIPTION_STR
- END
- END
-END
diff --git a/src/dlls/mscorrc/resource.h b/src/dlls/mscorrc/resource.h
index 1391a21545..77e937a81e 100644
--- a/src/dlls/mscorrc/resource.h
+++ b/src/dlls/mscorrc/resource.h
@@ -947,4 +947,5 @@
#define IDS_NATIVE_IMAGE_CANNOT_BE_LOADED_MULTIPLE_TIMES 0x263a
-
+#define IDS_CLASSLOAD_BYREFLIKE_STATICFIELD 0x263b
+#define IDS_CLASSLOAD_BYREFLIKE_NOTVALUECLASSFIELD 0x263c
diff --git a/src/dlls/mscorrc/small/mscorrc.nativeproj b/src/dlls/mscorrc/small/mscorrc.nativeproj
deleted file mode 100644
index 994589aa91..0000000000
--- a/src/dlls/mscorrc/small/mscorrc.nativeproj
+++ /dev/null
@@ -1,22 +0,0 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="dogfood">
- <Import Project="$(_NTDRIVE)$(_NTROOT)\ndp\clr\clr.props" />
-
- <PropertyGroup>
- <BuildCoreBinaries>true</BuildCoreBinaries>
- <BuildSysBinaries>true</BuildSysBinaries>
- <OutputName>mscorrc</OutputName>
- <TargetType>DYNLINK</TargetType>
- <LinkSubsystem>windows</LinkSubsystem>
- <LinkResourceOnlyDll>true</LinkResourceOnlyDll>
- <IsProjectKLibrary>true</IsProjectKLibrary>
- <IsTestNetCoreRuntimeLibrary>true</IsTestNetCoreRuntimeLibrary>
- <IsPhoneLibrary>true</IsPhoneLibrary>
- </PropertyGroup>
-
- <ItemGroup>
- <RCResourceFile Include="..\mscorrc.small.rc" />
- </ItemGroup>
-
- <Import Project="$(_NTDRIVE)$(_NTROOT)\ndp\clr\clr.targets" />
-
-</Project>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-26 19:04:39 +0000